# HG changeset patch
# User Nathan Walp <nwalp@pidgin.im>
# Date 1178765742 0
# Node ID 667a5a24781c25a867acc599431d433d16ce878a
# Parent  af4181dde6fa2f7c64e39bf68f55380d1262aa5e# Parent  9adc82b7221630fc9f43c8070cd444efdd045122
merge of '5fba6dfb4d0356ca98aa9a0c99c95135225f56db'
     and 'cf675877fb02f3868c22d6bcf0141011ac7b098e'

diff -r 9adc82b72216 -r 667a5a24781c pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Thu May 10 02:45:10 2007 +0000
+++ b/pidgin/gtkconv.c	Thu May 10 02:55:42 2007 +0000
@@ -3116,7 +3116,7 @@
 	}
 	if (gtkwin->menu.typing_icon == NULL) {
 		 gtkwin->menu.typing_icon = gtk_image_new_from_stock(stock_id, GTK_ICON_SIZE_MENU);
- 		 pidgin_menu_tray_append(PIDGIN_MENU_TRAY(gtkwin->menu.tray),
+		 pidgin_menu_tray_append(PIDGIN_MENU_TRAY(gtkwin->menu.tray),
                                                                   gtkwin->menu.typing_icon,
                                                                   _("User is typing..."));
 	} else {
@@ -3148,8 +3148,10 @@
 		return;
 
 	if (purple_conv_im_get_typing_state(im) == PURPLE_NOT_TYPING) {
-		if (gtkconv->u.im->typing_timer != 0)
+		if (gtkconv->u.im->typing_timer != 0) {
 			g_source_remove(gtkconv->u.im->typing_timer);
+			gtkconv->u.im->typing_timer = 0;
+		}
 		return;
 	}