[Xfce4-commits] <midori:master> Use one central point to include webkit.h

[Christian Dywan]

Updating branch refs/heads/master
         to 0944dbd7fdcd6e753c09e942f8ddd935008af4b5 (commit)
       from 5520769a73c1e15a6b6b36a1b1a27284aa6952d4 (commit)

commit 0944dbd7fdcd6e753c09e942f8ddd935008af4b5
Author: André Stösel <andre at stoesel.de>
Date:   Tue Feb 19 19:11:27 2013 +0100

    Use one central point to include webkit.h

 extensions/cookie-manager/cookie-manager-page.c |    2 +-
 extensions/cookie-manager/cookie-manager.c      |    2 +-
 katze/katze-item.c                              |    2 +-
 katze/katze-net.h                               |    6 +++++-
 midori/main.c                                   |    2 +-
 midori/midori-browser.h                         |    2 --
 midori/midori-privatedata.h                     |    2 +-
 midori/midori-searchaction.h                    |    1 -
 midori/midori-view.c                            |    2 +-
 midori/midori-websettings.h                     |    2 --
 midori/sokoke.c                                 |    2 +-
 midori/sokoke.h                                 |    2 +-
 12 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/extensions/cookie-manager/cookie-manager-page.c b/extensions/cookie-manager/cookie-manager-page.c
index 03e4ff5..37fff4e 100644
--- a/extensions/cookie-manager/cookie-manager-page.c
+++ b/extensions/cookie-manager/cookie-manager-page.c
@@ -12,7 +12,7 @@
 #include <gdk/gdkkeysyms.h>
 
 #include <midori/midori.h>
-#include <webkit/webkit.h>
+#include "katze/katze.h"
 #include <time.h>
 
 #include "cookie-manager.h"
diff --git a/extensions/cookie-manager/cookie-manager.c b/extensions/cookie-manager/cookie-manager.c
index 18f4c0d..e43520b 100644
--- a/extensions/cookie-manager/cookie-manager.c
+++ b/extensions/cookie-manager/cookie-manager.c
@@ -11,7 +11,7 @@
 
 #include "config.h"
 #include <midori/midori.h>
-#include <webkit/webkit.h>
+#include "katze/katze.h"
 
 #include "cookie-manager.h"
 #include "cookie-manager-page.h"
diff --git a/katze/katze-item.c b/katze/katze-item.c
index f91bc90..062010f 100644
--- a/katze/katze-item.c
+++ b/katze/katze-item.c
@@ -15,7 +15,7 @@
 
 #include <glib/gi18n.h>
 
-#include <webkit/webkit.h>
+#include "katze/katze.h"
 
 /**
  * SECTION:katze-item
diff --git a/katze/katze-net.h b/katze/katze-net.h
index a6371fb..2d26030 100644
--- a/katze/katze-net.h
+++ b/katze/katze-net.h
@@ -12,7 +12,11 @@
 #ifndef __KATZE_NET_H__
 #define __KATZE_NET_H__
 
-#include <webkit/webkit.h>
+#ifndef HAVE_WEBKIT2
+    #include <webkit/webkit.h>
+#else
+    #include <webkit2/webkit2.h>
+#endif
 #include "katze-utils.h"
 
 G_BEGIN_DECLS
diff --git a/midori/main.c b/midori/main.c
index ddfe9b7..3a00f67 100644
--- a/midori/main.c
+++ b/midori/main.c
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <glib/gstdio.h>
 #include <glib/gi18n-lib.h>
-#include <webkit/webkit.h>
+#include "katze/katze.h"
 #include <sqlite3.h>
 
 #define HAVE_OFFSCREEN GTK_CHECK_VERSION (2, 20, 0)
diff --git a/midori/midori-browser.h b/midori/midori-browser.h
index 1564145..f054e5a 100644
--- a/midori/midori-browser.h
+++ b/midori/midori-browser.h
@@ -12,8 +12,6 @@
 #ifndef __MIDORI_BROWSER_H__
 #define __MIDORI_BROWSER_H__
 
-#include <webkit/webkit.h>
-
 #include <katze/katze.h>
 #include "midori-view.h"
 
diff --git a/midori/midori-privatedata.h b/midori/midori-privatedata.h
index 5470ccd..25eddf3 100644
--- a/midori/midori-privatedata.h
+++ b/midori/midori-privatedata.h
@@ -13,7 +13,7 @@
 #define __PRIVATE_DATA_H__ 1
 
 #include <midori/midori-browser.h>
-#include <webkit/webkit.h>
+#include "katze/katze.h"
 
 GtkWidget*
 midori_private_data_get_dialog (MidoriBrowser* browser);
diff --git a/midori/midori-searchaction.h b/midori/midori-searchaction.h
index 6817f29..5c050b3 100644
--- a/midori/midori-searchaction.h
+++ b/midori/midori-searchaction.h
@@ -13,7 +13,6 @@
 #define __MIDORI_SEARCH_ACTION_H__
 
 #include <katze/katze.h>
-#include <webkit/webkit.h>
 
 G_BEGIN_DECLS
 
diff --git a/midori/midori-view.c b/midori/midori-view.c
index 772e8a2..7e4bd9c 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -40,7 +40,7 @@ midori_map_get_message (SoupMessage* message);
 #include <glib/gprintf.h>
 #include <glib/gstdio.h>
 #include <gdk/gdkkeysyms.h>
-#include <webkit/webkit.h>
+#include "katze/katze.h"
 
 #if HAVE_UNISTD_H
     #include <unistd.h>
diff --git a/midori/midori-websettings.h b/midori/midori-websettings.h
index c2491fe..ccceaef 100644
--- a/midori/midori-websettings.h
+++ b/midori/midori-websettings.h
@@ -12,8 +12,6 @@
 #ifndef __MIDORI_WEB_SETTINGS_H__
 #define __MIDORI_WEB_SETTINGS_H__
 
-#include <webkit/webkit.h>
-
 #include <katze/katze.h>
 
 G_BEGIN_DECLS
diff --git a/midori/sokoke.c b/midori/sokoke.c
index c61defb..3a79807 100644
--- a/midori/sokoke.c
+++ b/midori/sokoke.c
@@ -32,7 +32,7 @@
 #include <glib/gi18n.h>
 #include <glib/gprintf.h>
 #include <glib/gstdio.h>
-#include <webkit/webkit.h>
+#include "katze/katze.h"
 
 static gchar*
 sokoke_js_string_utf8 (JSStringRef js_string)
diff --git a/midori/sokoke.h b/midori/sokoke.h
index 5d65eb6..aa5e5f9 100644
--- a/midori/sokoke.h
+++ b/midori/sokoke.h
@@ -14,7 +14,7 @@
 #define __SOKOKE_H__ 1
 
 #include <JavaScriptCore/JavaScript.h>
-#include <webkit/webkit.h>
+#include "katze/katze.h"
 #include <midori/midori-websettings.h>
 #include <katze/gtk3-compat.h>