im.pidgin.pidgin: 5ea15b000ee727088be88bb335c2ded6b2ab96e3

[datallah at pidgin.im]

revision:            5ea15b000ee727088be88bb335c2ded6b2ab96e3
date:                2007-10-09T00:24:45
author:              datallah at pidgin.im
branch:              im.pidgin.pidgin
changelog:
We need to unref the pixmaps after adding them to a list store.

manifest:
format_version "1"

new_manifest [857f65986bdd678a0834673cf726cb169d70f548]

old_revision [b7a2c4d81867c3bbd262c2a4b1d924ea7fd3afb6]

patch "pidgin/gtkblist.c"
 from [20d4c6929ae45f970883905603d6e91ea34b7e99]
   to [02e5b0271d5808ce4057364ca6486fe086455f69]

patch "pidgin/gtkconv.c"
 from [c5601ad27c7e3be9a61b7e1e38966c9b5f447ff0]
   to [e6aa87df628c5d62d0fddeea4caab473c62e8682]
-------------- next part --------------
============================================================
--- pidgin/gtkblist.c	20d4c6929ae45f970883905603d6e91ea34b7e99
+++ pidgin/gtkblist.c	02e5b0271d5808ce4057364ca6486fe086455f69
@@ -5367,7 +5367,7 @@ static void buddy_node(PurpleBuddy *budd
 			   BUDDY_ICON_COLUMN, avatar,
 			   BUDDY_ICON_VISIBLE_COLUMN, biglist,
 			   EMBLEM_COLUMN, emblem,
-			   EMBLEM_VISIBLE_COLUMN, emblem,
+			   EMBLEM_VISIBLE_COLUMN, (emblem != NULL),
 			   PROTOCOL_ICON_COLUMN, pidgin_create_prpl_icon(buddy->account, PIDGIN_PRPL_ICON_SMALL),
 			   PROTOCOL_ICON_VISIBLE_COLUMN, purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_protocol_icons"),
 			   BGCOLOR_COLUMN, NULL,
@@ -5378,6 +5378,8 @@ static void buddy_node(PurpleBuddy *budd
 
 	g_free(mark);
 	g_free(idle);
+	if(emblem)
+		g_object_unref(emblem);
 	if(status)
 		g_object_unref(status);
 	if(avatar)
@@ -5549,6 +5551,8 @@ static void pidgin_blist_update_chat(Pur
 				-1);
 
 		g_free(mark);
+		if(emblem)
+			g_object_unref(emblem);
 		if(status)
 			g_object_unref(status);
 		if(avatar)
============================================================
--- pidgin/gtkconv.c	c5601ad27c7e3be9a61b7e1e38966c9b5f447ff0
+++ pidgin/gtkconv.c	e6aa87df628c5d62d0fddeea4caab473c62e8682
@@ -2498,11 +2498,16 @@ update_tab_icon(PurpleConversation *conv
 	gtk_list_store_set(GTK_LIST_STORE(gtkconv->infopane_model), 
 			&(gtkconv->infopane_iter),
 			CONV_EMBLEM_COLUMN, emblem, -1);
+	if (emblem)
+		g_object_unref(emblem);
 
 	if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_protocol_icons")) {
+		emblem = pidgin_create_prpl_icon(gtkconv->active_conv->account, PIDGIN_PRPL_ICON_SMALL);
 		gtk_list_store_set(GTK_LIST_STORE(gtkconv->infopane_model),
 			&(gtkconv->infopane_iter),
-			CONV_PROTOCOL_ICON_COLUMN, pidgin_create_prpl_icon(gtkconv->active_conv->account, PIDGIN_PRPL_ICON_SMALL), -1);
+			CONV_PROTOCOL_ICON_COLUMN, emblem, -1);
+		if (emblem)
+			g_object_unref(emblem);
 	}
 
 	/* XXX seanegan Why do I have to do this? */
@@ -4728,7 +4733,6 @@ setup_common_pane(PidginConversation *gt
 	g_object_set(rend, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
 #endif
 
-
 	rend = gtk_cell_renderer_pixbuf_new();
 	gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(gtkconv->infopane), rend, FALSE);
 	gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(gtkconv->infopane), rend, "pixbuf", CONV_PROTOCOL_ICON_COLUMN, NULL);