Add WebKit version check to compat.h and use it in Preferences

diff --git a/midori/compat.h b/midori/compat.h
index 42789bf6d375f68c8a94f9b59b7bcc86d5611132..74dd0beed6360630c180b1ec1693890c6d92893a 100644 (file)
--- a/midori/compat.h
+++ b/midori/compat.h
@@ -56,6 +56,8 @@ gtk_tool_item_set_tooltip_text         (GtkToolItem*       toolitem,
 
 #ifndef WEBKIT_CHECK_VERSION
 
+#define WEBKIT_CHECK_VERSION(a,b,c) 0
+
 gfloat
 webkit_web_view_get_zoom_level         (WebKitWebView*     web_view);
 

diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c
index da4784e1cef6b05e8176f217bfddc5b0185dfbf2..a1fd1082b1f300ea3de801b74692a6d4f80e4207 100644 (file)
--- a/midori/midori-preferences.c
+++ b/midori/midori-preferences.c
@@ -16,6 +16,7 @@
 #endif
 
 #include "sokoke.h"
+#include "compat.h"
 
 #include <string.h>
 #include <glib/gi18n.h>

diff --git a/midori/midori-view.c b/midori/midori-view.c
index 228b9fb4157e9600e9c648e5fb62f72abb144547..ee05743c35262842072302265d045415f7f67648 100644 (file)
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -34,10 +34,6 @@
     #define D_(__domain, __message) __message
 #endif
 
-#ifndef WEBKIT_CHECK_VERSION
-    #define WEBKIT_CHECK_VERSION(a,b,c) 0
-#endif
-
 /* This is unstable API, so we need to declare it */
 gchar*
 webkit_web_view_get_selected_text (WebKitWebView* web_view);