# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1187902559 0
# Node ID 31d1143ac9ed52b19b055c5264035191fd291ad6
# Parent  3bc55836f6214086052c21da4243fdc6e2935ba3# Parent  7e70c8ba6bf4dcb3ebe6880097dec60c1a025ca8
merge of '64a21ba142d57ec69f4b25cf89b5e725ff2a4752'
     and 'b5e04374f6f6b3a7543c52514185b6d46e12bd7c'

diff -r 3bc55836f621 -r 31d1143ac9ed pidgin/plugins/musicmessaging/musicmessaging.c
--- a/pidgin/plugins/musicmessaging/musicmessaging.c	Thu Aug 23 20:03:00 2007 +0000
+++ b/pidgin/plugins/musicmessaging/musicmessaging.c	Thu Aug 23 20:55:59 2007 +0000
@@ -71,10 +71,10 @@
 
 /* Globals */
 /* List of sessions */
-GList *conversations;
+static GList *conversations;
 
 /* Pointer to this plugin */
-PurplePlugin *plugin_pointer;
+static PurplePlugin *plugin_pointer;
 
 /* Define types needed for DBus */
 DBusGConnection *connection;
@@ -350,7 +350,16 @@
 static gboolean
 intercept_received(PurpleAccount *account, char **sender, char **message, PurpleConversation *conv, int *flags)
 {
-	MMConversation *mmconv = mmconv_from_conv(conv);
+	MMConversation *mmconv;
+	
+	if (conv == NULL) {
+		/* XXX: This is just to avoid a crash (#2726).
+		 *      We may want to create the conversation instead of returning from here
+		 */
+		return FALSE;
+	}
+
+	mmconv = mmconv_from_conv(conv);
 	
 	purple_debug_misc("purple-musicmessaging", "Intercepted: %s\n", *message);
 	if (strstr(*message, MUSICMESSAGING_PREFIX))