Mercurial > pidgin
changeset 16447:02782d054199
merge of '92afc84de7fa4035c42fad7bfb05c642b526522f'
and 'e7b7b057b6425e37dee9de2942d68773463dd531'
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Thu, 26 Apr 2007 19:02:03 +0000 |
| parents | e4067cd1d2b2 (current diff) ae8579182400 (diff) |
| children | af1274975769 |
| files | pidgin/gtkmain.c |
| diffstat | 1 files changed, 18 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkmain.c Thu Apr 26 18:10:06 2007 +0000 +++ b/pidgin/gtkmain.c Thu Apr 26 19:02:03 2007 +0000 @@ -241,10 +241,22 @@ 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 @@ -256,7 +268,13 @@ #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) {