[Xfce4-commits] <midori:master> Use bookmark/ folder-new in bookmark panel

[Christian Dywan]

Updating branch refs/heads/master
         to 6f47ae75fc4ae7f63534216a39e01412e6589f1d (commit)
       from 28c5af1458859bc4b03889306f9fde6e61328c8d (commit)

commit 6f47ae75fc4ae7f63534216a39e01412e6589f1d
Author: Niels Avonds <niels.avonds at gmail.com>
Date:   Wed Jul 11 18:36:58 2012 +0200

    Use bookmark/ folder-new in bookmark panel
    
    Fixes: https://bugs.launchpad.net/midori/+bug/940536

 midori/midori-app.c       |    1 +
 midori/midori-stock.h     |    1 +
 panels/midori-bookmarks.c |    4 ++--
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/midori/midori-app.c b/midori/midori-app.c
index 1864279..0215a8f 100644
--- a/midori/midori-app.c
+++ b/midori/midori-app.c
@@ -1423,6 +1423,7 @@ midori_app_setup (gchar** argument_vector)
         { STOCK_PLUGINS,      N_("Netscape p_lugins") },
         { STOCK_USER_TRASH,   N_("_Closed Tabs") },
         { STOCK_WINDOW_NEW,   N_("New _Window") },
+        { STOCK_FOLDER_NEW,   N_("New _Folder") },
     };
 
     /* libSoup uses threads, therefore if WebKit is built with libSoup
diff --git a/midori/midori-stock.h b/midori/midori-stock.h
index bd7287b..3157c2c 100644
--- a/midori/midori-stock.h
+++ b/midori/midori-stock.h
@@ -30,5 +30,6 @@
 #define STOCK_TAB_NEW            "tab-new"
 #define STOCK_USER_TRASH         "user-trash"
 #define STOCK_WINDOW_NEW         "window-new"
+#define STOCK_FOLDER_NEW         "folder-new"
 
 #endif /* !__MIDORI_STOCK_H__ */
diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c
index 2f9ef4c..2c9213e 100644
--- a/panels/midori-bookmarks.c
+++ b/panels/midori-bookmarks.c
@@ -521,7 +521,7 @@ midori_bookmarks_get_toolbar (MidoriViewable* viewable)
         gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON);
         gtk_toolbar_set_show_arrow (GTK_TOOLBAR (toolbar), FALSE);
         bookmarks->toolbar = toolbar;
-        toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_ADD);
+        toolitem = gtk_tool_button_new_from_stock (STOCK_BOOKMARK_ADD);
         gtk_widget_set_name (GTK_WIDGET (toolitem), "BookmarkAdd");
         gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem),
                                      _("Add a new bookmark"));
@@ -552,7 +552,7 @@ midori_bookmarks_get_toolbar (MidoriViewable* viewable)
         gtk_tool_item_set_expand (toolitem, TRUE);
         gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1);
         gtk_widget_show (GTK_WIDGET (toolitem));
-        toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_DIRECTORY);
+        toolitem = gtk_tool_button_new_from_stock (STOCK_FOLDER_NEW);
         gtk_widget_set_name (GTK_WIDGET (toolitem), "BookmarkFolderAdd");
         gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem),
                                      _("Add a new folder"));