# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1177738695 0
# Node ID 6f3585f8a027fcc26d958dd344267c95561b634d
# Parent  99bf55ec6ca42870b1ab5ef4e626266653499628# Parent  43e119f590ce6cb462241fd8671fb0df0ce9d76b
merge of '0688801ca4ae33291c9078b8181e01f85ef7a4a1'
     and '96c17aa92f27f926d9d4c366b3c2c308f8251424'

diff -r 43e119f590ce -r 6f3585f8a027 pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Sat Apr 28 05:05:22 2007 +0000
+++ b/pidgin/gtkconv.c	Sat Apr 28 05:38:15 2007 +0000
@@ -3134,7 +3134,10 @@
 		gtk_widget_hide(gtkwin->menu.typing_icon);
 	}
 
-	if (!im || (purple_conv_im_get_typing_state(im) == PURPLE_NOT_TYPING)) {
+	if (im == NULL)
+		return;
+
+	if (purple_conv_im_get_typing_state(im) == PURPLE_NOT_TYPING) {
 		if (gtkconv->u.im->typing_timer != 0)
 			g_source_remove(gtkconv->u.im->typing_timer);
 		return;