[Xfce4-commits] <midori:master> Use granite static notebook for preferences

[Christian Dywan]

Updating branch refs/heads/master
         to ebd0ef2a46005d334428339f2200858d80a8afcb (commit)
       from 3effb9a4cefb61f8b8fcfe0e309b8b6d9764800f (commit)

commit ebd0ef2a46005d334428339f2200858d80a8afcb
Author: Christian Dywan <christian at twotoasts.de>
Date:   Tue Jun 26 23:38:30 2012 +0200

    Use granite static notebook for preferences
    
    Fixes: https://bugs.launchpad.net/midori/+bug/1018074

 katze/katze-preferences.c |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/katze/katze-preferences.c b/katze/katze-preferences.c
index e4fd18a..4c7a9aa 100644
--- a/katze/katze-preferences.c
+++ b/katze/katze-preferences.c
@@ -15,6 +15,13 @@
     #include <config.h>
 #endif
 
+#ifdef HAVE_GRANITE
+    #if HAVE_OSX
+        #error FIXME granite on OSX is not implemented
+    #endif
+    #include <granite.h>
+#endif
+
 #if HAVE_HILDON
     #include "katze-scrolled.h"
     #include <hildon/hildon.h>
@@ -202,7 +209,11 @@ katze_preferences_prepare (KatzePreferences* preferences)
     g_signal_connect (priv->scrolled, "destroy",
                       G_CALLBACK (gtk_widget_destroyed), &priv->scrolled);
     #else
+    #if HAVE_GRANITE
+    priv->notebook = granite_widgets_static_notebook_new ();
+    #else
     priv->notebook = gtk_notebook_new ();
+    #endif
     gtk_container_set_border_width (GTK_CONTAINER (priv->notebook), 6);
 
     #if HAVE_OSX
@@ -296,8 +307,14 @@ katze_preferences_add_category (KatzePreferences* preferences,
     priv->sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
     gtk_widget_show (priv->page);
     gtk_container_set_border_width (GTK_CONTAINER (priv->page), 4);
+    #if HAVE_GRANITE
+    granite_widgets_static_notebook_append_page (
+        GRANITE_WIDGETS_STATIC_NOTEBOOK (priv->notebook),
+        priv->page, gtk_label_new (label));
+    #else
     gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook),
                               priv->page, gtk_label_new (label));
+    #endif
     #if HAVE_OSX
     priv->toolbutton = GTK_WIDGET (priv->toolbutton ?
         gtk_radio_tool_button_new_from_widget (