Mercurial > pidgin
changeset 16602:60aae7ef3b7e
merge of '480a88680eddc079fa124c4db25edc86e2a3fc03'
and 'ced1da5fdb05f0972dc4d31a4c77f4fc7b844d1d'
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Sun, 29 Apr 2007 00:09:42 +0000 |
| parents | 598b66923c81 (diff) 2ddffaf3613a (current diff) |
| children | f130f097e378 4b7b9bb4ce34 |
| files | |
| diffstat | 1 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkconv.c Sat Apr 28 23:33:10 2007 +0000 +++ b/pidgin/gtkconv.c Sun Apr 29 00:09:42 2007 +0000 @@ -2370,8 +2370,13 @@ gtkconv = PIDGIN_CONVERSATION(conv); account = purple_conversation_get_account(conv); - if(account && account->gc) + + if(account && account->gc) { prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(account->gc->prpl); + } else { + gtkconv->u.im->icon_timer = 0; + return FALSE; + } gtkconv->auto_resize = TRUE; g_idle_add(reset_auto_resize_cb, gtkconv);