Mercurial > pidgin.yaz
changeset 16579:6f3585f8a027
merge of '0688801ca4ae33291c9078b8181e01f85ef7a4a1'
and '96c17aa92f27f926d9d4c366b3c2c308f8251424'
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Sat, 28 Apr 2007 05:38:15 +0000 |
| parents | 99bf55ec6ca4 (diff) 43e119f590ce (current diff) |
| children | 390987ecddf3 |
| files | |
| diffstat | 1 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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;