comparison: pidgin/gtkmain.c
pidgin/gtkmain.c
- changeset 16499
- ca5974e057ae
- parent 16497
- b3bf63c259b7
- child 16504
- ae9a01ab4db3
equal
deleted
inserted
replaced
| 16498:57bba1532346 | 16499:ca5974e057ae |
|---|---|
| 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 <<<<<<< variant A | |
| 245 "16x16", | |
| 246 "24x24", | |
| 247 "32x24", | |
| 248 "48x48" | |
| 249 >>>>>>> variant B | |
| 250 "16x16", | 244 "16x16", |
| 251 "24x24", | 245 "24x24", |
| 252 "32x32", | 246 "32x32", |
| 253 "48x48" | 247 "48x48" |
| 254 ####### Ancestor | |
| 255 "16", | |
| 256 "24", | |
| 257 "32", | |
| 258 "48" | |
| 259 ======= end | |
| 260 }; | 248 }; |
| 261 | 249 |
| 262 #endif | 250 #endif |
| 263 | 251 |
| 264 pidgin_themes_init(); | 252 pidgin_themes_init(); |
| 266 pidgin_blist_setup_sort_methods(); | 254 pidgin_blist_setup_sort_methods(); |
| 267 | 255 |
| 268 #ifndef _WIN32 | 256 #ifndef _WIN32 |
| 269 /* use the nice PNG icon for all the windows */ | 257 /* use the nice PNG icon for all the windows */ |
| 270 for(i=0; i<G_N_ELEMENTS(icon_sizes); i++) { | 258 for(i=0; i<G_N_ELEMENTS(icon_sizes); i++) { |
| 271 <<<<<<< variant A | |
| 272 icon_path = g_build_filename(DATADIR, "icons", "hicolor", icon_sizes[i], "apps", "pidgin.png", NULL); | 259 icon_path = g_build_filename(DATADIR, "icons", "hicolor", icon_sizes[i], "apps", "pidgin.png", NULL); |
| 273 >>>>>>> variant B | |
| 274 icon_path = g_build_filename(DATADIR, "pixmaps", "icons", "hicolor", icon_sizes[i], "apps", "pidgin.png", NULL); | |
| 275 ####### Ancestor | |
| 276 icon_path = g_build_filename(DATADIR, "pixmaps", "pidgin", "icons", icon_sizes[i], "pidgin.png", NULL); | |
| 277 ======= end | |
| 278 icon = gdk_pixbuf_new_from_file(icon_path, NULL); | 260 icon = gdk_pixbuf_new_from_file(icon_path, NULL); |
| 279 g_free(icon_path); | 261 g_free(icon_path); |
| 280 if (icon) { | 262 if (icon) { |
| 281 icons = g_list_append(icons,icon); | 263 icons = g_list_append(icons,icon); |
| 282 } else { | 264 } else { |
