[Xfce4-commits] <midori:master> Leave panel icon styles to the system settings

[Christian Dywan]

Updating branch refs/heads/master
         to dfddd7ce0a1822c2bbc44b9339939c2de805e1ce (commit)
       from 9241afa0dba654b19649a802e22ddc99ffb27656 (commit)

commit dfddd7ce0a1822c2bbc44b9339939c2de805e1ce
Author: Christian Dywan <christian at twotoasts.de>
Date:   Thu May 13 16:53:19 2010 +0200

    Leave panel icon styles to the system settings

 midori/midori-panel.c      |    1 -
 midori/sokoke.c            |    1 +
 panels/midori-bookmarks.c  |   16 ----------------
 panels/midori-console.c    |    1 -
 panels/midori-extensions.c |    1 -
 panels/midori-history.c    |    1 -
 panels/midori-transfers.c  |    1 -
 7 files changed, 1 insertions(+), 21 deletions(-)

diff --git a/midori/midori-panel.c b/midori/midori-panel.c
index 0905603..33618ae 100644
--- a/midori/midori-panel.c
+++ b/midori/midori-panel.c
@@ -405,7 +405,6 @@ midori_panel_init (MidoriPanel* panel)
 
     /* Create the sidebar */
     panel->toolbar = gtk_toolbar_new ();
-    gtk_toolbar_set_style (GTK_TOOLBAR (panel->toolbar), GTK_TOOLBAR_ICONS);
     gtk_toolbar_set_icon_size (GTK_TOOLBAR (panel->toolbar), GTK_ICON_SIZE_BUTTON);
     gtk_toolbar_set_show_arrow (GTK_TOOLBAR (panel->toolbar), FALSE);
     gtk_widget_show_all (panel->toolbar);
diff --git a/midori/sokoke.c b/midori/sokoke.c
index 32658a0..b23383f 100644
--- a/midori/sokoke.c
+++ b/midori/sokoke.c
@@ -1304,6 +1304,7 @@ sokoke_register_stock_items (void)
         { STOCK_PLUGINS,        N_("Netscape p_lugins"), 0, 0, GTK_STOCK_CONVERT },
         { STOCK_USER_TRASH,     N_("_Closed Tabs"), 0, 0, "gtk-undo-ltr" },
         { STOCK_WINDOW_NEW,     N_("New _Window"), 0, 0, GTK_STOCK_ADD },
+        { GTK_STOCK_DIRECTORY,  N_("New _Folder"), 0, 0, NULL },
     };
 
     factory = gtk_icon_factory_new ();
diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c
index 87cc242..2a901f0 100644
--- a/panels/midori-bookmarks.c
+++ b/panels/midori-bookmarks.c
@@ -186,14 +186,6 @@ midori_bookmarks_folder_clicked_cb (GtkWidget* toolitem)
 }
 
 static void
-midori_bookmarks_import_clicked_cb (GtkWidget* toolitem)
-{
-    MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET (toolitem));
-    /* FIXME: Take selected folder into account */
-    midori_browser_activate_action (browser, "BookmarksImport");
-}
-
-static void
 midori_bookmarks_cursor_or_row_changed_cb (GtkTreeView*     treeview,
                                            MidoriBookmarks* bookmarks)
 {
@@ -234,7 +226,6 @@ midori_bookmarks_get_toolbar (MidoriViewable* viewable)
         GtkToolItem* toolitem;
 
         toolbar = gtk_toolbar_new ();
-        gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_BOTH_HORIZ);
         gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON);
         bookmarks->toolbar = toolbar;
         toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_ADD);
@@ -266,13 +257,6 @@ 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_CONVERT);
-        gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem),
-                                     _("Import bookmarks..."));
-        g_signal_connect (toolitem, "clicked",
-            G_CALLBACK (midori_bookmarks_import_clicked_cb), bookmarks);
-        gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1);
-        gtk_widget_show (GTK_WIDGET (toolitem));
         toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_DIRECTORY);
         gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem),
                                      _("Add a new folder"));
diff --git a/panels/midori-console.c b/panels/midori-console.c
index f758589..545cd9e 100644
--- a/panels/midori-console.c
+++ b/panels/midori-console.c
@@ -308,7 +308,6 @@ midori_console_get_toolbar (MidoriViewable* console)
         GtkToolItem* toolitem;
 
         toolbar = gtk_toolbar_new ();
-        gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_BOTH_HORIZ);
         gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON);
         toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_COPY);
         gtk_tool_item_set_is_important (toolitem, TRUE);
diff --git a/panels/midori-extensions.c b/panels/midori-extensions.c
index e03c734..f1702ea 100644
--- a/panels/midori-extensions.c
+++ b/panels/midori-extensions.c
@@ -105,7 +105,6 @@ midori_extensions_get_toolbar (MidoriViewable* extensions)
         GtkWidget* toolbar;
 
         toolbar = gtk_toolbar_new ();
-        gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_BOTH_HORIZ);
         gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON);
 
         MIDORI_EXTENSIONS (extensions)->toolbar = toolbar;
diff --git a/panels/midori-history.c b/panels/midori-history.c
index 41b1951..2eed597 100644
--- a/panels/midori-history.c
+++ b/panels/midori-history.c
@@ -429,7 +429,6 @@ midori_history_get_toolbar (MidoriViewable* viewable)
         #endif
 
         toolbar = gtk_toolbar_new ();
-        gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_BOTH_HORIZ);
         gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON);
         history->toolbar = toolbar;
         #if HAVE_SQLITE
diff --git a/panels/midori-transfers.c b/panels/midori-transfers.c
index 55d74c4..8292010 100644
--- a/panels/midori-transfers.c
+++ b/panels/midori-transfers.c
@@ -127,7 +127,6 @@ midori_transfers_get_toolbar (MidoriViewable* transfers)
         GtkToolItem* toolitem;
 
         toolbar = gtk_toolbar_new ();
-        gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_BOTH_HORIZ);
         gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON);
         toolitem = gtk_tool_item_new ();
         gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1);