changeset 20087:94874ffc3760

merge of '4edaa472ef7d3d6b4bef04843b8e7116e3a44c84' and 'dec0c8973cbfe6d9d19a6411b66a4bd740a0dd2d'
author Sadrul Habib Chowdhury <imadil@gmail.com>
date Sun, 16 Sep 2007 15:07:16 +0000
parents af72217807e2 (diff) 2a4550082d66 (current diff)
children 470feb3084a4 e638dec3d76b
files
diffstat 1 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin/plugins/history.c	Sun Sep 16 05:31:33 2007 +0000
+++ b/pidgin/plugins/history.c	Sun Sep 16 15:07:16 2007 +0000
@@ -45,6 +45,9 @@
 
 	convtype = purple_conversation_get_type(c);
 	gtkconv = PIDGIN_CONVERSATION(c);
+	if (gtkconv == NULL)
+		return;
+
 	if (convtype == PURPLE_CONV_TYPE_IM && g_list_length(gtkconv->convs) < 2)
 	{
 		GSList *buddies;
@@ -163,6 +166,7 @@
 	purple_signal_connect(purple_conversations_get_handle(),
 						"conversation-created",
 						plugin, PURPLE_CALLBACK(historize), NULL);
+	/* XXX: Do we want to listen to pidgin's "conversation-displayed" signal? */
 
 	purple_prefs_connect_callback(plugin, "/purple/logging/log_ims",
 								history_prefs_cb, plugin);