Use secondary toolbar class for panel title

Also introduce a utility function to make adding
the class more readable.

Fixes: https://bugs.launchpad.net/midori/+bug/1026384

diff --git a/extensions/adblock.c b/extensions/adblock.c
index 96d414c53fef4831fdd2e39a34e5eecf4ff052a2..7480f754cd3971cbf4c02778d7a4800b7c7808fc 100644 (file)
--- a/extensions/adblock.c
+++ b/extensions/adblock.c
@@ -477,11 +477,8 @@ adblock_get_preferences_dialog (MidoriExtension* extension)
         GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
         #endif
         NULL);
-    #if GTK_CHECK_VERSION (3, 0, 0)
-    gtk_style_context_add_class (gtk_widget_get_style_context (
-        gtk_dialog_get_widget_for_response (GTK_DIALOG (dialog),
-            GTK_RESPONSE_HELP)), "help_button");
-    #endif
+    katze_widget_add_class (gtk_dialog_get_widget_for_response (
+        GTK_DIALOG (dialog), GTK_RESPONSE_HELP), "help_button");
     content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
     g_signal_connect (dialog, "destroy",
                       G_CALLBACK (gtk_widget_destroyed), &dialog);

diff --git a/katze/katze-preferences.c b/katze/katze-preferences.c
index cd89ffe1d228b25d19a321f29d0c6b1173fde00b..6108fd4a43cfa3b293a58772fc2f7d7c710cd24a 100644 (file)
--- a/katze/katze-preferences.c
+++ b/katze/katze-preferences.c
@@ -110,11 +110,8 @@ katze_preferences_init (KatzePreferences* preferences)
     gtk_dialog_add_buttons (GTK_DIALOG (preferences),
         GTK_STOCK_HELP, GTK_RESPONSE_HELP,
         NULL);
-    #if GTK_CHECK_VERSION (3, 0, 0)
-    gtk_style_context_add_class (gtk_widget_get_style_context (
-        gtk_dialog_get_widget_for_response (GTK_DIALOG (preferences),
-            GTK_RESPONSE_HELP)), "help_button");
-    #endif
+    katze_widget_add_class (gtk_dialog_get_widget_for_response (
+        GTK_DIALOG (preferences), GTK_RESPONSE_HELP), "help_button");
 
     gtk_dialog_add_buttons (GTK_DIALOG (preferences),
         #if HAVE_HILDON

diff --git a/katze/katze-utils.c b/katze/katze-utils.c
index 6842581b473947c1d8c85a3e8ef359c6ffa32d92..c206923e33cb8e39a7e1a2562f60e5a96dad9576 100644 (file)
--- a/katze/katze-utils.c
+++ b/katze/katze-utils.c
@@ -1576,6 +1576,16 @@ katze_uri_entry_new (GtkWidget* other_widget)
     return entry;
 }
 
+void
+katze_widget_add_class (GtkWidget*   widget,
+                        const gchar* class_name)
+{
+    #if GTK_CHECK_VERSION (3,0,0)
+    GtkStyleContext* context = gtk_widget_get_style_context (widget);
+    gtk_style_context_add_class (context, class_name);
+    #endif
+}
+
 /**
  * katze_assert_str_equal:
  * @input: a string

diff --git a/katze/katze-utils.h b/katze/katze-utils.h
index 274aebb25dd52ac9fde07f9f87c567eb83cc41d2..bf97cbff71587774a3895856c58ba40650e8775f 100644 (file)
--- a/katze/katze-utils.h
+++ b/katze/katze-utils.h
@@ -160,6 +160,10 @@ katze_load_cached_icon               (const gchar*    uri,
 GtkWidget*
 katze_uri_entry_new                  (GtkWidget*      other_widget);
 
+void
+katze_widget_add_class               (GtkWidget*      widget,
+                                      const gchar*    class_name);
+
 void
 katze_assert_str_equal               (const gchar*    input,
                                       const gchar*    result,

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 5115bcf4501e0e5a928550fadb26d9dda225890c..4e091a4eed81ce5f78edb6404bacc03f3a2afe13 100644 (file)
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -4798,11 +4798,8 @@ _action_clear_private_data_activate (GtkAction*     action,
             GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
             GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
             _("_Clear private data"), GTK_RESPONSE_ACCEPT, NULL);
-        #if GTK_CHECK_VERSION (3, 0, 0)
-        gtk_style_context_add_class (gtk_widget_get_style_context (
-            gtk_dialog_get_widget_for_response (GTK_DIALOG (dialog),
-                GTK_RESPONSE_ACCEPT)), "noundo");
-        #endif
+        katze_widget_add_class (gtk_dialog_get_widget_for_response (
+            GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT), "noundo");
         content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
         gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dialog), FALSE);
         screen = gtk_widget_get_screen (GTK_WIDGET (browser));
@@ -6523,9 +6520,7 @@ midori_browser_init (MidoriBrowser* browser)
     /* Create the navigationbar */
     browser->navigationbar = gtk_ui_manager_get_widget (
         ui_manager, "/toolbar_navigation");
-#if GTK_CHECK_VERSION(3,0,0)
-    gtk_style_context_add_class(gtk_widget_get_style_context(browser->navigationbar), "primary-toolbar");
-#endif
+    katze_widget_add_class (browser->navigationbar, "primary-toolbar");
     /* FIXME: Settings should be connected with screen changes */
     gtk_settings = gtk_widget_get_settings (GTK_WIDGET (browser));
     if (gtk_settings)
@@ -6557,10 +6552,7 @@ midori_browser_init (MidoriBrowser* browser)
 
     /* Bookmarkbar */
     browser->bookmarkbar = gtk_toolbar_new ();
-#if GTK_CHECK_VERSION (3, 0, 0)
-    gtk_style_context_add_class (
-        gtk_widget_get_style_context (browser->bookmarkbar), "secondary-toolbar");
-#endif
+    katze_widget_add_class (browser->bookmarkbar, "secondary-toolbar");
     gtk_widget_set_name (browser->bookmarkbar, "MidoriBookmarkbar");
     gtk_toolbar_set_icon_size (GTK_TOOLBAR (browser->bookmarkbar),
                                GTK_ICON_SIZE_MENU);

diff --git a/midori/midori-panel.c b/midori/midori-panel.c
index dd10c8fb665f2040a253873d227cd280d4e7376d..61e4ad92db31422ccd42e8a7f75384ac5966b2dc 100644 (file)
--- a/midori/midori-panel.c
+++ b/midori/midori-panel.c
@@ -300,6 +300,7 @@ midori_panel_init (MidoriPanel* panel)
 
     /* Create the titlebar */
     labelbar = gtk_toolbar_new ();
+    katze_widget_add_class (labelbar, "secondary-toolbar");
     panel->labelbar = labelbar;
     gtk_toolbar_set_icon_size (GTK_TOOLBAR (labelbar), GTK_ICON_SIZE_MENU);
     gtk_toolbar_set_style (GTK_TOOLBAR (labelbar), GTK_TOOLBAR_ICONS);

diff --git a/midori/midori-searchaction.c b/midori/midori-searchaction.c
index 6164d33bc77c7f758e2f0fbf31213ad0afc3e537..76dbda4b6317221f6ab3787385c436b5faae9a72 100644 (file)
--- a/midori/midori-searchaction.c
+++ b/midori/midori-searchaction.c
@@ -1341,11 +1341,8 @@ midori_search_action_get_dialog (MidoriSearchAction* search_action)
         GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
         #endif
         NULL);
-    #if GTK_CHECK_VERSION (3, 0, 0)
-    gtk_style_context_add_class (gtk_widget_get_style_context (
-        gtk_dialog_get_widget_for_response (GTK_DIALOG (dialog),
-            GTK_RESPONSE_HELP)), "help_button");
-    #endif
+    katze_widget_add_class (gtk_dialog_get_widget_for_response (
+        GTK_DIALOG (dialog), GTK_RESPONSE_HELP), "help_button");
     g_signal_connect (dialog, "destroy",
                       G_CALLBACK (gtk_widget_destroyed), &search_action->dialog);
     gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_PROPERTIES);

diff --git a/toolbars/midori-findbar.c b/toolbars/midori-findbar.c
index 6e5435fea6ad5386b687a871fee2b676142de57a..8bb167e02403a7ba0dbb0dee4f64729c52802ac6 100644 (file)
--- a/toolbars/midori-findbar.c
+++ b/toolbars/midori-findbar.c
@@ -263,10 +263,7 @@ midori_findbar_init (MidoriFindbar* findbar)
     GtkToolItem* toolitem;
 
     gtk_widget_set_name (GTK_WIDGET (findbar), "MidoriFindbar");
-    #if GTK_CHECK_VERSION (3, 0, 0)
-    gtk_style_context_add_class (
-        gtk_widget_get_style_context (GTK_WIDGET (findbar)), "bottom-toolbar");
-    #endif
+    katze_widget_add_class (GTK_WIDGET (findbar), "bottom-toolbar");
     gtk_toolbar_set_icon_size (GTK_TOOLBAR (findbar), GTK_ICON_SIZE_MENU);
     gtk_toolbar_set_style (GTK_TOOLBAR (findbar), GTK_TOOLBAR_BOTH_HORIZ);
     gtk_toolbar_set_show_arrow (GTK_TOOLBAR (findbar), FALSE);