From 17ef6d1c777e63fdbbb11cf2afb21bbe5c1acfa4 Mon Sep 17 00:00:00 2001 From: Xan Lopez Date: Fri, 27 Jan 2012 10:12:22 +0100 Subject: And remove the last stock icon, bookmarks We can kill data/icons now. --- data/Makefile.am | 2 +- data/icons/Makefile.am | 45 --- data/icons/README | 13 - data/icons/hicolor_actions_16x16_bookmark-view.png | Bin 474 -> 0 bytes data/icons/hicolor_actions_16x16_bookmark-view.xcf | Bin 1969 -> 0 bytes data/icons/hicolor_actions_22x22_bookmark-view.png | Bin 595 -> 0 bytes data/icons/hicolor_actions_22x22_bookmark-view.xcf | Bin 2461 -> 0 bytes data/icons/hicolor_actions_24x24_bookmark-view.png | Bin 585 -> 0 bytes data/icons/hicolor_actions_32x32_bookmark-view.png | Bin 934 -> 0 bytes data/icons/hicolor_actions_32x32_bookmark-view.svg | 299 ----------------- .../hicolor_actions_scalable_bookmark-view.svg | 355 --------------------- lib/Makefile.am | 1 - lib/ephy-stock-icons.c | 66 ---- lib/ephy-stock-icons.h | 5 - src/bookmarks/ephy-bookmarks-editor.c | 2 - src/ephy-main.c | 1 - 16 files changed, 1 insertion(+), 788 deletions(-) delete mode 100644 data/icons/Makefile.am delete mode 100644 data/icons/README delete mode 100644 data/icons/hicolor_actions_16x16_bookmark-view.png delete mode 100644 data/icons/hicolor_actions_16x16_bookmark-view.xcf delete mode 100644 data/icons/hicolor_actions_22x22_bookmark-view.png delete mode 100644 data/icons/hicolor_actions_22x22_bookmark-view.xcf delete mode 100644 data/icons/hicolor_actions_24x24_bookmark-view.png delete mode 100644 data/icons/hicolor_actions_32x32_bookmark-view.png delete mode 100644 data/icons/hicolor_actions_32x32_bookmark-view.svg delete mode 100644 data/icons/hicolor_actions_scalable_bookmark-view.svg delete mode 100644 lib/ephy-stock-icons.c diff --git a/data/Makefile.am b/data/Makefile.am index 2da510465..24b356b06 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = art icons pages ui +SUBDIRS = art pages ui @INTLTOOL_SERVER_RULE@ @INTLTOOL_DESKTOP_RULE@ diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am deleted file mode 100644 index 579a4ad81..000000000 --- a/data/icons/Makefile.am +++ /dev/null @@ -1,45 +0,0 @@ -NULL = - -private_icons = \ - hicolor_actions_16x16_bookmark-view.png \ - hicolor_actions_22x22_bookmark-view.png \ - hicolor_actions_24x24_bookmark-view.png \ - hicolor_actions_32x32_bookmark-view.png \ - hicolor_actions_scalable_bookmark-view.svg \ - $(NULL) - -noinst_DATA = \ - hicolor_actions_32x32_bookmark-view.svg \ - hicolor_actions_16x16_bookmark-view.xcf \ - hicolor_actions_22x22_bookmark-view.xcf \ - $(NULL) - -EXTRA_DIST = \ - $(private_icons) \ - $(noinst_DATA) \ - $(NULL) - -############################################################################### - -install-icons: - for icon in $(private_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)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \ - $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \ - done - -uninstall-icons: - for icon in $(private_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)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \ - done - -install-data-local: install-icons - -uninstall-local: uninstall-icons diff --git a/data/icons/README b/data/icons/README deleted file mode 100644 index 4d49699c6..000000000 --- a/data/icons/README +++ /dev/null @@ -1,13 +0,0 @@ -From Tango website (http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines) - - - Historically Gnome uses 24×24 size (which is 1/4 of 48×48); - just adding a 1 pixel empty space on all sides can make - Tango icons useful on the Gnome desktop in the transition - phase. One can easily do this with imagemagick: - - convert -bordercolor Transparent -border 1x1 tango_size.png gnome_size.png - - -So sources for "small" size should be drawn at 22x22 pixel and converted -to 24x24 adding a transparent border. \ No newline at end of file diff --git a/data/icons/hicolor_actions_16x16_bookmark-view.png b/data/icons/hicolor_actions_16x16_bookmark-view.png deleted file mode 100644 index 7817a0fa7..000000000 Binary files a/data/icons/hicolor_actions_16x16_bookmark-view.png and /dev/null differ diff --git a/data/icons/hicolor_actions_16x16_bookmark-view.xcf b/data/icons/hicolor_actions_16x16_bookmark-view.xcf deleted file mode 100644 index 653e3472e..000000000 Binary files a/data/icons/hicolor_actions_16x16_bookmark-view.xcf and /dev/null differ diff --git a/data/icons/hicolor_actions_22x22_bookmark-view.png b/data/icons/hicolor_actions_22x22_bookmark-view.png deleted file mode 100644 index 3c94640fb..000000000 Binary files a/data/icons/hicolor_actions_22x22_bookmark-view.png and /dev/null differ diff --git a/data/icons/hicolor_actions_22x22_bookmark-view.xcf b/data/icons/hicolor_actions_22x22_bookmark-view.xcf deleted file mode 100644 index a9da95aca..000000000 Binary files a/data/icons/hicolor_actions_22x22_bookmark-view.xcf and /dev/null differ diff --git a/data/icons/hicolor_actions_24x24_bookmark-view.png b/data/icons/hicolor_actions_24x24_bookmark-view.png deleted file mode 100644 index a2b5dd484..000000000 Binary files a/data/icons/hicolor_actions_24x24_bookmark-view.png and /dev/null differ diff --git a/data/icons/hicolor_actions_32x32_bookmark-view.png b/data/icons/hicolor_actions_32x32_bookmark-view.png deleted file mode 100644 index 3b9616477..000000000 Binary files a/data/icons/hicolor_actions_32x32_bookmark-view.png and /dev/null differ diff --git a/data/icons/hicolor_actions_32x32_bookmark-view.svg b/data/icons/hicolor_actions_32x32_bookmark-view.svg deleted file mode 100644 index 2e3284602..000000000 --- a/data/icons/hicolor_actions_32x32_bookmark-view.svg +++ /dev/null @@ -1,299 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/data/icons/hicolor_actions_scalable_bookmark-view.svg b/data/icons/hicolor_actions_scalable_bookmark-view.svg deleted file mode 100644 index 3f87fd15a..000000000 --- a/data/icons/hicolor_actions_scalable_bookmark-view.svg +++ /dev/null @@ -1,355 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - View Bookmark - December 2006 - - - Andreas Nilsson - - - - - bookmark - - - - http://www.gnome.org - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/lib/Makefile.am b/lib/Makefile.am index 2a1ec7556..a2826fe2f 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -67,7 +67,6 @@ libephymisc_la_SOURCES = \ ephy-smaps.c \ ephy-state.c \ ephy-string.c \ - ephy-stock-icons.c \ ephy-time-helpers.c \ ephy-zoom.c \ $(INST_H_FILES) \ diff --git a/lib/ephy-stock-icons.c b/lib/ephy-stock-icons.c deleted file mode 100644 index 0cbb5f81b..000000000 --- a/lib/ephy-stock-icons.c +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright © 2002 Jorn Baayen - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - */ - -#include "config.h" - -#include -#include - -#include "ephy-stock-icons.h" - -void -ephy_stock_icons_init (void) -{ - GtkIconFactory *factory; - GtkIconSet *icon_set; - GtkIconSource *icon_source; - int i; - - static const GtkStockItem items[] = - { - { EPHY_STOCK_BOOKMARKS, N_("Bookmarks"), 0, 0, NULL } - }; - - factory = gtk_icon_factory_new (); - - for (i = 0; i < (int) G_N_ELEMENTS (items); i++) - { - icon_source = gtk_icon_source_new (); - gtk_icon_source_set_icon_name (icon_source, items[i].stock_id); - - icon_set = gtk_icon_set_new (); - gtk_icon_set_add_source (icon_set, icon_source); - gtk_icon_source_free (icon_source); - - gtk_icon_factory_add (factory, items[i].stock_id, icon_set); - gtk_icon_set_unref (icon_set); - } - - gtk_stock_add_static (items, G_N_ELEMENTS (items)); - - gtk_icon_factory_add_default (factory); - g_object_unref (factory); - - /* GtkIconTheme will then look in Ephy custom hicolor dir - * for icons as well as the standard search paths - */ - /* FIXME: multi-head! */ - gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (), - SHARE_DIR G_DIR_SEPARATOR_S "icons"); -} diff --git a/lib/ephy-stock-icons.h b/lib/ephy-stock-icons.h index 3b8bba324..9bf6ec52d 100644 --- a/lib/ephy-stock-icons.h +++ b/lib/ephy-stock-icons.h @@ -28,11 +28,6 @@ G_BEGIN_DECLS #define EPHY_STOCK_EPHY "web-browser" -/* Custom Epiphany named icons */ -#define EPHY_STOCK_BOOKMARKS "bookmark-view" - -void ephy_stock_icons_init (void); - G_END_DECLS #endif /* EPHY_STOCK_ICONS_H */ diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c index 74d6ff47d..c64d1db48 100644 --- a/src/bookmarks/ephy-bookmarks-editor.c +++ b/src/bookmarks/ephy-bookmarks-editor.c @@ -38,7 +38,6 @@ #include "ephy-settings.h" #include "ephy-shell.h" #include "ephy-state.h" -#include "ephy-stock-icons.h" #include "ephy-topic-action.h" #include "ephy-window.h" #include "popup-commands.h" @@ -1519,7 +1518,6 @@ ephy_bookmarks_editor_construct (EphyBookmarksEditor *editor) ephy_gui_ensure_window_group (GTK_WINDOW (editor)); gtk_window_set_title (GTK_WINDOW (editor), _("Bookmarks")); - gtk_window_set_icon_name (GTK_WINDOW (editor), EPHY_STOCK_BOOKMARKS); g_signal_connect (editor, "delete_event", G_CALLBACK (delete_event_cb), NULL); diff --git a/src/ephy-main.c b/src/ephy-main.c index e7196a1cb..0fca11d59 100644 --- a/src/ephy-main.c +++ b/src/ephy-main.c @@ -427,7 +427,6 @@ main (int argc, exit (0); } - ephy_stock_icons_init (); ephy_file_load_accels (); /* Now create the shell */ -- cgit v1.2.3