Mercurial > pidgin.yaz
changeset 11668:ae9d9e2add8e
[gaim-migrate @ 13953]
" A recent patch (#1326618) was applied to HEAD which
fixed tab highlighting for (un)seen messages by moving
the (un)seen stuff from core to ui. When this was done,
gaim_gtkconv_updated() was being called directly
instead of going through gaim_conversation_update().
This stopped the "conversation-updated" signal from
being emitted when the (un)seen state was changed.
In addition, I noticed another case in gtkconv.c where
gaim_gtkconv_updated() was being called directly and
two cases in conversation.c where ops->updated() was
called directly.
This patch fixes those cases by calling
gaim_conversation_update() which will emit the signal
and then call ops->updated()." -- Casey Harkins
committer: Tailor Script <tailor@pidgin.im>
| author | Luke Schierer <lschiere@pidgin.im> |
|---|---|
| date | Sat, 15 Oct 2005 16:36:50 +0000 |
| parents | 3c116b4e73b7 |
| children | 0940c0077b8c |
| files | src/conversation.c src/gtkconv.c |
| diffstat | 2 files changed, 4 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/conversation.c Sat Oct 15 01:17:59 2005 +0000 +++ b/src/conversation.c Sat Oct 15 16:36:50 2005 +0000 @@ -532,9 +532,7 @@ conv->features = features; - ops = conv->ui_ops; - if(ops && ops->updated) - ops->updated(conv, GAIM_CONV_UPDATE_FEATURES); + gaim_conversation_update(conv, GAIM_CONV_UPDATE_FEATURES); } @@ -628,10 +626,7 @@ conv->title = g_strdup(title); - ops = gaim_conversation_get_ui_ops(conv); - - if (ops != NULL && ops->updated != NULL) - ops->updated(conv, GAIM_CONV_UPDATE_TITLE); + gaim_conversation_update(conv, GAIM_CONV_UPDATE_TITLE); } const char *
--- a/src/gtkconv.c Sat Oct 15 01:17:59 2005 +0000 +++ b/src/gtkconv.c Sat Oct 15 16:36:50 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_gtkconv_updated(conv, GAIM_CONV_UPDATE_ACCOUNT); + gaim_conversation_update(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_gtkconv_updated(gtkconv->active_conv, GAIM_CONV_UPDATE_UNSEEN); + gaim_conversation_update(gtkconv->active_conv, GAIM_CONV_UPDATE_UNSEEN); } /* * When a conversation window is focused, we know the user