Mercurial > pidgin.yaz

comparison pidgin/gtkmain.c @ 16449:e4067cd1d2b2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Look for the new icons in the new directory and update the RPM spec file to match too.
author Stu Tomlinson <stu@nosnilmot.com>
date Thu, 26 Apr 2007 18:10:06 +0000
parents 4999bbc52881
children 02782d054199
comparison
equal deleted inserted replaced
16447:d11491f579fd 16449:e4067cd1d2b2
239 GList *icons = NULL; 239 GList *icons = NULL;
240 GdkPixbuf *icon = NULL; 240 GdkPixbuf *icon = NULL;
241 char *icon_path; 241 char *icon_path;
242 int i; 242 int i;
243 const char *icon_sizes[] = { 243 const char *icon_sizes[] = {
244 "16", 244 "16x16",
245 "24", 245 "24x24",
246 "32", 246 "32x24",
247 "48" 247 "48x48"
248 }; 248 };
249 249
250 #endif 250 #endif
251 251
252 pidgin_themes_init(); 252 pidgin_themes_init();
254 pidgin_blist_setup_sort_methods(); 254 pidgin_blist_setup_sort_methods();
255 255
256 #ifndef _WIN32 256 #ifndef _WIN32
257 /* use the nice PNG icon for all the windows */ 257 /* use the nice PNG icon for all the windows */
258 for(i=0; i<G_N_ELEMENTS(icon_sizes); i++) { 258 for(i=0; i<G_N_ELEMENTS(icon_sizes); i++) {
259 icon_path = g_build_filename(DATADIR, "pixmaps", "pidgin", "icons", icon_sizes[i], "pidgin.png", NULL); 259 icon_path = g_build_filename(DATADIR, "icons", "hicolor", icon_sizes[i], "apps", "pidgin.png", NULL);
260 icon = gdk_pixbuf_new_from_file(icon_path, NULL); 260 icon = gdk_pixbuf_new_from_file(icon_path, NULL);
261 g_free(icon_path); 261 g_free(icon_path);
262 if (icon) { 262 if (icon) {
263 icons = g_list_append(icons,icon); 263 icons = g_list_append(icons,icon);
264 } else { 264 } else {