diff -r e39946ccf2a9 -r bd870d9ff0ab pidgin/plugins/history.c --- a/pidgin/plugins/history.c Thu Nov 27 05:51:03 2008 +0000 +++ b/pidgin/plugins/history.c Thu Nov 27 05:54:09 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;