[Gaim-commits] CVS: gaim/src conversation.c,1.676,1.677 gtkconv.c,1.620,1.621

[Luke S. <lsc...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26482/src

Modified Files:
	conversation.c gtkconv.c 
Log Message:
" 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


Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.676
retrieving revision 1.677
diff -u -d -p -r1.676 -r1.677
--- conversation.c	14 Oct 2005 11:30:36 -0000	1.676
+++ conversation.c	15 Oct 2005 16:36:50 -0000	1.677
@@ -532,9 +532,7 @@ gaim_conversation_set_features(GaimConve
 
 	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 @@ gaim_conversation_set_title(GaimConversa
 
 	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 *

Index: gtkconv.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkconv.c,v
retrieving revision 1.620
retrieving revision 1.621
diff -u -d -p -r1.620 -r1.621
--- gtkconv.c	14 Oct 2005 11:30:37 -0000	1.620
+++ gtkconv.c	15 Oct 2005 16:36:50 -0000	1.621
@@ -1910,7 +1910,7 @@ gaim_gtkconv_switch_active_conversation(
 	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_set_unseen(GaimGtkConversation *
 {
 	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