From 8f4fd68cd81c166b0a261ff0a9c02fd9e7b4a9aa Mon Sep 17 00:00:00 2001 From: Stu Tomlinson Date: Sat, 10 Nov 2007 16:34:33 +0000 Subject: Consolidation of icons Makefiles --- configure.ac | 5 - pidgin/pixmaps/Makefile.am | 30 +- pidgin/pixmaps/Makefile.mingw | 2 - pidgin/pixmaps/icons/16/Makefile.am | 6 - pidgin/pixmaps/icons/16/pidgin.png | Bin 811 -> 0 bytes pidgin/pixmaps/icons/16/scalable/pidgin.svg | 784 --------------------- pidgin/pixmaps/icons/22/Makefile.am | 6 - pidgin/pixmaps/icons/22/pidgin.png | Bin 1292 -> 0 bytes pidgin/pixmaps/icons/22/scalable/pidgin.svg | 591 ---------------- pidgin/pixmaps/icons/24/Makefile.am | 6 - pidgin/pixmaps/icons/24/pidgin.png | Bin 1364 -> 0 bytes pidgin/pixmaps/icons/24/scalable/pidgin.svg | 589 ---------------- pidgin/pixmaps/icons/32/Makefile.am | 6 - pidgin/pixmaps/icons/32/pidgin.png | Bin 1880 -> 0 bytes pidgin/pixmaps/icons/32/scalable/pidgin.svg | 489 ------------- pidgin/pixmaps/icons/48/Makefile.am | 6 - pidgin/pixmaps/icons/48/pidgin.png | Bin 3039 -> 0 bytes pidgin/pixmaps/icons/48/scalable/pidgin.svg | 460 ------------ pidgin/pixmaps/icons/hicolor/16x16/apps/pidgin.png | Bin 0 -> 811 bytes .../icons/hicolor/16x16/apps/scalable/pidgin.svg | 784 +++++++++++++++++++++ pidgin/pixmaps/icons/hicolor/22x22/apps/pidgin.png | Bin 0 -> 1292 bytes .../icons/hicolor/22x22/apps/scalable/pidgin.svg | 591 ++++++++++++++++ pidgin/pixmaps/icons/hicolor/24x24/apps/pidgin.png | Bin 0 -> 1364 bytes .../icons/hicolor/24x24/apps/scalable/pidgin.svg | 589 ++++++++++++++++ pidgin/pixmaps/icons/hicolor/32x32/apps/pidgin.png | Bin 0 -> 1880 bytes .../icons/hicolor/32x32/apps/scalable/pidgin.svg | 489 +++++++++++++ pidgin/pixmaps/icons/hicolor/48x48/apps/pidgin.png | Bin 0 -> 3039 bytes .../icons/hicolor/48x48/apps/scalable/pidgin.svg | 460 ++++++++++++ 28 files changed, 2936 insertions(+), 2957 deletions(-) delete mode 100644 pidgin/pixmaps/icons/16/Makefile.am delete mode 100644 pidgin/pixmaps/icons/16/pidgin.png delete mode 100644 pidgin/pixmaps/icons/16/scalable/pidgin.svg delete mode 100644 pidgin/pixmaps/icons/22/Makefile.am delete mode 100644 pidgin/pixmaps/icons/22/pidgin.png delete mode 100644 pidgin/pixmaps/icons/22/scalable/pidgin.svg delete mode 100644 pidgin/pixmaps/icons/24/Makefile.am delete mode 100644 pidgin/pixmaps/icons/24/pidgin.png delete mode 100644 pidgin/pixmaps/icons/24/scalable/pidgin.svg delete mode 100644 pidgin/pixmaps/icons/32/Makefile.am delete mode 100644 pidgin/pixmaps/icons/32/pidgin.png delete mode 100644 pidgin/pixmaps/icons/32/scalable/pidgin.svg delete mode 100644 pidgin/pixmaps/icons/48/Makefile.am delete mode 100644 pidgin/pixmaps/icons/48/pidgin.png delete mode 100644 pidgin/pixmaps/icons/48/scalable/pidgin.svg create mode 100644 pidgin/pixmaps/icons/hicolor/16x16/apps/pidgin.png create mode 100644 pidgin/pixmaps/icons/hicolor/16x16/apps/scalable/pidgin.svg create mode 100644 pidgin/pixmaps/icons/hicolor/22x22/apps/pidgin.png create mode 100644 pidgin/pixmaps/icons/hicolor/22x22/apps/scalable/pidgin.svg create mode 100644 pidgin/pixmaps/icons/hicolor/24x24/apps/pidgin.png create mode 100644 pidgin/pixmaps/icons/hicolor/24x24/apps/scalable/pidgin.svg create mode 100644 pidgin/pixmaps/icons/hicolor/32x32/apps/pidgin.png create mode 100644 pidgin/pixmaps/icons/hicolor/32x32/apps/scalable/pidgin.svg create mode 100644 pidgin/pixmaps/icons/hicolor/48x48/apps/pidgin.png create mode 100644 pidgin/pixmaps/icons/hicolor/48x48/apps/scalable/pidgin.svg diff --git a/configure.ac b/configure.ac index 6ab6609f13..f5908f8fd9 100644 --- a/configure.ac +++ b/configure.ac @@ -2208,11 +2208,6 @@ AC_OUTPUT([Makefile pidgin/pixmaps/buddy_icons/qq/Makefile pidgin/pixmaps/emotes/default/24/Makefile pidgin/pixmaps/emotes/none/Makefile - pidgin/pixmaps/icons/16/Makefile - pidgin/pixmaps/icons/22/Makefile - pidgin/pixmaps/icons/24/Makefile - pidgin/pixmaps/icons/32/Makefile - pidgin/pixmaps/icons/48/Makefile pidgin/plugins/Makefile pidgin/plugins/cap/Makefile pidgin/plugins/gestures/Makefile diff --git a/pidgin/pixmaps/Makefile.am b/pidgin/pixmaps/Makefile.am index ade830782c..1c27947bbd 100644 --- a/pidgin/pixmaps/Makefile.am +++ b/pidgin/pixmaps/Makefile.am @@ -1,7 +1,7 @@ pidginpixmapdir = $(datadir)/pixmaps/pidgin +pidginiconsdir = $(datadir) -SUBDIRS = buddy_icons/qq emotes/default/24 emotes/none \ - icons/16 icons/22 icons/24 icons/32 icons/48 +SUBDIRS = buddy_icons/qq emotes/default/24 emotes/none MAKEFILE_MINGW = \ buddy_icons/qq/Makefile.mingw \ @@ -323,19 +323,29 @@ PROTOCOLS_16 = \ protocols/16/zephyr.png ICONS_16_SCALABLE = \ - icons/16/scalable/pidgin.svg + icons/hicolor/16x16/apps/scalable/pidgin.svg + +ICONS_16 = icons/hicolor/16x16/apps/pidgin.png ICONS_22_SCALABLE = \ - icons/22/scalable/pidgin.svg + icons/hicolor/22x22/apps/scalable/pidgin.svg + +ICONS_22 = icons/hicolor/22x22/apps/pidgin.png ICONS_24_SCALABLE = \ - icons/24/scalable/pidgin.svg + icons/hicolor/24x24/apps/scalable/pidgin.svg + +ICONS_24 = icons/hicolor/24x24/apps/pidgin.png ICONS_32_SCALABLE = \ - icons/32/scalable/pidgin.svg + icons/hicolor/32x32/apps/scalable/pidgin.svg + +ICONS_32 = icons/hicolor/32x32/apps/pidgin.png ICONS_48_SCALABLE = \ - icons/48/scalable/pidgin.svg + icons/hicolor/48x48/apps/scalable/pidgin.svg + +ICONS_48 = icons/hicolor/48x48/apps/pidgin.png PROTOCOLS_22_SCALABLE = \ protocols/22/scalable/aim.svg \ @@ -691,3 +701,9 @@ nobase_dist_pidginpixmap_DATA = \ $(TRAY_32) \ $(TRAY_48) +nobase_dist_pidginicons_DATA = \ + $(ICONS_16) \ + $(ICONS_22) \ + $(ICONS_24) \ + $(ICONS_32) \ + $(ICONS_48) diff --git a/pidgin/pixmaps/Makefile.mingw b/pidgin/pixmaps/Makefile.mingw index 3722f70ac7..49e07c9ffd 100644 --- a/pidgin/pixmaps/Makefile.mingw +++ b/pidgin/pixmaps/Makefile.mingw @@ -15,9 +15,7 @@ include ./Makefile.am install: if test '$(SUBDIRS)'; then \ list='$(SUBDIRS)'; for subdir in $$list; do \ - if [[ "$$subdir" != icons/* ]]; then \ $(MAKE) -C $$subdir -f $(MINGW_MAKEFILE) install || exit 1 ;\ - fi \ done; \ fi; if test '$(nobase_dist_pidginpixmap_DATA)'; then \ diff --git a/pidgin/pixmaps/icons/16/Makefile.am b/pidgin/pixmaps/icons/16/Makefile.am deleted file mode 100644 index aa3731fb0f..0000000000 --- a/pidgin/pixmaps/icons/16/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -EXTRA_DIST = pidgin.png - -pidginiconspixdir = $(datadir)/icons/hicolor/16x16/apps - -pidginiconspix_DATA = $(EXTRA_DIST) - diff --git a/pidgin/pixmaps/icons/16/pidgin.png b/pidgin/pixmaps/icons/16/pidgin.png deleted file mode 100644 index 742f3c2c3a..0000000000 Binary files a/pidgin/pixmaps/icons/16/pidgin.png and /dev/null differ diff --git a/pidgin/pixmaps/icons/16/scalable/pidgin.svg b/pidgin/pixmaps/icons/16/scalable/pidgin.svg deleted file mode 100644 index 1043821fec..0000000000 --- a/pidgin/pixmaps/icons/16/scalable/pidgin.svg +++ /dev/null @@ -1,784 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - diff --git a/pidgin/pixmaps/icons/22/Makefile.am b/pidgin/pixmaps/icons/22/Makefile.am deleted file mode 100644 index 6fc9de4d98..0000000000 --- a/pidgin/pixmaps/icons/22/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -EXTRA_DIST = pidgin.png - -pidginiconspixdir = $(datadir)/icons/hicolor/22x22/apps - -pidginiconspix_DATA = $(EXTRA_DIST) - diff --git a/pidgin/pixmaps/icons/22/pidgin.png b/pidgin/pixmaps/icons/22/pidgin.png deleted file mode 100644 index c91d8413d1..0000000000 Binary files a/pidgin/pixmaps/icons/22/pidgin.png and /dev/null differ diff --git a/pidgin/pixmaps/icons/22/scalable/pidgin.svg b/pidgin/pixmaps/icons/22/scalable/pidgin.svg deleted file mode 100644 index 9169426a04..0000000000 --- a/pidgin/pixmaps/icons/22/scalable/pidgin.svg +++ /dev/null @@ -1,591 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - diff --git a/pidgin/pixmaps/icons/24/Makefile.am b/pidgin/pixmaps/icons/24/Makefile.am deleted file mode 100644 index 8a11cbf5d3..0000000000 --- a/pidgin/pixmaps/icons/24/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -EXTRA_DIST = pidgin.png - -pidginiconspixdir = $(datadir)/icons/hicolor/24x24/apps - -pidginiconspix_DATA = $(EXTRA_DIST) - diff --git a/pidgin/pixmaps/icons/24/pidgin.png b/pidgin/pixmaps/icons/24/pidgin.png deleted file mode 100644 index 6011b87dd8..0000000000 Binary files a/pidgin/pixmaps/icons/24/pidgin.png and /dev/null differ diff --git a/pidgin/pixmaps/icons/24/scalable/pidgin.svg b/pidgin/pixmaps/icons/24/scalable/pidgin.svg deleted file mode 100644 index 2eb95bcb5e..0000000000 --- a/pidgin/pixmaps/icons/24/scalable/pidgin.svg +++ /dev/null @@ -1,589 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - diff --git a/pidgin/pixmaps/icons/32/Makefile.am b/pidgin/pixmaps/icons/32/Makefile.am deleted file mode 100644 index 5e6b914467..0000000000 --- a/pidgin/pixmaps/icons/32/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -EXTRA_DIST = pidgin.png - -pidginiconspixdir = $(datadir)/icons/hicolor/32x32/apps - -pidginiconspix_DATA = $(EXTRA_DIST) - diff --git a/pidgin/pixmaps/icons/32/pidgin.png b/pidgin/pixmaps/icons/32/pidgin.png deleted file mode 100644 index b9ea80b4f3..0000000000 Binary files a/pidgin/pixmaps/icons/32/pidgin.png and /dev/null differ diff --git a/pidgin/pixmaps/icons/32/scalable/pidgin.svg b/pidgin/pixmaps/icons/32/scalable/pidgin.svg deleted file mode 100644 index f83c5a4808..0000000000 --- a/pidgin/pixmaps/icons/32/scalable/pidgin.svg +++ /dev/null @@ -1,489 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pidgin/pixmaps/icons/48/Makefile.am b/pidgin/pixmaps/icons/48/Makefile.am deleted file mode 100644 index a2d2aa5250..0000000000 --- a/pidgin/pixmaps/icons/48/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -EXTRA_DIST = pidgin.png - -pidginiconspixdir = $(datadir)/icons/hicolor/48x48/apps - -pidginiconspix_DATA = $(EXTRA_DIST) - diff --git a/pidgin/pixmaps/icons/48/pidgin.png b/pidgin/pixmaps/icons/48/pidgin.png deleted file mode 100644 index ff43d9010b..0000000000 Binary files a/pidgin/pixmaps/icons/48/pidgin.png and /dev/null differ diff --git a/pidgin/pixmaps/icons/48/scalable/pidgin.svg b/pidgin/pixmaps/icons/48/scalable/pidgin.svg deleted file mode 100644 index e877ac35d6..0000000000 --- a/pidgin/pixmaps/icons/48/scalable/pidgin.svg +++ /dev/null @@ -1,460 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pidgin/pixmaps/icons/hicolor/16x16/apps/pidgin.png b/pidgin/pixmaps/icons/hicolor/16x16/apps/pidgin.png new file mode 100644 index 0000000000..742f3c2c3a Binary files /dev/null and b/pidgin/pixmaps/icons/hicolor/16x16/apps/pidgin.png differ diff --git a/pidgin/pixmaps/icons/hicolor/16x16/apps/scalable/pidgin.svg b/pidgin/pixmaps/icons/hicolor/16x16/apps/scalable/pidgin.svg new file mode 100644 index 0000000000..1043821fec --- /dev/null +++ b/pidgin/pixmaps/icons/hicolor/16x16/apps/scalable/pidgin.svg @@ -0,0 +1,784 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/pidgin/pixmaps/icons/hicolor/22x22/apps/pidgin.png b/pidgin/pixmaps/icons/hicolor/22x22/apps/pidgin.png new file mode 100644 index 0000000000..c91d8413d1 Binary files /dev/null and b/pidgin/pixmaps/icons/hicolor/22x22/apps/pidgin.png differ diff --git a/pidgin/pixmaps/icons/hicolor/22x22/apps/scalable/pidgin.svg b/pidgin/pixmaps/icons/hicolor/22x22/apps/scalable/pidgin.svg new file mode 100644 index 0000000000..9169426a04 --- /dev/null +++ b/pidgin/pixmaps/icons/hicolor/22x22/apps/scalable/pidgin.svg @@ -0,0 +1,591 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + diff --git a/pidgin/pixmaps/icons/hicolor/24x24/apps/pidgin.png b/pidgin/pixmaps/icons/hicolor/24x24/apps/pidgin.png new file mode 100644 index 0000000000..6011b87dd8 Binary files /dev/null and b/pidgin/pixmaps/icons/hicolor/24x24/apps/pidgin.png differ diff --git a/pidgin/pixmaps/icons/hicolor/24x24/apps/scalable/pidgin.svg b/pidgin/pixmaps/icons/hicolor/24x24/apps/scalable/pidgin.svg new file mode 100644 index 0000000000..2eb95bcb5e --- /dev/null +++ b/pidgin/pixmaps/icons/hicolor/24x24/apps/scalable/pidgin.svg @@ -0,0 +1,589 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + diff --git a/pidgin/pixmaps/icons/hicolor/32x32/apps/pidgin.png b/pidgin/pixmaps/icons/hicolor/32x32/apps/pidgin.png new file mode 100644 index 0000000000..b9ea80b4f3 Binary files /dev/null and b/pidgin/pixmaps/icons/hicolor/32x32/apps/pidgin.png differ diff --git a/pidgin/pixmaps/icons/hicolor/32x32/apps/scalable/pidgin.svg b/pidgin/pixmaps/icons/hicolor/32x32/apps/scalable/pidgin.svg new file mode 100644 index 0000000000..f83c5a4808 --- /dev/null +++ b/pidgin/pixmaps/icons/hicolor/32x32/apps/scalable/pidgin.svg @@ -0,0 +1,489 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pidgin/pixmaps/icons/hicolor/48x48/apps/pidgin.png b/pidgin/pixmaps/icons/hicolor/48x48/apps/pidgin.png new file mode 100644 index 0000000000..ff43d9010b Binary files /dev/null and b/pidgin/pixmaps/icons/hicolor/48x48/apps/pidgin.png differ diff --git a/pidgin/pixmaps/icons/hicolor/48x48/apps/scalable/pidgin.svg b/pidgin/pixmaps/icons/hicolor/48x48/apps/scalable/pidgin.svg new file mode 100644 index 0000000000..e877ac35d6 --- /dev/null +++ b/pidgin/pixmaps/icons/hicolor/48x48/apps/scalable/pidgin.svg @@ -0,0 +1,460 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.1