[epiphany/wip/ephy-sync] bookmarks: Fix icons

[Gabriel - Cristian Ivascu <gabrielivascu src gnome org>]

commit f8ec3982afb5ff53c77c2b443851ab861364a262
Author: Iulian Radu <iulian radu67 gmail com>
Date:   Mon Aug 8 20:19:39 2016 +0300

    bookmarks: Fix icons

 src/Makefile.am                                    |   54 +++++-----
 src/ephy-bookmarks-popover.c                       |    2 +-
 src/ephy-toolbar.c                                 |    2 +-
 src/epiphany.gresource.xml                         |   10 +-
 src/resources/icons/ephy-bookmark-empty.svg        |  124 --------------------
 src/resources/icons/ephy-bookmark-full.svg         |  124 --------------------
 .../hicolor/16x16/actions/ephy-bookmark-empty.png  |  Bin 0 -> 663 bytes
 .../hicolor/16x16/actions/ephy-bookmark-full.png   |  Bin 0 -> 723 bytes
 .../actions/ephy-bookmark-tag-symbolic.svg}        |    0
 .../scalable/actions/ephy-bookmarks-symbolic.svg}  |    0
 10 files changed, 35 insertions(+), 281 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index a54a07f..a69db75 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -125,33 +125,33 @@ libephymain_la_CFLAGS = \
        $(AM_CFLAGS)
 
 RESOURCE_FILES = \
-       resources/about.css                       \
-       resources/bookmark-properties.ui          \
-       resources/channel-insecure-symbolic.png   \
-       resources/computer-fail-symbolic.png      \
-       resources/clear-data-dialog.ui            \
-       resources/cookies-dialog.ui               \
-       resources/encoding-dialog.ui              \
-       resources/encoding-row.ui                 \
-       resources/epiphany-application-menu.ui    \
-       resources/epiphany-bookmark-editor-ui.xml \
-       resources/epiphany.css                    \
-       resources/error.html                      \
-       resources/history-dialog.ui               \
-       resources/incognito.png                   \
-       resources/missing-thumbnail.png           \
-       resources/passwords-dialog.ui             \
-       resources/prefs-dialog.ui                 \
-       resources/prefs-lang-dialog.ui            \
-       resources/shortcuts-dialog.ui             \
-       resources/icons/ephy-bookmark-empty.svg   \
-       resources/icons/ephy-bookmark-full.svg    \
-       resources/icons/ephy-bookmark-tag.svg     \
-       resources/icons/ephy-bookmarks.svg        \
-       resources/gtk/bookmark-properties-grid.ui \
-       resources/gtk/bookmark-row.ui             \
-       resources/gtk/bookmarks-popover.ui        \
-       resources/gtk/menus.ui                    \
+       resources/about.css                                                             \
+       resources/bookmark-properties.ui                                                \
+       resources/channel-insecure-symbolic.png                                         \
+       resources/computer-fail-symbolic.png                                            \
+       resources/clear-data-dialog.ui                                                  \
+       resources/cookies-dialog.ui                                                     \
+       resources/encoding-dialog.ui                                                    \
+       resources/encoding-row.ui                                                       \
+       resources/epiphany-application-menu.ui                                          \
+       resources/epiphany-bookmark-editor-ui.xml                                       \
+       resources/epiphany.css                                                          \
+       resources/error.html                                                            \
+       resources/history-dialog.ui                                                     \
+       resources/incognito.png                                                         \
+       resources/missing-thumbnail.png                                                 \
+       resources/passwords-dialog.ui                                                   \
+       resources/prefs-dialog.ui                                                       \
+       resources/prefs-lang-dialog.ui                                                  \
+       resources/shortcuts-dialog.ui                                                   \
+       resources/icons/hicolor/16x16/actions/ephy-bookmark-empty.png                   \
+       resources/icons/hicolor/16x16/actions/ephy-bookmark-full.png                    \
+       resources/icons/hicolor/scalable/actions/ephy-bookmark-tag-symbolic.svg         \
+       resources/icons/hicolor/scalable/actions/ephy-bookmarks-symbolic.svg            \
+       resources/gtk/bookmark-properties-grid.ui                                       \
+       resources/gtk/bookmark-row.ui                                                   \
+       resources/gtk/bookmarks-popover.ui                                              \
+       resources/gtk/menus.ui                                                          \
        $(NULL)
 
 epiphany-resources.c: epiphany.gresource.xml $(RESOURCE_FILES)
diff --git a/src/ephy-bookmarks-popover.c b/src/ephy-bookmarks-popover.c
index 59a192e..fcea7c0 100644
--- a/src/ephy-bookmarks-popover.c
+++ b/src/ephy-bookmarks-popover.c
@@ -192,7 +192,7 @@ create_tag_row (const char *tag)
   if (g_strcmp0 (tag, "Favorites") == 0)
     image = gtk_image_new_from_icon_name ("user-bookmarks-symbolic", GTK_ICON_SIZE_MENU);
   else
-    image = gtk_image_new_from_icon_name ("ephy-bookmark-tag", GTK_ICON_SIZE_MENU);
+    image = gtk_image_new_from_icon_name ("ephy-bookmark-tag-symbolic", GTK_ICON_SIZE_MENU);
   gtk_box_pack_start (GTK_BOX (box), image, FALSE, FALSE, 6);
 
   label = gtk_label_new (tag);
diff --git a/src/ephy-toolbar.c b/src/ephy-toolbar.c
index a49c4b4..bf4bd4a 100644
--- a/src/ephy-toolbar.c
+++ b/src/ephy-toolbar.c
@@ -751,7 +751,7 @@ ephy_toolbar_constructed (GObject *object)
   button = gtk_menu_button_new ();
   toolbar->bookmarks_button = button;
   gtk_button_set_image (GTK_BUTTON (button),
-                        gtk_image_new_from_icon_name ("user-bookmarks-symbolic", GTK_ICON_SIZE_BUTTON));
+                        gtk_image_new_from_icon_name ("ephy-bookmarks-symbolic", GTK_ICON_SIZE_BUTTON));
   gtk_widget_set_valign (button, GTK_ALIGN_CENTER);
   gtk_menu_button_set_popover (GTK_MENU_BUTTON (button), GTK_WIDGET (ephy_bookmarks_popover_new 
(toolbar->window)));
 
diff --git a/src/epiphany.gresource.xml b/src/epiphany.gresource.xml
index c90db7b..3212832 100644
--- a/src/epiphany.gresource.xml
+++ b/src/epiphany.gresource.xml
@@ -12,10 +12,6 @@
     <file preprocess="xml-stripblanks" compressed="true">history-dialog.ui</file>
     <file preprocess="xml-stripblanks" compressed="true">passwords-dialog.ui</file>
     <file preprocess="xml-stripblanks" compressed="true">shortcuts-dialog.ui</file>
-    <file preprocess="xml-stripblanks" compressed="true">icons/ephy-bookmark-empty.svg</file>
-    <file preprocess="xml-stripblanks" compressed="true">icons/ephy-bookmark-full.svg</file>
-    <file preprocess="xml-stripblanks" compressed="true">icons/ephy-bookmark-tag.svg</file>
-    <file preprocess="xml-stripblanks" compressed="true">icons/ephy-bookmarks.svg</file>
     <file preprocess="xml-stripblanks" compressed="true">gtk/bookmark-properties-grid.ui</file>
     <file preprocess="xml-stripblanks" compressed="true">gtk/bookmark-row.ui</file>
     <file preprocess="xml-stripblanks" compressed="true">gtk/bookmarks-popover.ui</file>
@@ -29,4 +25,10 @@
     <file>computer-fail-symbolic.png</file>
     <file alias="page-templates/about.css" compressed="true">about.css</file>
   </gresource>
+  <gresource prefix="/org/gnome/Epiphany/icons">
+    <file compressed="true" 
alias="scalable/actions/ephy-bookmark-tag-symbolic.svg">icons/hicolor/scalable/actions/ephy-bookmark-tag-symbolic.svg</file>
+    <file compressed="true" 
alias="scalable/actions/ephy-bookmarks-symbolic.svg">icons/hicolor/scalable/actions/ephy-bookmarks-symbolic.svg</file>
+    <file 
alias="16x16/actions/ephy-bookmark-empty.png">icons/hicolor/16x16/actions/ephy-bookmark-empty.png</file>
+    <file 
alias="16x16/actions/ephy-bookmark-full.png">icons/hicolor/16x16/actions/ephy-bookmark-full.png</file>
+  </gresource>
 </gresources>
diff --git a/src/resources/icons/hicolor/16x16/actions/ephy-bookmark-empty.png 
b/src/resources/icons/hicolor/16x16/actions/ephy-bookmark-empty.png
new file mode 100644
index 0000000..72046d0
Binary files /dev/null and b/src/resources/icons/hicolor/16x16/actions/ephy-bookmark-empty.png differ
diff --git a/src/resources/icons/hicolor/16x16/actions/ephy-bookmark-full.png 
b/src/resources/icons/hicolor/16x16/actions/ephy-bookmark-full.png
new file mode 100644
index 0000000..430b768
Binary files /dev/null and b/src/resources/icons/hicolor/16x16/actions/ephy-bookmark-full.png differ
diff --git a/src/resources/icons/ephy-bookmark-tag.svg 
b/src/resources/icons/hicolor/scalable/actions/ephy-bookmark-tag-symbolic.svg
similarity index 100%
rename from src/resources/icons/ephy-bookmark-tag.svg
rename to src/resources/icons/hicolor/scalable/actions/ephy-bookmark-tag-symbolic.svg
diff --git a/src/resources/icons/ephy-bookmarks.svg 
b/src/resources/icons/hicolor/scalable/actions/ephy-bookmarks-symbolic.svg
similarity index 100%
rename from src/resources/icons/ephy-bookmarks.svg
rename to src/resources/icons/hicolor/scalable/actions/ephy-bookmarks-symbolic.svg