# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1263498674 0
# Node ID e2ea496f77bed1557349e15b64d08c3a14f193ba
# Parent  5a367a02319502c38d865e50ddcf9ccb232859c0# Parent  36daf22b09f6a1be326ff5a9cd220a4f43b41c51
merge of '4b5ba819f03c9c79eb7d9a9cce48dbb028bdd9e5'
     and 'e6cd9f8f748648ec43656d1d7e7042fd7f8d281d'

diff -r 5a367a023195 -r e2ea496f77be pidgin/gtkutils.c
--- a/pidgin/gtkutils.c	Thu Jan 14 19:49:03 2010 +0000
+++ b/pidgin/gtkutils.c	Thu Jan 14 19:51:14 2010 +0000
@@ -2723,6 +2723,7 @@
 		g_object_unref(G_OBJECT(pixbuf));
 		if (!success) {
 			purple_debug_error("buddyicon", "Could not convert icon to usable format.\n");
+			g_free(filename);
 			return NULL;
 		}