diff options
| -rw-r--r-- | extensions/addons.c | 1 | ||||
| -rw-r--r-- | extensions/apps.vala | 1 | ||||
| -rw-r--r-- | extensions/cookie-manager/cookie-manager-page.c | 4 | ||||
| -rw-r--r-- | extensions/feed-panel/feed-panel.c | 2 | ||||
| -rw-r--r-- | extensions/tab-panel.c | 3 | ||||
| -rw-r--r-- | midori/midori-panel.c | 3 | ||||
| -rw-r--r-- | panels/midori-bookmarks.c | 2 | ||||
| -rw-r--r-- | panels/midori-extensions.c | 2 | ||||
| -rw-r--r-- | panels/midori-history.c | 1 |
9 files changed, 3 insertions, 16 deletions
diff --git a/extensions/addons.c b/extensions/addons.c index 57770bc6..721cd8a8 100644 --- a/extensions/addons.c +++ b/extensions/addons.c @@ -617,7 +617,6 @@ addons_get_toolbar (MidoriViewable* viewable) if (!ADDONS (viewable)->toolbar) { toolbar = gtk_toolbar_new (); - 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); gtk_widget_show (GTK_WIDGET (toolitem)); diff --git a/extensions/apps.vala b/extensions/apps.vala index cdd2963e..535181af 100644 --- a/extensions/apps.vala +++ b/extensions/apps.vala @@ -91,7 +91,6 @@ namespace Apps { public Gtk.Widget get_toolbar () { if (toolbar == null) { toolbar = new Gtk.Toolbar (); - toolbar.set_icon_size (Gtk.IconSize.BUTTON); var profile = new Gtk.ToolButton.from_stock (Gtk.STOCK_ADD); profile.label = _("New _Profile"); diff --git a/extensions/cookie-manager/cookie-manager-page.c b/extensions/cookie-manager/cookie-manager-page.c index 37fff4e7..e8e24bdf 100644 --- a/extensions/cookie-manager/cookie-manager-page.c +++ b/extensions/cookie-manager/cookie-manager-page.c @@ -87,10 +87,6 @@ static void cm_create_toolbar(CookieManagerPage *cmp) GtkToolItem *toolitem; priv->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); - gtk_widget_show(toolbar); - toolitem = gtk_tool_button_new_from_stock(GTK_STOCK_DELETE); gtk_tool_item_set_is_important(toolitem, TRUE); g_signal_connect(toolitem, "clicked", G_CALLBACK(cm_button_delete_clicked_cb), cmp); diff --git a/extensions/feed-panel/feed-panel.c b/extensions/feed-panel/feed-panel.c index 8a08107a..9dfb3bf9 100644 --- a/extensions/feed-panel/feed-panel.c +++ b/extensions/feed-panel/feed-panel.c @@ -675,8 +675,6 @@ feed_panel_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); panel->toolbar = toolbar; toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_ADD); gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem), _("Add new feed")); diff --git a/extensions/tab-panel.c b/extensions/tab-panel.c index 7b429f6a..722057f8 100644 --- a/extensions/tab-panel.c +++ b/extensions/tab-panel.c @@ -574,9 +574,6 @@ tab_panel_app_add_browser_cb (MidoriApp* app, toolbar = gtk_toolbar_new (); g_object_set_data (G_OBJECT (browser), "tab-panel-ext-toolbar", toolbar); - gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_BOTH_HORIZ); - gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON); - gtk_widget_show (toolbar); /* TODO: Implement optional thumbnail images diff --git a/midori/midori-panel.c b/midori/midori-panel.c index 02961617..abc71b9c 100644 --- a/midori/midori-panel.c +++ b/midori/midori-panel.c @@ -637,6 +637,9 @@ midori_panel_append_page (MidoriPanel* panel, gtk_container_add (GTK_CONTAINER (panel->notebook), scrolled); toolbar = midori_viewable_get_toolbar (viewable); + gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_BOTH_HORIZ); + gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON); + gtk_toolbar_set_show_arrow (GTK_TOOLBAR (toolbar), FALSE); gtk_widget_show (toolbar); gtk_container_add (GTK_CONTAINER (panel->toolbook), toolbar); g_signal_connect (viewable, "destroy", diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c index bcc75c58..f3434d81 100644 --- a/panels/midori-bookmarks.c +++ b/panels/midori-bookmarks.c @@ -630,8 +630,6 @@ midori_bookmarks_get_toolbar (MidoriViewable* viewable) GtkToolItem* toolitem; toolbar = gtk_toolbar_new (); - 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 (STOCK_BOOKMARK_ADD); gtk_widget_set_name (GTK_WIDGET (toolitem), "BookmarkAdd"); diff --git a/panels/midori-extensions.c b/panels/midori-extensions.c index c6e36a7e..f0ab2c8b 100644 --- a/panels/midori-extensions.c +++ b/panels/midori-extensions.c @@ -104,8 +104,6 @@ midori_extensions_get_toolbar (MidoriViewable* extensions) GtkWidget* toolbar; toolbar = gtk_toolbar_new (); - 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 e262d077..9fd43973 100644 --- a/panels/midori-history.c +++ b/panels/midori-history.c @@ -401,7 +401,6 @@ midori_history_get_toolbar (MidoriViewable* viewable) GtkToolItem* toolitem; toolbar = gtk_toolbar_new (); - gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON); history->toolbar = toolbar; toolitem = gtk_tool_button_new_from_stock (STOCK_BOOKMARK_ADD); gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem), |