soc.2007.remotelogging: 6c5f3046: Fix a couple of merge issues and other m...

[rlaager at pidgin.im]

-----------------------------------------------------------------
Revision: 6c5f30465b7cb74cb652efade6804a7662cacebf
Ancestor: bf4a715a67f4901be173908ace99cf67086e6fe1
Author: rlaager at pidgin.im
Date: 2008-11-13T06:56:10
Branch: im.pidgin.soc.2007.remotelogging
URL: http://d.pidgin.im/viewmtn/revision/info/6c5f30465b7cb74cb652efade6804a7662cacebf

Modified files:
        libpurple/conversation.c pidgin/plugins/history.c

ChangeLog: 

Fix a couple of merge issues and other minor things I noticed.

-------------- next part --------------
============================================================
--- libpurple/conversation.c	fe8f126fa83353212f542f54d8f8b3982d76d777
+++ libpurple/conversation.c	1af0c3e5bdc35004f44db6984f280654a17e33ad
@@ -532,6 +532,10 @@ purple_conversation_destroy(PurpleConver
 	purple_conversation_close_logs(conv, purple_conversation_destroy_cb, conv);
 
 	purple_conversation_clear_message_history(conv);
+
+	PURPLE_DBUS_UNREGISTER_POINTER(conv);
+	g_free(conv);
+	conv = NULL;
 }
 
 
============================================================
--- pidgin/plugins/history.c	11fe3e23d2cd19032ab90d71ac2445775d3f15c7
+++ pidgin/plugins/history.c	1c49c79288ed47dfdb79087bc890c4f8d5158123
@@ -183,11 +183,10 @@ static void historize(PurpleConversation
 	PurpleConversationType convtype = purple_conversation_get_type(c);
 	const char *alias = name;
 	PidginConversation *gtkconv =  PIDGIN_CONVERSATION(c);
-	char *escaped_alias;
 	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)
 	{
 		GSList *buddies;
@@ -201,7 +200,7 @@ static void historize(PurpleConversation
 			return;
 
 		/* Find buddies for this conversation. */
-	        buddies = purple_find_buddies(account, name);
+		buddies = purple_find_buddies(account, name);
 
 		/* If we found at least one buddy, save the first buddy's alias. */
 		if (buddies != NULL)