Mercurial > pidgin.yaz
diff pidgin/plugins/history.c @ 25334:9bdd3ab8087f
propagate from branch 'im.pidgin.pidgin' (head 4cc0bbe98be861a279e3b1fd97a3b4d491dec519)
to branch 'im.pidgin.pidgin.next.minor' (head 0bc630b4c58beab06485f17e1633164d548ca68a)
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Thu, 27 Nov 2008 06:57:15 +0000 |
| parents | ed13551a592a f10aba5592c6 |
| children | ea325948453c |
line wrap: on
line diff
--- a/pidgin/plugins/history.c Thu Nov 27 06:54:03 2008 +0000 +++ b/pidgin/plugins/history.c Thu Nov 27 06:57:15 2008 +0000 @@ -47,10 +47,11 @@ convtype = purple_conversation_get_type(c); gtkconv = PIDGIN_CONVERSATION(c); - if (gtkconv == NULL) - return; + g_return_if_fail(gtkconv != NULL); - if (convtype == PURPLE_CONV_TYPE_IM && g_list_length(gtkconv->convs) < 2) + /* An IM which is the first active conversation. */ + g_return_if_fail(gtkconv->convs != NULL); + if (convtype == PURPLE_CONV_TYPE_IM && !gtkconv->convs->next) { GSList *buddies; GSList *cur;