Mercurial > pidgin.yaz
changeset 17003:667a5a24781c
merge of '5fba6dfb4d0356ca98aa9a0c99c95135225f56db'
and 'cf675877fb02f3868c22d6bcf0141011ac7b098e'
| author | Nathan Walp <nwalp@pidgin.im> |
|---|---|
| date | Thu, 10 May 2007 02:55:42 +0000 |
| parents | af4181dde6fa (diff) 9adc82b72216 (current diff) |
| children | d5293baaed11 2f9e5cde6f97 |
| files | |
| diffstat | 1 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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; }