pidgin: bbd0bbed: Don't try to remove a timeout on a NULL ...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: bbd0bbedd3778483d63f47092fced0d34ab639e5
Ancestor: 8f0a3e68547fbc66188357edbf6694bd8dd2d557
Author: qulogic at pidgin.im
Date: 2009-12-31T00:33:12
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/bbd0bbedd3778483d63f47092fced0d34ab639e5

Modified files:
        pidgin/gtkconv.c

ChangeLog: 

Don't try to remove a timeout on a NULL conversation, which can happen when
the received-im-msg signal is called for a message-that-starts-a-conv. This
fixes a small ("fatal") g_log thing.

-------------- next part --------------
============================================================
--- pidgin/gtkconv.c	2e655f4499d182169e3de77a172ca55839816e52
+++ pidgin/gtkconv.c	225ef256cf2eeade319d912d7cbfa990b2fa450d
@@ -5493,10 +5493,12 @@ received_im_msg_cb(PurpleAccount *accoun
 	}
 
 	/* Somebody wants to keep this conversation around, so don't time it out */
-	timer = GPOINTER_TO_INT(purple_conversation_get_data(conv, "close-timer"));
-	if (timer) {
-		purple_timeout_remove(timer);
-		purple_conversation_set_data(conv, "close-timer", GINT_TO_POINTER(0));
+	if (conv) {
+		timer = GPOINTER_TO_INT(purple_conversation_get_data(conv, "close-timer"));
+		if (timer) {
+			purple_timeout_remove(timer);
+			purple_conversation_set_data(conv, "close-timer", GINT_TO_POINTER(0));
+		}
 	}
 }