[yelp/wip/patches: 9/11] icons: Use bookmark icon from theme

[David King <davidk src gnome org>]

commit 12df855745b4fcef40754447bef1424d992b5969
Author: David King <amigadave amigadave com>
Date:   Sat Aug 2 10:49:45 2014 +0100

    icons: Use bookmark icon from theme
    
    The icon naming specification provides for a user-bookmarks icon, which
    fits well with both yelp-bookmark-add-symbolic and
    yelp-bookmark-remove-symbolic, which were not used as action icons
    anyway.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=734165

 configure.ac                                       |    1 -
 data/icons/hicolor/scalable/Makefile.am            |    2 +-
 data/icons/hicolor/scalable/actions/Makefile.am    |    5 -
 .../actions/yelp-bookmark-add-symbolic.svg         |  127 -----------------
 .../actions/yelp-bookmark-remove-symbolic.svg      |  145 --------------------
 libyelp/yelp-search-entry.c                        |    2 +-
 src/yelp-window.c                                  |    2 +-
 7 files changed, 3 insertions(+), 281 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 8e15438..f030d60 100644
--- a/configure.ac
+++ b/configure.ac
@@ -185,7 +185,6 @@ data/icons/hicolor/Makefile
 data/icons/hicolor/16x16/Makefile
 data/icons/hicolor/16x16/status/Makefile
 data/icons/hicolor/scalable/Makefile
-data/icons/hicolor/scalable/actions/Makefile
 data/icons/hicolor/scalable/status/Makefile
 data/mathjax/Makefile
 data/mathjax/config/Makefile
diff --git a/data/icons/hicolor/scalable/Makefile.am b/data/icons/hicolor/scalable/Makefile.am
index c163076..d52da2b 100644
--- a/data/icons/hicolor/scalable/Makefile.am
+++ b/data/icons/hicolor/scalable/Makefile.am
@@ -1 +1 @@
-SUBDIRS = actions status
+SUBDIRS = status
diff --git a/libyelp/yelp-search-entry.c b/libyelp/yelp-search-entry.c
index 784ed82..4408087 100644
--- a/libyelp/yelp-search-entry.c
+++ b/libyelp/yelp-search-entry.c
@@ -416,7 +416,7 @@ cell_set_completion_bookmark_icon (GtkCellLayout     *layout,
 
         if (page_id && yelp_bookmarks_is_bookmarked (priv->bookmarks,
                                                      priv->completion_uri, page_id))
-            g_object_set (cell, "icon-name", "yelp-bookmark-remove-symbolic", NULL);
+            g_object_set (cell, "icon-name", "user-bookmarks-symbolic", NULL);
         else
             g_object_set (cell, "icon-name", NULL, NULL);
 
diff --git a/src/yelp-window.c b/src/yelp-window.c
index d64fde3..688776b 100644
--- a/src/yelp-window.c
+++ b/src/yelp-window.c
@@ -392,7 +392,7 @@ window_construct (YelpWindow *window)
     gtk_widget_set_valign (button, GTK_ALIGN_CENTER);
     gtk_style_context_add_class (gtk_widget_get_style_context (button), "image-button");
     gtk_button_set_image (GTK_BUTTON (button),
-                          gtk_image_new_from_icon_name ("yelp-bookmark-remove-symbolic",
+                          gtk_image_new_from_icon_name ("user-bookmarks-symbolic",
                                                         GTK_ICON_SIZE_MENU));
     gtk_widget_set_tooltip_text (button, _("Bookmarks"));
     gtk_header_bar_pack_end (GTK_HEADER_BAR (priv->header), button);