[Xfce4-commits] <midori:master> Disable NavigationBox while it's not yet upstream

[Christian Dywan]

Updating branch refs/heads/master
         to 33faeaeac29ff3c8a643e6a4e53961509c9badc1 (commit)
       from d71adefa86a4409f09d40c3fa5665db937279a63 (commit)

commit 33faeaeac29ff3c8a643e6a4e53961509c9badc1
Author: Christian Dywan <christian at twotoasts.de>
Date:   Mon Nov 5 21:00:51 2012 +0100

    Disable NavigationBox while it's not yet upstream

 midori/midori-tab.vala |    6 +++---
 midori/midori-view.c   |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/midori/midori-tab.vala b/midori/midori-tab.vala
index c8994b3..1ab694a 100644
--- a/midori/midori-tab.vala
+++ b/midori/midori-tab.vala
@@ -36,7 +36,7 @@ namespace Midori {
     public class Tab : Gtk.VBox {
         public WebKit.WebView web_view { get; private set; }
 
-        #if HAVE_GRANITE
+        #if HAVE_GRANITE_CLUTTER
         public Granite.Widgets.NavigationBox navigation_box { get; private set; }
         #endif
 
@@ -94,7 +94,7 @@ namespace Midori {
             orientation = Gtk.Orientation.VERTICAL;
             #endif
 
-            #if HAVE_GRANITE
+            #if HAVE_GRANITE_CLUTTER
             navigation_box = new Granite.Widgets.NavigationBox ();
             #endif
 
@@ -200,7 +200,7 @@ namespace Midori {
         }
 
         public void go_forward () {
-            #if HAVE_GRANITE
+            #if HAVE_GRANITE_CLUTTER
             navigation_box.forward ();
             #endif
             web_view.go_forward ();
diff --git a/midori/midori-view.c b/midori/midori-view.c
index 9c78337..464faf0 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -787,7 +787,7 @@ webkit_web_view_load_committed_cb (WebKitWebView*  web_view,
     if (web_frame != webkit_web_view_get_main_frame (web_view))
         return;
 
-    #ifdef HAVE_GRANITE
+    #ifdef HAVE_GRANITE_CLUTTER
     GraniteWidgetsNavigationBox* navigation_box = midori_tab_get_navigation_box (MIDORI_TAB (view));
     granite_widgets_navigation_box_transition_ready (navigation_box);
     #endif
@@ -3535,7 +3535,7 @@ midori_view_constructor (GType                  type,
     #if GTK_CHECK_VERSION(3, 2, 0)
     view->overlay = gtk_overlay_new ();
     gtk_widget_show (view->overlay);
-    #ifdef HAVE_GRANITE
+    #ifdef HAVE_GRANITE_CLUTTER
     {
     GraniteWidgetsNavigationBox* navigation_box = midori_tab_get_navigation_box (MIDORI_TAB (view));
     granite_widgets_navigation_box_add (navigation_box, GTK_WIDGET (view->scrolled_window));
@@ -4996,7 +4996,7 @@ midori_view_go_back (MidoriView* view)
 {
     g_return_if_fail (MIDORI_IS_VIEW (view));
 
-    #ifdef HAVE_GRANITE
+    #ifdef HAVE_GRANITE_CLUTTER
     GraniteWidgetsNavigationBox* navigation_box = midori_tab_get_navigation_box (MIDORI_TAB (view));
     granite_widgets_navigation_box_back (navigation_box);
     #endif