soc.2007.remotelogging: 075feafc: fixed problems arised from propagation

[hajo at h-yo.de]

-----------------------------------------------------------------
Revision: 075feafc75f41161a6a370e21ab8778a5226cbdb
Ancestor: 7f8ee7b005a7a3af63e09e94148a469f460da3e4
Author: hajo at h-yo.de
Date: 2007-12-04T10:58:02
Branch: im.pidgin.soc.2007.remotelogging
URL: http://d.pidgin.im/viewmtn/revision/info/075feafc75f41161a6a370e21ab8778a5226cbdb

Modified files:
        libpurple/status.c pidgin/gtklog.c

ChangeLog: 

fixed problems arised from propagation

-------------- next part --------------
============================================================
--- libpurple/status.c	289be2e885732328bcd0af8f657049c369aa23d5
+++ libpurple/status.c	624743b6c47dd335153aa13a3f399c66e1a191d6
@@ -640,12 +640,11 @@ notify_buddy_status_update(PurpleBuddy *
 		if (log != NULL)
 		{
 			purple_log_write_nonblocking(log, PURPLE_MESSAGE_SYSTEM, buddy_alias,
-			               current_time, tmp, NULL, NULL);
-			               current_time, logtmp);
-		}
+			               current_time, logtmp, NULL, NULL);
+			//will free logtmp for us
+		} else g_free(logtmp);
 
 		g_free(tmp);
-		g_free(logtmp);
 	}
 }
 
============================================================
--- pidgin/gtklog.c	5cada368407e45cabd2aa0628075c1d17648f573
+++ pidgin/gtklog.c	c51355fb87dd52d4ceac5aa7c9950c71ff518613
@@ -860,12 +860,10 @@ void pidgin_log_show(PurpleLogType type,
 	pidgin_log_data = g_new0(struct _pidgin_log_data, 1);
 	prpl_icon = pidgin_create_prpl_icon(account, PIDGIN_PRPL_ICON_MEDIUM);
 
-	display_log_viewer(ht, purple_log_get_logs(type, screenname, account),
+	pidgin_log_data->log_viewer = display_log_viewer_nonblocking(ht, title, prpl_icon, TRUE);
 
-	if (prpl_icon)
-		g_object_unref(prpl_icon);
-	pidgin_log_data->log_viewer = display_log_viewer_nonblocking(ht, title, 
-		gtk_image_new_from_pixbuf(pidgin_create_prpl_icon(account, PIDGIN_PRPL_ICON_MEDIUM)), TRUE);
+	if (prpl_icon) g_object_unref(prpl_icon);
+
 	g_free(title);
 	pidgin_log_data->destroy_handler_id = g_signal_connect(G_OBJECT(pidgin_log_data->log_viewer->window), "destroy", 
 							G_CALLBACK(pidgin_window_destroy_cb), pidgin_log_data);