# HG changeset patch # User Daniel Atallah # Date 1175723825 0 # Node ID bd49e48ba3377c32ea6f878f85c94d4b9be90532 # Parent 5db7909331fa0238085978d6d29688376570e823# Parent f77f1d5870b6ed1565ee6f46bb3c3037c3b588a0 merge of '4b0f41a73b406685da6c053dbdd7dc909b4e4183' and '5e1e1599fddeeecfcd8b76796b71073f780cadfd' diff -r f77f1d5870b6 -r bd49e48ba337 configure.ac --- a/configure.ac Wed Apr 04 20:22:19 2007 +0000 +++ b/configure.ac Wed Apr 04 21:57:05 2007 +0000 @@ -1922,6 +1922,15 @@ pidgin/pixmaps/emotes/default/22/Makefile pidgin/pixmaps/emotes/default/22/scalable/Makefile pidgin/pixmaps/emotes/none/Makefile + pidgin/pixmaps/icons/Makefile + pidgin/pixmaps/icons/16/Makefile + pidgin/pixmaps/icons/16/scalable/Makefile + pidgin/pixmaps/icons/24/Makefile + pidgin/pixmaps/icons/24/scalable/Makefile + pidgin/pixmaps/icons/32/Makefile + pidgin/pixmaps/icons/32/scalable/Makefile + pidgin/pixmaps/icons/48/Makefile + pidgin/pixmaps/icons/48/scalable/Makefile pidgin/pixmaps/protocols/Makefile pidgin/pixmaps/protocols/16/Makefile pidgin/pixmaps/protocols/16/scalable/Makefile diff -r f77f1d5870b6 -r bd49e48ba337 pidgin/gtkmain.c --- a/pidgin/gtkmain.c Wed Apr 04 20:22:19 2007 +0000 +++ b/pidgin/gtkmain.c Wed Apr 04 21:57:05 2007 +0000 @@ -239,6 +239,14 @@ GList *icons = NULL; GdkPixbuf *icon = NULL; char *icon_path; + int i; + const char *icon_sizes[] = { + "16", + "24", + "32", + "48" + }; + #endif pidginthemes_init(); @@ -247,17 +255,24 @@ #ifndef _WIN32 /* use the nice PNG icon for all the windows */ - icon_path = g_build_filename(DATADIR, "pixmaps", "pidgin", "icons", "window-icon.png", NULL); - icon = gdk_pixbuf_new_from_file(icon_path, NULL); - g_free(icon_path); - if (icon) { - icons = g_list_append(icons,icon); + for(i=0; i + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff -r f77f1d5870b6 -r bd49e48ba337 pidgin/pixmaps/icons/24/Makefile.am --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/icons/24/Makefile.am Wed Apr 04 21:57:05 2007 +0000 @@ -0,0 +1,8 @@ +SUBDIRS = scalable + +EXTRA_DIST = pidgin.png + +pidginiconspixdir = $(datadir)/pixmaps/pidgin/icons/24 + +pidginiconspix_DATA = $(EXTRA_DIST) + diff -r f77f1d5870b6 -r bd49e48ba337 pidgin/pixmaps/icons/24/Makefile.mingw --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/icons/24/Makefile.mingw Wed Apr 04 21:57:05 2007 +0000 @@ -0,0 +1,14 @@ +# +# Makefile.mingw +# +# Description: Makefile for win32 (mingw) version of Gaim pixmaps +# + +include ./Makefile.am + +install: + if test '$(SUBDIRS)'; then \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + $(MAKE) -C $$subdir -f Makefile.mingw install || exit 1; \ + done; \ + fi; diff -r f77f1d5870b6 -r bd49e48ba337 pidgin/pixmaps/icons/24/pidgin.png Binary file pidgin/pixmaps/icons/24/pidgin.png has changed diff -r f77f1d5870b6 -r bd49e48ba337 pidgin/pixmaps/icons/24/scalable/Makefile.am --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/icons/24/scalable/Makefile.am Wed Apr 04 21:57:05 2007 +0000 @@ -0,0 +1,1 @@ +EXTRA_DIST = pidgin.svg diff -r f77f1d5870b6 -r bd49e48ba337 pidgin/pixmaps/icons/24/scalable/pidgin.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/icons/24/scalable/pidgin.svg Wed Apr 04 21:57:05 2007 +0000 @@ -0,0 +1,292 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff -r f77f1d5870b6 -r bd49e48ba337 pidgin/pixmaps/icons/32/Makefile.am --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/icons/32/Makefile.am Wed Apr 04 21:57:05 2007 +0000 @@ -0,0 +1,8 @@ +SUBDIRS = scalable + +EXTRA_DIST = pidgin.png + +pidginiconspixdir = $(datadir)/pixmaps/pidgin/icons/32 + +pidginiconspix_DATA = $(EXTRA_DIST) + diff -r f77f1d5870b6 -r bd49e48ba337 pidgin/pixmaps/icons/32/Makefile.mingw --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/icons/32/Makefile.mingw Wed Apr 04 21:57:05 2007 +0000 @@ -0,0 +1,14 @@ +# +# Makefile.mingw +# +# Description: Makefile for win32 (mingw) version of Gaim pixmaps +# + +include ./Makefile.am + +install: + if test '$(SUBDIRS)'; then \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + $(MAKE) -C $$subdir -f Makefile.mingw install || exit 1; \ + done; \ + fi; diff -r f77f1d5870b6 -r bd49e48ba337 pidgin/pixmaps/icons/32/pidgin.png Binary file pidgin/pixmaps/icons/32/pidgin.png has changed diff -r f77f1d5870b6 -r bd49e48ba337 pidgin/pixmaps/icons/32/scalable/Makefile.am --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/icons/32/scalable/Makefile.am Wed Apr 04 21:57:05 2007 +0000 @@ -0,0 +1,1 @@ +EXTRA_DIST = pidgin.svg diff -r f77f1d5870b6 -r bd49e48ba337 pidgin/pixmaps/icons/32/scalable/pidgin.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/icons/32/scalable/pidgin.svg Wed Apr 04 21:57:05 2007 +0000 @@ -0,0 +1,292 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff -r f77f1d5870b6 -r bd49e48ba337 pidgin/pixmaps/icons/48/Makefile.am --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/icons/48/Makefile.am Wed Apr 04 21:57:05 2007 +0000 @@ -0,0 +1,8 @@ +SUBDIRS = scalable + +EXTRA_DIST = pidgin.png + +pidginiconspixdir = $(datadir)/pixmaps/pidgin/icons/48 + +pidginiconspix_DATA = $(EXTRA_DIST) + diff -r f77f1d5870b6 -r bd49e48ba337 pidgin/pixmaps/icons/48/Makefile.mingw --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/icons/48/Makefile.mingw Wed Apr 04 21:57:05 2007 +0000 @@ -0,0 +1,14 @@ +# +# Makefile.mingw +# +# Description: Makefile for win32 (mingw) version of Gaim pixmaps +# + +include ./Makefile.am + +install: + if test '$(SUBDIRS)'; then \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + $(MAKE) -C $$subdir -f Makefile.mingw install || exit 1; \ + done; \ + fi; diff -r f77f1d5870b6 -r bd49e48ba337 pidgin/pixmaps/icons/48/pidgin.png Binary file pidgin/pixmaps/icons/48/pidgin.png has changed diff -r f77f1d5870b6 -r bd49e48ba337 pidgin/pixmaps/icons/48/scalable/Makefile.am --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/icons/48/scalable/Makefile.am Wed Apr 04 21:57:05 2007 +0000 @@ -0,0 +1,1 @@ +EXTRA_DIST = pidgin.svg diff -r f77f1d5870b6 -r bd49e48ba337 pidgin/pixmaps/icons/48/scalable/pidgin.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/icons/48/scalable/pidgin.svg Wed Apr 04 21:57:05 2007 +0000 @@ -0,0 +1,293 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff -r f77f1d5870b6 -r bd49e48ba337 pidgin/pixmaps/icons/Makefile.am --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/icons/Makefile.am Wed Apr 04 21:57:05 2007 +0000 @@ -0,0 +1,9 @@ +SUBDIRS = 16 24 32 48 + +EXTRA_DIST = \ + Makefile.mingw \ + 16/Makefile.mingw \ + 22/Makefile.mingw \ + 32/Makefile.mingw \ + 48/Makefile.mingw + diff -r f77f1d5870b6 -r bd49e48ba337 pidgin/pixmaps/icons/Makefile.mingw --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/icons/Makefile.mingw Wed Apr 04 21:57:05 2007 +0000 @@ -0,0 +1,14 @@ +# +# Makefile.mingw +# +# Description: Makefile for win32 (mingw) version of Gaim pixmaps +# + +include ./Makefile.am + +install: + if test '$(SUBDIRS)'; then \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + $(MAKE) -C $$subdir -f Makefile.mingw install || exit 1; \ + done; \ + fi; diff -r f77f1d5870b6 -r bd49e48ba337 pidgin/pixmaps/window-icon.png Binary file pidgin/pixmaps/window-icon.png has changed