Mercurial > pidgin.yaz
changeset 16454:e3401609d377
merge of '49d1ed52eed181ce385858122ed018d2f2aa4246'
and '852b15bc78f86f0071fa04071a95672d1d0c389b'
| author | Luke Schierer <lschiere@pidgin.im> |
|---|---|
| date | Thu, 26 Apr 2007 20:04:02 +0000 |
| parents | 74339f1f6975 (diff) bda5d7407bf7 (current diff) |
| children | 81e3c44ecaac |
| files | |
| diffstat | 1 files changed, 0 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkmain.c Thu Apr 26 19:50:36 2007 +0000 +++ b/pidgin/gtkmain.c Thu Apr 26 20:04:02 2007 +0000 @@ -241,22 +241,10 @@ char *icon_path; int i; const char *icon_sizes[] = { -<<<<<<< variant A - "16x16", - "24x24", - "32x24", - "48x48" ->>>>>>> variant B "16x16", "24x24", "32x32", "48x48" -####### Ancestor - "16", - "24", - "32", - "48" -======= end }; #endif @@ -268,13 +256,7 @@ #ifndef _WIN32 /* use the nice PNG icon for all the windows */ for(i=0; i<G_N_ELEMENTS(icon_sizes); i++) { -<<<<<<< variant A icon_path = g_build_filename(DATADIR, "icons", "hicolor", icon_sizes[i], "apps", "pidgin.png", NULL); ->>>>>>> variant B - icon_path = g_build_filename(DATADIR, "pixmaps", "icons", "hicolor", icon_sizes[i], "apps", "pidgin.png", NULL); -####### Ancestor - icon_path = g_build_filename(DATADIR, "pixmaps", "pidgin", "icons", icon_sizes[i], "pidgin.png", NULL); -======= end icon = gdk_pixbuf_new_from_file(icon_path, NULL); g_free(icon_path); if (icon) {