Mercurial > pidgin.yaz

changeset 12902:3bf3f489b64b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 15255] SF Patch #1406005 from Sadrul "This is a fix for bug #1386557." Basically, it moves the emission of "displayed-im-msg"/"displayed-chat-msg". committer: Tailor Script <tailor@pidgin.im>
author Richard Laager <rlaager@wiktel.com>
date Tue, 17 Jan 2006 01:54:27 +0000
parents 129a83f22349
children 2bb4dc533a31
files src/conversation.c src/gtkconv.c
diffstat 2 files changed, 7 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/conversation.c	Tue Jan 17 01:44:31 2006 +0000
+++ b/src/conversation.c	Tue Jan 17 01:54:27 2006 +0000
@@ -908,15 +908,14 @@
 			log = log->next;
 		}
 	}
-	ops->write_conv(conv, who, alias, message, flags, mtime);
-
 
 	if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM) {
 		if ((flags & GAIM_MESSAGE_RECV) == GAIM_MESSAGE_RECV) {
 			gaim_conv_im_set_typing_state(GAIM_CONV_IM(conv), GAIM_NOT_TYPING);
-			gaim_conversation_update(conv, GAIM_CONV_UPDATE_TITLE);
 		}
 	}
+
+	ops->write_conv(conv, who, alias, message, flags, mtime);
 }
 
 gboolean
--- a/src/gtkconv.c	Tue Jan 17 01:44:31 2006 +0000
+++ b/src/gtkconv.c	Tue Jan 17 01:54:27 2006 +0000
@@ -4858,11 +4858,6 @@
 	g_free(mdate);
 	g_free(sml_attrib);
 
-	gaim_signal_emit(gaim_gtk_conversations_get_handle(),
-		(type == GAIM_CONV_TYPE_IM ? "displayed-im-msg" : "displayed-chat-msg"),
-		account, conv, message, flags);
-	g_free(displaying);
-
 	/* Tab highlighting stuff */
 	if (!gaim_gtkconv_has_focus(conv))
 	{
@@ -4880,6 +4875,11 @@
 
 		gtkconv_set_unseen(gtkconv, unseen);
 	}
+
+	gaim_signal_emit(gaim_gtk_conversations_get_handle(),
+		(type == GAIM_CONV_TYPE_IM ? "displayed-im-msg" : "displayed-chat-msg"),
+		account, conv, message, flags);
+	g_free(displaying);
 }
 
 static void