Mercurial > pidgin.yaz
comparison pidgin/gtkconv.c @ 19230:da310fe624f1
Don't try to remove a timer that doesn't exist
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Mon, 13 Aug 2007 05:50:32 +0000 |
parents | f1fb41d31c70 |
children | 03d81500766d |
comparison
equal
deleted
inserted
replaced
19229:f1fb41d31c70 | 19230:da310fe624f1 |
---|---|
3338 stock_id = PIDGIN_STOCK_ANIMATION_TYPING1; | 3338 stock_id = PIDGIN_STOCK_ANIMATION_TYPING1; |
3339 tooltip = _("User is typing..."); | 3339 tooltip = _("User is typing..."); |
3340 } else { | 3340 } else { |
3341 stock_id = PIDGIN_STOCK_ANIMATION_TYPING5; | 3341 stock_id = PIDGIN_STOCK_ANIMATION_TYPING5; |
3342 tooltip = _("User has typed something and stopped"); | 3342 tooltip = _("User has typed something and stopped"); |
3343 g_source_remove(gtkconv->u.im->typing_timer); | 3343 if (gtkconv->u.im->typing_timer != 0) { |
3344 gtkconv->u.im->typing_timer = 0; | 3344 g_source_remove(gtkconv->u.im->typing_timer); |
3345 gtkconv->u.im->typing_timer = 0; | |
3346 } | |
3345 } | 3347 } |
3346 | 3348 |
3347 if (gtkwin->menu.typing_icon == NULL) | 3349 if (gtkwin->menu.typing_icon == NULL) |
3348 { | 3350 { |
3349 gtkwin->menu.typing_icon = gtk_image_new_from_stock(stock_id, GTK_ICON_SIZE_MENU); | 3351 gtkwin->menu.typing_icon = gtk_image_new_from_stock(stock_id, GTK_ICON_SIZE_MENU); |