changeset 20090:e638dec3d76b

merge of '23dc13dcb7632660e49a98fb7f2fc9510c51ce48' and '9f3e1a03b84464789d7ac690417e7822871f867b'
author Richard Laager <rlaager@wiktel.com>
date Sun, 16 Sep 2007 18:11:48 +0000
parents 94874ffc3760 (diff) c43f96170910 (current diff)
children 2ab6b55ffa3d 32ab95bbfb99 3cdf78c6c850
files
diffstat 1 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin/plugins/history.c	Sun Sep 16 16:48:46 2007 +0000
+++ b/pidgin/plugins/history.c	Sun Sep 16 18:11:48 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);