From a257415a802566f27ac7e6bc9a34e6c9d4132bb3 Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Thu, 24 Mar 2011 14:43:53 -0400 Subject: Use the web-browser icon from the GNOME icon theme Instead of the low res version shipped internally. https://bugzilla.gnome.org/show_bug.cgi?id=645713 --- data/epiphany.desktop.in.in | 2 +- ...gePrintInverse_apps_48x48_gnome-web-browser.png | Bin 2749 -> 0 bytes ...rastLargePrint_apps_48x48_gnome-web-browser.png | Bin 2715 -> 0 bytes ...rastLargePrint_apps_48x48_gnome-web-browser.png | Bin 3335 -> 0 bytes data/icons/Makefile.am | 56 +- .../icons/hicolor_apps_16x16_gnome-web-browser.png | Bin 982 -> 0 bytes .../icons/hicolor_apps_16x16_gnome-web-browser.svg | 853 --------------- .../icons/hicolor_apps_22x22_gnome-web-browser.png | Bin 1585 -> 0 bytes .../icons/hicolor_apps_22x22_gnome-web-browser.svg | 1069 ------------------- .../icons/hicolor_apps_24x24_gnome-web-browser.png | Bin 1601 -> 0 bytes .../icons/hicolor_apps_32x32_gnome-web-browser.png | Bin 2645 -> 0 bytes .../icons/hicolor_apps_32x32_gnome-web-browser.svg | 1082 -------------------- .../hicolor_apps_scalable_gnome-web-browser.svg | 917 ----------------- 13 files changed, 3 insertions(+), 3976 deletions(-) delete mode 100644 data/icons/HighContrastLargePrintInverse_apps_48x48_gnome-web-browser.png delete mode 100644 data/icons/HighContrastLargePrint_apps_48x48_gnome-web-browser.png delete mode 100644 data/icons/LowContrastLargePrint_apps_48x48_gnome-web-browser.png delete mode 100644 data/icons/hicolor_apps_16x16_gnome-web-browser.png delete mode 100644 data/icons/hicolor_apps_16x16_gnome-web-browser.svg delete mode 100644 data/icons/hicolor_apps_22x22_gnome-web-browser.png delete mode 100644 data/icons/hicolor_apps_22x22_gnome-web-browser.svg delete mode 100644 data/icons/hicolor_apps_24x24_gnome-web-browser.png delete mode 100644 data/icons/hicolor_apps_32x32_gnome-web-browser.png delete mode 100644 data/icons/hicolor_apps_32x32_gnome-web-browser.svg delete mode 100644 data/icons/hicolor_apps_scalable_gnome-web-browser.svg (limited to 'data') diff --git a/data/epiphany.desktop.in.in b/data/epiphany.desktop.in.in index fdf5ffeba..1e1aeadb2 100644 --- a/data/epiphany.desktop.in.in +++ b/data/epiphany.desktop.in.in @@ -7,7 +7,7 @@ Exec=epiphany %U StartupNotify=true Terminal=false Type=Application -Icon=gnome-web-browser +Icon=web-browser X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=epiphany X-GNOME-Bugzilla-Component=BugBuddyBugs diff --git a/data/icons/HighContrastLargePrintInverse_apps_48x48_gnome-web-browser.png b/data/icons/HighContrastLargePrintInverse_apps_48x48_gnome-web-browser.png deleted file mode 100644 index bc9a5a912..000000000 Binary files a/data/icons/HighContrastLargePrintInverse_apps_48x48_gnome-web-browser.png and /dev/null differ diff --git a/data/icons/HighContrastLargePrint_apps_48x48_gnome-web-browser.png b/data/icons/HighContrastLargePrint_apps_48x48_gnome-web-browser.png deleted file mode 100644 index 2d1574809..000000000 Binary files a/data/icons/HighContrastLargePrint_apps_48x48_gnome-web-browser.png and /dev/null differ diff --git a/data/icons/LowContrastLargePrint_apps_48x48_gnome-web-browser.png b/data/icons/LowContrastLargePrint_apps_48x48_gnome-web-browser.png deleted file mode 100644 index ac44363cf..000000000 Binary files a/data/icons/LowContrastLargePrint_apps_48x48_gnome-web-browser.png and /dev/null differ diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am index b5bde31e2..08f65c63b 100644 --- a/data/icons/Makefile.am +++ b/data/icons/Makefile.am @@ -1,23 +1,5 @@ NULL = -public_icons_themes = \ - hicolor \ - HighContrastLargePrint \ - HighContrastLargePrintInverse \ - LowContrastLargePrint \ - $(NULL) - -public_icons = \ - hicolor_apps_16x16_gnome-web-browser.png \ - hicolor_apps_22x22_gnome-web-browser.png \ - hicolor_apps_24x24_gnome-web-browser.png \ - hicolor_apps_32x32_gnome-web-browser.png \ - hicolor_apps_scalable_gnome-web-browser.svg \ - HighContrastLargePrint_apps_48x48_gnome-web-browser.png \ - HighContrastLargePrintInverse_apps_48x48_gnome-web-browser.png \ - LowContrastLargePrint_apps_48x48_gnome-web-browser.png \ - $(NULL) - private_icons = \ hicolor_actions_16x16_bookmark-view.png \ hicolor_actions_16x16_history-view.png \ @@ -64,9 +46,6 @@ noinst_DATA = \ hicolor_actions_32x32_history-view.svg \ hicolor_actions_16x16_bookmark-view.xcf \ hicolor_actions_22x22_bookmark-view.xcf \ - hicolor_apps_16x16_gnome-web-browser.svg \ - hicolor_apps_22x22_gnome-web-browser.svg \ - hicolor_apps_32x32_gnome-web-browser.svg \ hicolor_places_16x16_bookmark-web.svg \ hicolor_places_22x22_bookmark-web.svg \ hicolor_status_16x16_popup-hidden.xcf \ @@ -75,37 +54,13 @@ noinst_DATA = \ $(NULL) EXTRA_DIST = \ - $(public_icons) \ $(private_icons) \ $(noinst_DATA) \ $(NULL) ############################################################################### -gtk_update_icon_cache = gtk-update-icon-cache -f -t - -update-icon-cache: - @-if test -z "$(DESTDIR)"; then \ - echo "Updating Gtk icon cache."; \ - for theme in $(public_icons_themes); do \ - $(gtk_update_icon_cache) $(datadir)/icons/$$theme; \ - done; \ - else \ - echo "*** Icon cache not updated. After (un)install, run this:"; \ - for theme in $(public_icons_themes); do \ - echo "*** $(gtk_update_icon_cache) $(datadir)/icons/$$theme"; \ - done; \ - fi - install-icons: - for icon in $(public_icons); do \ - THEME=`echo $$icon | cut -d_ -f1`; \ - CONTEXT=`echo $$icon | cut -d_ -f2`; \ - SIZE=`echo $$icon | cut -d_ -f3`; \ - ICONFILE=`echo $$icon | cut -d_ -f4`; \ - mkdir -p $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \ - $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \ - done; \ for icon in $(private_icons); do \ THEME=`echo $$icon | cut -d_ -f1`; \ CONTEXT=`echo $$icon | cut -d_ -f2`; \ @@ -116,13 +71,6 @@ install-icons: done uninstall-icons: - -for icon in $(public_icons); do \ - THEME=`echo $$icon | cut -d_ -f1`; \ - CONTEXT=`echo $$icon | cut -d_ -f2`; \ - SIZE=`echo $$icon | cut -d_ -f3`; \ - ICONFILE=`echo $$icon | cut -d_ -f4`; \ - rm -f $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \ - done; \ for icon in $(private_icons); do \ THEME=`echo $$icon | cut -d_ -f1`; \ CONTEXT=`echo $$icon | cut -d_ -f2`; \ @@ -131,6 +79,6 @@ uninstall-icons: rm -f $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \ done -install-data-local: install-icons update-icon-cache +install-data-local: install-icons -uninstall-local: uninstall-icons update-icon-cache +uninstall-local: uninstall-icons diff --git a/data/icons/hicolor_apps_16x16_gnome-web-browser.png b/data/icons/hicolor_apps_16x16_gnome-web-browser.png deleted file mode 100644 index 12191acf2..000000000 Binary files a/data/icons/hicolor_apps_16x16_gnome-web-browser.png and /dev/null differ diff --git a/data/icons/hicolor_apps_16x16_gnome-web-browser.svg b/data/icons/hicolor_apps_16x16_gnome-web-browser.svg deleted file mode 100644 index 5e05ecc98..000000000 --- a/data/icons/hicolor_apps_16x16_gnome-web-browser.svg +++ /dev/null @@ -1,853 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - Jakub Steiner - - - http://jimmac.musichall.cz - - Web Browser - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/data/icons/hicolor_apps_22x22_gnome-web-browser.png b/data/icons/hicolor_apps_22x22_gnome-web-browser.png deleted file mode 100644 index edfaa2f17..000000000 Binary files a/data/icons/hicolor_apps_22x22_gnome-web-browser.png and /dev/null differ diff --git a/data/icons/hicolor_apps_22x22_gnome-web-browser.svg b/data/icons/hicolor_apps_22x22_gnome-web-browser.svg deleted file mode 100644 index 7008463fa..000000000 --- a/data/icons/hicolor_apps_22x22_gnome-web-browser.svg +++ /dev/null @@ -1,1069 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - Jakub Steiner - - - http://jimmac.musichall.cz - - Web Browser - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/data/icons/hicolor_apps_24x24_gnome-web-browser.png b/data/icons/hicolor_apps_24x24_gnome-web-browser.png deleted file mode 100644 index c25adec96..000000000 Binary files a/data/icons/hicolor_apps_24x24_gnome-web-browser.png and /dev/null differ diff --git a/data/icons/hicolor_apps_32x32_gnome-web-browser.png b/data/icons/hicolor_apps_32x32_gnome-web-browser.png deleted file mode 100644 index 442e5c42d..000000000 Binary files a/data/icons/hicolor_apps_32x32_gnome-web-browser.png and /dev/null differ diff --git a/data/icons/hicolor_apps_32x32_gnome-web-browser.svg b/data/icons/hicolor_apps_32x32_gnome-web-browser.svg deleted file mode 100644 index 979e3b85c..000000000 --- a/data/icons/hicolor_apps_32x32_gnome-web-browser.svg +++ /dev/null @@ -1,1082 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - Jakub Steiner - - - http://jimmac.musichall.cz - - Web Browser - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/data/icons/hicolor_apps_scalable_gnome-web-browser.svg b/data/icons/hicolor_apps_scalable_gnome-web-browser.svg deleted file mode 100644 index d8be1c4d6..000000000 --- a/data/icons/hicolor_apps_scalable_gnome-web-browser.svg +++ /dev/null @@ -1,917 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - Jakub Steiner - - - http://jimmac.musichall.cz - - Web Browser - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.2.3