comparison pidgin/gtkmain.c @ 25468:bf77cf06b082

propagate from branch 'im.pidgin.pidgin' (head e9234bfbd01e96e8cc032fe7d850d4108f40b82a) to branch 'im.pidgin.pidgin.yaz' (head 9314d025b5c8c2c689ae540bf6f487ed12b44e7a)
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Thu, 26 Apr 2007 21:15:41 +0000
parents be098f796b32 74339f1f6975
children fd6c3dc4641f
comparison
equal deleted inserted replaced
25467:be098f796b32 25468:bf77cf06b082
241 GList *icons = NULL; 241 GList *icons = NULL;
242 GdkPixbuf *icon = NULL; 242 GdkPixbuf *icon = NULL;
243 char *icon_path; 243 char *icon_path;
244 int i; 244 int i;
245 const char *icon_sizes[] = { 245 const char *icon_sizes[] = {
246 "16", 246 "16x16",
247 "24", 247 "24x24",
248 "32", 248 "32x32",
249 "48" 249 "48x48"
250 }; 250 };
251 251
252 #endif 252 #endif
253 253
254 pidgin_themes_init(); 254 pidgin_themes_init();
256 pidgin_blist_setup_sort_methods(); 256 pidgin_blist_setup_sort_methods();
257 257
258 #ifndef _WIN32 258 #ifndef _WIN32
259 /* use the nice PNG icon for all the windows */ 259 /* use the nice PNG icon for all the windows */
260 for(i=0; i<G_N_ELEMENTS(icon_sizes); i++) { 260 for(i=0; i<G_N_ELEMENTS(icon_sizes); i++) {
261 icon_path = g_build_filename(DATADIR, "pixmaps", "pidgin", "icons", icon_sizes[i], "pidgin.png", NULL); 261 icon_path = g_build_filename(DATADIR, "icons", "hicolor", icon_sizes[i], "apps", "pidgin.png", NULL);
262 icon = gdk_pixbuf_new_from_file(icon_path, NULL); 262 icon = gdk_pixbuf_new_from_file(icon_path, NULL);
263 g_free(icon_path); 263 g_free(icon_path);
264 if (icon) { 264 if (icon) {
265 icons = g_list_append(icons,icon); 265 icons = g_list_append(icons,icon);
266 } else { 266 } else {
767 purple_savedstatus_activate(saved_status); 767 purple_savedstatus_activate(saved_status);
768 } 768 }
769 else 769 else
770 { 770 {
771 /* Everything is good to go--sign on already */ 771 /* Everything is good to go--sign on already */
772 if (!purple_prefs_get_bool("/core/savedstatus/startup_current_status")) 772 if (!purple_prefs_get_bool("/purple/savedstatus/startup_current_status"))
773 purple_savedstatus_activate(purple_savedstatus_get_startup()); 773 purple_savedstatus_activate(purple_savedstatus_get_startup());
774 purple_accounts_restore_current_statuses(); 774 purple_accounts_restore_current_statuses();
775 } 775 }
776 776
777 if ((accounts = purple_accounts_get_all_active()) == NULL) 777 if ((accounts = purple_accounts_get_all_active()) == NULL)