comparison: pidgin/gtkmain.c
pidgin/gtkmain.c
- changeset 16504
- ae9a01ab4db3
- parent 16499
- ca5974e057ae
- child 16545
- 5188ffbaeb6e
equal
deleted
inserted
replaced
| 16503:4b14e6e62b09 | 16504:ae9a01ab4db3 |
|---|---|
| 238 #ifndef _WIN32 | 238 #ifndef _WIN32 |
| 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 struct { |
| 244 "16x16", | 244 const char *dir; |
| 245 "24x24", | 245 const char *filename; |
| 246 "32x32", | 246 } icon_sizes[] = { |
| 247 "48x48" | 247 {"16x16", "pidgin.png"}, |
| 248 {"24x24", "pidgin.png"}, | |
| 249 {"32x32", "pidgin.png"}, | |
| 250 {"48x48", "pidgin.png"}, | |
| 251 {"scalable", "pidgin.svg"} | |
| 248 }; | 252 }; |
| 249 | 253 |
| 250 #endif | 254 #endif |
| 251 | 255 |
| 252 pidgin_themes_init(); | 256 pidgin_themes_init(); |
| 254 pidgin_blist_setup_sort_methods(); | 258 pidgin_blist_setup_sort_methods(); |
| 255 | 259 |
| 256 #ifndef _WIN32 | 260 #ifndef _WIN32 |
| 257 /* use the nice PNG icon for all the windows */ | 261 /* use the nice PNG icon for all the windows */ |
| 258 for(i=0; i<G_N_ELEMENTS(icon_sizes); i++) { | 262 for(i=0; i<G_N_ELEMENTS(icon_sizes); i++) { |
| 259 icon_path = g_build_filename(DATADIR, "icons", "hicolor", icon_sizes[i], "apps", "pidgin.png", NULL); | 263 icon_path = g_build_filename(DATADIR, "icons", "hicolor", icon_sizes[i].dir, "apps", icon_sizes[i].filename, NULL); |
| 260 icon = gdk_pixbuf_new_from_file(icon_path, NULL); | 264 icon = gdk_pixbuf_new_from_file(icon_path, NULL); |
| 261 g_free(icon_path); | 265 g_free(icon_path); |
| 262 if (icon) { | 266 if (icon) { |
| 263 icons = g_list_append(icons,icon); | 267 icons = g_list_append(icons,icon); |
| 264 } else { | 268 } else { |
