diff pidgin/gtkmain.c @ 25468:bf77cf06b082

propagate from branch 'im.pidgin.pidgin' (head e9234bfbd01e96e8cc032fe7d850d4108f40b82a) to branch 'im.pidgin.pidgin.yaz' (head 9314d025b5c8c2c689ae540bf6f487ed12b44e7a)

--- a/pidgin/gtkmain.c	Wed Apr 25 07:57:26 2007 +0000
+++ b/pidgin/gtkmain.c	Thu Apr 26 21:15:41 2007 +0000
@@ -243,10 +243,10 @@
 	char *icon_path;
 	int i;
 	const char *icon_sizes[] = {
-		"16",
-		"24",
-		"32",
-		"48"
+		"16x16",
+		"24x24",
+		"32x32",
+		"48x48"
 	};
 
 #endif
@@ -258,7 +258,7 @@
 #ifndef _WIN32
 	/* 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, "pixmaps", "pidgin", "icons", icon_sizes[i], "pidgin.png", NULL);
+		icon_path = g_build_filename(DATADIR, "icons", "hicolor", icon_sizes[i], "apps", "pidgin.png", NULL);
 		icon = gdk_pixbuf_new_from_file(icon_path, NULL);
 		g_free(icon_path);
 		if (icon) {
@@ -769,7 +769,7 @@
 	else
 	{
 		/* Everything is good to go--sign on already */
-		if (!purple_prefs_get_bool("/core/savedstatus/startup_current_status"))
+		if (!purple_prefs_get_bool("/purple/savedstatus/startup_current_status"))
 			purple_savedstatus_activate(purple_savedstatus_get_startup());
 		purple_accounts_restore_current_statuses();
 	}