[epiphany] Remove EPHY_STOCK_BOOKMARK

[Xan Lopez <xan src gnome org>]

commit 9af155fcc487ea8e75541c8c93707e1c5aa30f58
Author: Xan Lopez <xan igalia com>
Date:   Fri Jan 27 01:06:45 2012 +0100

    Remove EPHY_STOCK_BOOKMARK
    
    Use the symbolic icon for the completion entry, I'm sure Lapo will
    approve.

 data/icons/Makefile.am                           |    5 -
 data/icons/hicolor_places_16x16_bookmark-web.png |  Bin 576 -> 0 bytes
 data/icons/hicolor_places_16x16_bookmark-web.svg |  121 -------------------
 data/icons/hicolor_places_22x22_bookmark-web.png |  Bin 989 -> 0 bytes
 data/icons/hicolor_places_22x22_bookmark-web.svg |  134 ----------------------
 data/icons/hicolor_places_24x24_bookmark-web.png |  Bin 1025 -> 0 bytes
 lib/ephy-stock-icons.c                           |    1 -
 lib/ephy-stock-icons.h                           |    1 -
 lib/widgets/ephy-location-entry.c                |    2 +-
 src/bookmarks/ephy-bookmark-properties.c         |    2 -
 10 files changed, 1 insertions(+), 265 deletions(-)
---
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 932e3f3..541d0c3 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -11,9 +11,6 @@ private_icons = \
 	hicolor_actions_32x32_history-view.png \
 	hicolor_actions_scalable_bookmark-view.svg \
 	hicolor_actions_scalable_history-view.svg \
-	hicolor_places_16x16_bookmark-web.png \
-	hicolor_places_22x22_bookmark-web.png \
-	hicolor_places_24x24_bookmark-web.png \
 	$(NULL)
 
 noinst_DATA = \
@@ -23,8 +20,6 @@ noinst_DATA = \
 	hicolor_actions_32x32_history-view.svg \
 	hicolor_actions_16x16_bookmark-view.xcf \
 	hicolor_actions_22x22_bookmark-view.xcf \
-	hicolor_places_16x16_bookmark-web.svg \
-	hicolor_places_22x22_bookmark-web.svg \
 	$(NULL)
 
 EXTRA_DIST = \
diff --git a/lib/ephy-stock-icons.c b/lib/ephy-stock-icons.c
index 701ac54..bf80fbe 100644
--- a/lib/ephy-stock-icons.c
+++ b/lib/ephy-stock-icons.c
@@ -35,7 +35,6 @@ ephy_stock_icons_init (void)
 	static const GtkStockItem items[] =
 	{
 		{ EPHY_STOCK_HISTORY,	N_("History"),		0, 0, NULL },
-		{ EPHY_STOCK_BOOKMARK,  N_("Bookmark"),         0, 0, NULL },
 		{ EPHY_STOCK_BOOKMARKS, N_("Bookmarks"),	0, 0, NULL }
 	};
 
diff --git a/lib/ephy-stock-icons.h b/lib/ephy-stock-icons.h
index 585dc47..75be9ab 100644
--- a/lib/ephy-stock-icons.h
+++ b/lib/ephy-stock-icons.h
@@ -30,7 +30,6 @@ G_BEGIN_DECLS
 
 /* Custom Epiphany named icons */
 #define EPHY_STOCK_HISTORY         "history-view"
-#define EPHY_STOCK_BOOKMARK        "bookmark-web"
 #define EPHY_STOCK_BOOKMARKS       "bookmark-view"
  
 void ephy_stock_icons_init (void);
diff --git a/lib/widgets/ephy-location-entry.c b/lib/widgets/ephy-location-entry.c
index 0e26f32..495ad78 100644
--- a/lib/widgets/ephy-location-entry.c
+++ b/lib/widgets/ephy-location-entry.c
@@ -1099,7 +1099,7 @@ extracell_data_func (GtkCellLayout *cell_layout,
 
 	if (is_bookmark)
 		g_object_set (cell,
-			      "stock-id", EPHY_STOCK_BOOKMARK,
+			      "icon-name", "user-bookmarks-symbolic",
 			      NULL);
 
 	g_value_init (&visible, G_TYPE_BOOLEAN);
diff --git a/src/bookmarks/ephy-bookmark-properties.c b/src/bookmarks/ephy-bookmark-properties.c
index af7d637..1dde8ee 100644
--- a/src/bookmarks/ephy-bookmark-properties.c
+++ b/src/bookmarks/ephy-bookmark-properties.c
@@ -27,7 +27,6 @@
 #include "ephy-topics-entry.h"
 #include "ephy-topics-palette.h"
 #include "ephy-node-common.h"
-#include "ephy-stock-icons.h"
 #include "ephy-debug.h"
 #include "ephy-shell.h"
 #include "ephy-state.h"
@@ -503,7 +502,6 @@ ephy_bookmark_properties_constructor (GType type,
 	properties = EPHY_BOOKMARK_PROPERTIES (object);
 	priv = properties->priv;
 
-	gtk_window_set_icon_name (window, EPHY_STOCK_BOOKMARK);
 	gtk_window_set_type_hint (window, GDK_WINDOW_TYPE_HINT_DIALOG);
 
 	g_signal_connect (properties, "response",