diff pidgin/gtkmain.c @ 32335:98ae4b8b592f

propagate from branch 'im.pidgin.pidgin' (head b55fa7e527d663bdb8c0320d6d035488e8446978) to branch 'im.pidgin.pidgin.mxit' (head 62c1402a9d54bdc07737fbefdfeb664eb5f01d81)
author pieter.loubser@mxit.com
date Thu, 11 Aug 2011 15:01:34 +0000
parents e2c6e4fc3c84
children 142429bcb4c8
line wrap: on
line diff
--- a/pidgin/gtkmain.c	Sun Jun 26 21:03:22 2011 +0000
+++ b/pidgin/gtkmain.c	Thu Aug 11 15:01:34 2011 +0000
@@ -270,7 +270,7 @@
 	/* use the nice PNG icon for all the windows */
 	for(i=0; i<G_N_ELEMENTS(icon_sizes); i++) {
 		icon_path = g_build_filename(DATADIR, "icons", "hicolor", icon_sizes[i].dir, "apps", icon_sizes[i].filename, NULL);
-		icon = gdk_pixbuf_new_from_file(icon_path, NULL);
+		icon = pidgin_pixbuf_new_from_file(icon_path);
 		g_free(icon_path);
 		if (icon) {
 			icons = g_list_append(icons,icon);