[Xfce4-commits] <midori:master> Move WebKitGTK+ 1.1.6 guards to disable delayed pages

[Christian Dywan]

Updating branch refs/heads/master
         to 7d3fa2a478ad19e69f5c87c94c74d606ad632413 (commit)
       from a079235183f4b5fddeb22fc48e796bb5c92c7817 (commit)

commit 7d3fa2a478ad19e69f5c87c94c74d606ad632413
Author: Christian Dywan <christian at twotoasts.de>
Date:   Fri Aug 27 22:39:17 2010 +0200

    Move WebKitGTK+ 1.1.6 guards to disable delayed pages

 midori/midori-view.c        |    4 +++-
 midori/midori-websettings.c |    2 ++
 midori/midori-websettings.h |    2 ++
 3 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/midori/midori-view.c b/midori/midori-view.c
index 623a669..a4db75d 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -1053,7 +1053,6 @@ webkit_web_view_progress_changed_cb (WebKitWebView* web_view,
     g_object_notify (G_OBJECT (view), "progress");
 }
 
-#if WEBKIT_CHECK_VERSION (1, 1, 6)
 #if WEBKIT_CHECK_VERSION (1, 1, 14)
 static void
 midori_view_web_view_resource_request_cb (WebKitWebView*         web_view,
@@ -1158,6 +1157,7 @@ midori_view_load_alternate_string (MidoriView*     view,
     #endif
 }
 
+#if WEBKIT_CHECK_VERSION (1, 1, 6)
 static gboolean
 midori_view_display_error (MidoriView*     view,
                            const gchar*    uri,
@@ -3606,6 +3606,7 @@ midori_view_set_uri (MidoriView*  view,
             g_object_notify (G_OBJECT (view), "uri");
             return;
         }
+        #if WEBKIT_CHECK_VERSION (1, 1, 6)
         else if (g_str_has_prefix (uri, "pause:"))
         {
             gchar* title;
@@ -3622,6 +3623,7 @@ midori_view_set_uri (MidoriView*  view,
             katze_item_set_uri (view->item, uri);
             g_object_notify (G_OBJECT (view), "uri");
         }
+        #endif
         else if (g_str_has_prefix (uri, "javascript:"))
         {
             gboolean result;
diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c
index 122f0a0..997ad49 100644
--- a/midori/midori-websettings.c
+++ b/midori/midori-websettings.c
@@ -200,7 +200,9 @@ midori_startup_get_type (void)
          { MIDORI_STARTUP_BLANK_PAGE, "MIDORI_STARTUP_BLANK_PAGE", N_("Show Blank page") },
          { MIDORI_STARTUP_HOMEPAGE, "MIDORI_STARTUP_HOMEPAGE", N_("Show Homepage") },
          { MIDORI_STARTUP_LAST_OPEN_PAGES, "MIDORI_STARTUP_LAST_OPEN_PAGES", N_("Show last open tabs") },
+         #if WEBKIT_CHECK_VERSION (1, 1, 6)
          { MIDORI_STARTUP_DELAYED_PAGES, "MIDORI_STARTUP_DELAYED_PAGES", N_("Show last tabs without loading") },
+         #endif
          { 0, NULL, NULL }
         };
         type = g_enum_register_static ("MidoriStartup", values);
diff --git a/midori/midori-websettings.h b/midori/midori-websettings.h
index 2cedff1..a8f3678 100644
--- a/midori/midori-websettings.h
+++ b/midori/midori-websettings.h
@@ -66,7 +66,9 @@ typedef enum
     MIDORI_STARTUP_BLANK_PAGE, /* One blank tab or speed dial is opened */
     MIDORI_STARTUP_HOMEPAGE, /* One homepage tab is opened */
     MIDORI_STARTUP_LAST_OPEN_PAGES, /* The session is loaded and saved */
+    #if WEBKIT_CHECK_VERSION (1, 1, 6)
     MIDORI_STARTUP_DELAYED_PAGES /* The session is saved, loading pages is delayed */
+    #endif
 } MidoriStartup;
 
 GType