# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1280118276 0
# Node ID 673c545af5b00a60e049982cb6ede863b6f78be4
# Parent  82f26939d2ba30c4effe4c2ff8bff68f3da7e7c2# Parent  b6c3000eec60f845f83a210b7de05acf59256e96
propagate from branch 'im.pidgin.pidgin' (head d198e35f28e8800ec2979cfb22965fbe0a31e10d)
            to branch 'im.pidgin.cpw.qulogic.gtk3' (head d0c6c98ad725a3a64114bd1d5c1da1220d738c93)

diff -r 82f26939d2ba -r 673c545af5b0 ChangeLog.API
--- a/ChangeLog.API	Mon Jul 26 04:14:44 2010 +0000
+++ b/ChangeLog.API	Mon Jul 26 04:24:36 2010 +0000
@@ -18,6 +18,9 @@
 		  the visibility of the entries in the 'lean' view
 		  (the default toolbar view).
 
+		Deprecated:
+		* pidgin_check_if_dir
+
 	libgnt:
 		Added:
 		* gnt_tree_row_get_key, gnt_tree_row_get_next,
diff -r 82f26939d2ba -r 673c545af5b0 pidgin/gtkdialogs.c
--- a/pidgin/gtkdialogs.c	Mon Jul 26 04:14:44 2010 +0000
+++ b/pidgin/gtkdialogs.c	Mon Jul 26 04:24:36 2010 +0000
@@ -430,7 +430,8 @@
 
 	/* Insert the logo */
 	logo = gtk_image_new_from_pixbuf(pixbuf);
-	g_object_unref(G_OBJECT(pixbuf));
+	if (pixbuf)
+		g_object_unref(G_OBJECT(pixbuf));
 	obj = gtk_widget_get_accessible(logo);
 	tmp = g_strconcat(PIDGIN_NAME, " " DISPLAY_VERSION, NULL);
 	atk_object_set_description(obj, tmp);
diff -r 82f26939d2ba -r 673c545af5b0 pidgin/gtkutils.h