Mercurial > pidgin
changeset 11669:0940c0077b8c
[gaim-migrate @ 13954]
reverting crashy patch 1327538
committer: Tailor Script <tailor@pidgin.im>
| author | Luke Schierer <lschiere@pidgin.im> |
|---|---|
| date | Sat, 15 Oct 2005 16:39:31 +0000 |
| parents | ae9d9e2add8e |
| children | 9f3129911c95 |
| files | src/conversation.c src/gtkconv.c |
| diffstat | 2 files changed, 9 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/conversation.c Sat Oct 15 16:36:50 2005 +0000 +++ b/src/conversation.c Sat Oct 15 16:39:31 2005 +0000 @@ -532,7 +532,9 @@ conv->features = features; - gaim_conversation_update(conv, GAIM_CONV_UPDATE_FEATURES); + ops = conv->ui_ops; + if(ops && ops->updated) + ops->updated(conv, GAIM_CONV_UPDATE_FEATURES); } @@ -626,7 +628,10 @@ conv->title = g_strdup(title); - gaim_conversation_update(conv, GAIM_CONV_UPDATE_TITLE); + ops = gaim_conversation_get_ui_ops(conv); + + if (ops != NULL && ops->updated != NULL) + ops->updated(conv, GAIM_CONV_UPDATE_TITLE); } const char *
--- a/src/gtkconv.c Sat Oct 15 16:36:50 2005 +0000 +++ b/src/gtkconv.c Sat Oct 15 16:39:31 2005 +0000 @@ -1910,7 +1910,7 @@ gtk_window_set_title(GTK_WINDOW(gtkconv->win->window), gtk_label_get_text(GTK_LABEL(gtkconv->tab_label))); - gaim_conversation_update(conv, GAIM_CONV_UPDATE_ACCOUNT); + gaim_gtkconv_updated(conv, GAIM_CONV_UPDATE_ACCOUNT); gtk_imhtml_set_protocol_name(GTK_IMHTML(gtkconv->entry), gaim_account_get_protocol_name(conv->account)); } @@ -5698,7 +5698,7 @@ { gtkconv->unseen_state = state; - gaim_conversation_update(gtkconv->active_conv, GAIM_CONV_UPDATE_UNSEEN); + gaim_gtkconv_updated(gtkconv->active_conv, GAIM_CONV_UPDATE_UNSEEN); } /* * When a conversation window is focused, we know the user