From 953e66428af9639028b3729b448d1fa01c340d09 Mon Sep 17 00:00:00 2001 From: Michael Monreal Date: Fri, 12 Oct 2007 09:49:02 +0000 Subject: ** Migration of theme icons to data/icons/ (bug #479257) 2007-10-12 Michael Monreal ** Migration of theme icons to data/icons/ (bug #479257) * art/Makefile.am: Remove references to art/$size. * configure.in: Include new data/icons/ directory. * file e-util/e-icon-factory.c: Append a private icon directory to the search path. New inbox/outbox/sent icons. * mail/em-folder-tree.c, mail/mail-send-recv.c: Change icon references. New view-calendar icons. * calendar/gui/calendar-commands.c: Change icon references. svn path=/trunk/; revision=34383 --- art/16x16/.cvsignore | 2 - art/16x16/Makefile.am | 3 - art/16x16/evolution.png | Bin 769 -> 0 bytes art/22x22/evolution.png | Bin 1132 -> 0 bytes art/24x24/evolution.png | Bin 1139 -> 0 bytes art/32x32/evolution.png | Bin 2109 -> 0 bytes art/48x48/preferences-autocompletion.png | Bin 3291 -> 0 bytes art/48x48/preferences-calendar-and-tasks.png | Bin 2731 -> 0 bytes art/48x48/preferences-certificates.png | Bin 1947 -> 0 bytes art/48x48/preferences-composer.png | Bin 1971 -> 0 bytes art/48x48/preferences-mail-accounts.png | Bin 3261 -> 0 bytes art/48x48/preferences-mail.png | Bin 1532 -> 0 bytes art/ChangeLog | 6 + art/Makefile.am | 43 -- art/scalable/evolution.svg | 615 --------------------------- 15 files changed, 6 insertions(+), 663 deletions(-) delete mode 100644 art/16x16/.cvsignore delete mode 100644 art/16x16/Makefile.am delete mode 100644 art/16x16/evolution.png delete mode 100644 art/22x22/evolution.png delete mode 100644 art/24x24/evolution.png delete mode 100644 art/32x32/evolution.png delete mode 100644 art/48x48/preferences-autocompletion.png delete mode 100644 art/48x48/preferences-calendar-and-tasks.png delete mode 100644 art/48x48/preferences-certificates.png delete mode 100644 art/48x48/preferences-composer.png delete mode 100644 art/48x48/preferences-mail-accounts.png delete mode 100644 art/48x48/preferences-mail.png delete mode 100644 art/scalable/evolution.svg (limited to 'art') diff --git a/art/16x16/.cvsignore b/art/16x16/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/art/16x16/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/art/16x16/Makefile.am b/art/16x16/Makefile.am deleted file mode 100644 index 2b5b8ca0fb..0000000000 --- a/art/16x16/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -images16_DATA = - -EXTRA_DIST = $(images16_DATA) diff --git a/art/16x16/evolution.png b/art/16x16/evolution.png deleted file mode 100644 index 0d1ad3496e..0000000000 Binary files a/art/16x16/evolution.png and /dev/null differ diff --git a/art/22x22/evolution.png b/art/22x22/evolution.png deleted file mode 100644 index d069ad9c6f..0000000000 Binary files a/art/22x22/evolution.png and /dev/null differ diff --git a/art/24x24/evolution.png b/art/24x24/evolution.png deleted file mode 100644 index 92c2605f91..0000000000 Binary files a/art/24x24/evolution.png and /dev/null differ diff --git a/art/32x32/evolution.png b/art/32x32/evolution.png deleted file mode 100644 index a24c73d629..0000000000 Binary files a/art/32x32/evolution.png and /dev/null differ diff --git a/art/48x48/preferences-autocompletion.png b/art/48x48/preferences-autocompletion.png deleted file mode 100644 index 49cfc21de3..0000000000 Binary files a/art/48x48/preferences-autocompletion.png and /dev/null differ diff --git a/art/48x48/preferences-calendar-and-tasks.png b/art/48x48/preferences-calendar-and-tasks.png deleted file mode 100644 index 7ce3270e73..0000000000 Binary files a/art/48x48/preferences-calendar-and-tasks.png and /dev/null differ diff --git a/art/48x48/preferences-certificates.png b/art/48x48/preferences-certificates.png deleted file mode 100644 index 7c03a240e5..0000000000 Binary files a/art/48x48/preferences-certificates.png and /dev/null differ diff --git a/art/48x48/preferences-composer.png b/art/48x48/preferences-composer.png deleted file mode 100644 index 49b0575687..0000000000 Binary files a/art/48x48/preferences-composer.png and /dev/null differ diff --git a/art/48x48/preferences-mail-accounts.png b/art/48x48/preferences-mail-accounts.png deleted file mode 100644 index c8ab08f0c3..0000000000 Binary files a/art/48x48/preferences-mail-accounts.png and /dev/null differ diff --git a/art/48x48/preferences-mail.png b/art/48x48/preferences-mail.png deleted file mode 100644 index a68d005edc..0000000000 Binary files a/art/48x48/preferences-mail.png and /dev/null differ diff --git a/art/ChangeLog b/art/ChangeLog index dde3f888c0..1e853a15ee 100644 --- a/art/ChangeLog +++ b/art/ChangeLog @@ -1,3 +1,9 @@ +2007-10-12 Michael Monreal + + ** Migration of theme icons to data/icons/ (bug #479257) + + * art/Makefile.am: Remove references to art/$size. + 2007-06-03 Srinivasa Ragavan ** Fix for version removal from Installed files from Gilles Dartiguelongue diff --git a/art/Makefile.am b/art/Makefile.am index 9f6a989f55..bded28a1a5 100644 --- a/art/Makefile.am +++ b/art/Makefile.am @@ -1,29 +1,3 @@ -icon16dir = $(datadir)/icons/hicolor/16x16/apps -icon16_DATA = 16x16/evolution.png - -icon22dir = $(datadir)/icons/hicolor/22x22/apps -icon22_DATA = 22x22/evolution.png - -icon24dir = $(datadir)/icons/hicolor/24x24/apps -icon24_DATA = 24x24/evolution.png - -icon32dir = $(datadir)/icons/hicolor/32x32/apps -icon32_DATA = 32x32/evolution.png - -icon48dir = $(datadir)/icons/hicolor/48x48/apps -icon48_DATA = \ - 48x48/preferences-autocompletion.png \ - 48x48/preferences-calendar-and-tasks.png \ - 48x48/preferences-certificates.png \ - 48x48/preferences-composer.png \ - 48x48/preferences-mail-accounts.png \ - 48x48/preferences-mail.png - -svgicondir = $(datadir)/icons/hicolor/scalable/apps -svgicon_DATA = scalable/evolution.svg - -gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor - images_DATA = \ evolution-contacts-mini.png \ offline.png \ @@ -33,17 +7,6 @@ images_DATA = \ plus.png \ minus.png -install-data-hook: update-icon-cache -uninstall-hook: update-icon-cache -update-icon-cache: - @-if test -z "$(DESTDIR)"; then \ - echo "Updating Gtk icon cache."; \ - $(gtk_update_icon_cache); \ - else \ - echo "*** Icon cache not updated. After (un)install, run this:"; \ - echo "*** $(gtk_update_icon_cache)"; \ - fi - EXTRA_DIST = \ ChangeLog \ ChangeLog.pre-1-4 \ @@ -52,10 +15,4 @@ EXTRA_DIST = \ broken-image-24.xpm \ empty.xpm \ jump.xpm \ - $(icon16_DATA) \ - $(icon22_DATA) \ - $(icon24_DATA) \ - $(icon32_DATA) \ - $(icon48_DATA) \ - $(svgicon_DATA) \ $(images_DATA) diff --git a/art/scalable/evolution.svg b/art/scalable/evolution.svg deleted file mode 100644 index d44c9b319a..0000000000 --- a/art/scalable/evolution.svg +++ /dev/null @@ -1,615 +0,0 @@ - - - - - - image/svg+xml - - Evolution 2.2 Logo - - - Jakub Steiner - - - - - Andreas Nilsson - - - - http://jimmac.musichall.cz - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file -- cgit v1.2.3