[epiphany] And remove the last stock icon, bookmarks



commit 17ef6d1c777e63fdbbb11cf2afb21bbe5c1acfa4
Author: Xan Lopez <xan igalia com>
Date:   Fri Jan 27 10:12:22 2012 +0100

    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 insertions(+), 788 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index 2da5104..24b356b 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/lib/Makefile.am b/lib/Makefile.am
index 2a1ec75..a2826fe 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.h b/lib/ephy-stock-icons.h
index 3b8bba3..9bf6ec5 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 74d6ff4..c64d1db 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 e7196a1..0fca11d 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 */



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]