sokoke, gtk3-compat, gtkiconentry, stock join midori-platform.h

Also introduce #define MIDORI_MODULE_PREFIX.

Fixes: https://bugs.launchpad.net/midori/+bug/884395

diff --git a/extensions/adblock.c b/extensions/adblock.c
index 803c197e4fd9b2b579956bf381720f451debf8e5..a72c5da5b89591e8609cec78b6668e9687360f5c 100644 (file)
--- a/extensions/adblock.c
+++ b/extensions/adblock.c
@@ -11,11 +11,9 @@
 */
 
 #include <midori/midori.h>
+#include <glib/gstdio.h>
 
-#include <midori/sokoke.h>
 #include "config.h"
-
-#include <glib/gstdio.h>
 #if HAVE_UNISTD_H
     #include <unistd.h>
 #endif

diff --git a/extensions/addons.c b/extensions/addons.c
index 2f82099b978615d645854bd11f1c9b7f95ee5922..7db7ab5f6b06ab6261a4d6f6ead36ce6e0f7107c 100644 (file)
--- a/extensions/addons.c
+++ b/extensions/addons.c
@@ -14,11 +14,9 @@
 /* This extensions add support for user addons: userscripts and userstyles */
 
 #include <midori/midori.h>
-#include <midori/sokoke.h>
 #include <glib/gstdio.h>
 
 #include "config.h"
-
 #if HAVE_UNISTD_H
     #include <unistd.h>
 #endif

diff --git a/extensions/cookie-manager/cookie-manager-page.c b/extensions/cookie-manager/cookie-manager-page.c
index 70947dd448af12850c49741f6412ed356a024dd9..16710dc45105f01e6a9248774f8b4e9f18305edc 100644 (file)
--- a/extensions/cookie-manager/cookie-manager-page.c
+++ b/extensions/cookie-manager/cookie-manager-page.c
@@ -9,12 +9,9 @@
  See the file COPYING for the full license text.
 */
 
-#include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
 #include <midori/midori.h>
-#include <midori/gtkiconentry.h>
-#include "katze/gtk3-compat.h"
 #include <webkit/webkit.h>
 #include <time.h>
 

diff --git a/extensions/copy-tabs.c b/extensions/copy-tabs.c
index 60fe2dbca77d9448d1a88d2f6638ea06f5b38fb7..55c4c31551b2f5fe8ceef38381fac742417edad7 100644 (file)
--- a/extensions/copy-tabs.c
+++ b/extensions/copy-tabs.c
@@ -10,7 +10,6 @@
 */
 
 #include <midori/midori.h>
-#include <midori/sokoke.h>
 
 static void
 copy_tabs_apply_cb (GtkWidget*     menuitem,

diff --git a/extensions/feed-panel/feed-panel.c b/extensions/feed-panel/feed-panel.c
index 576088cac6ae0790eebbb7de8c08bbfe45049f22..327237dcb5f9e3ea79d0b3abe180aa66b9026f89 100644 (file)
--- a/extensions/feed-panel/feed-panel.c
+++ b/extensions/feed-panel/feed-panel.c
@@ -12,13 +12,8 @@
 #include "feed-panel.h"
 
 #include <midori/midori.h>
-#include <midori/sokoke.h>
 #include <time.h>
 
-#if HAVE_CONFIG_H
-    #include <config.h>
-#endif
-
 #define STOCK_FEED_PANEL "feed-panel"
 
 struct _FeedPanel

diff --git a/extensions/formhistory.c b/extensions/formhistory.c
index 04af872b0bcd92dea9429397c06af0a79cc9fcac..e5ea71f6bb18eca765947b570c1facb41e8c73e8 100644 (file)
--- a/extensions/formhistory.c
+++ b/extensions/formhistory.c
@@ -12,11 +12,9 @@
 #define MINCHARS 2
 
 #include <midori/midori.h>
+#include <glib/gstdio.h>
 
 #include "config.h"
-#include "midori/sokoke.h"
-
-#include <glib/gstdio.h>
 #if HAVE_UNISTD_H
     #include <unistd.h>
 #endif

diff --git a/extensions/shortcuts.c b/extensions/shortcuts.c
index f10ba985a7e5ea1c105ac42d4bfe16eddde73e15..85cb80856a4b61693e9a8d3fbd407f9461da4b01 100644 (file)
--- a/extensions/shortcuts.c
+++ b/extensions/shortcuts.c
@@ -11,7 +11,6 @@
 
 #include <midori/midori.h>
 
-#include <midori/sokoke.h>
 #include "config.h"
 
 static void

diff --git a/extensions/statusbar-features.c b/extensions/statusbar-features.c
index be47b9ddf8a5c1f61c51c9df7b90f14e5b208485..2f0ee996da3600ffb9e76ce57d64c3bd59806e9a 100644 (file)
--- a/extensions/statusbar-features.c
+++ b/extensions/statusbar-features.c
@@ -10,7 +10,6 @@
 */
 
 #include <midori/midori.h>
-#include <midori/sokoke.h>
 
 typedef struct
 {

diff --git a/extensions/tab-panel.c b/extensions/tab-panel.c
index 0c2291a251a5212d03d89b02f9a5a5bd15246140..ce33af079f65cc65dcf608017be15f2848255232 100644 (file)
--- a/extensions/tab-panel.c
+++ b/extensions/tab-panel.c
@@ -10,7 +10,6 @@
 */
 
 #include <midori/midori.h>
-#include <midori/sokoke.h>
 
 #define STOCK_TAB_PANEL "tab-panel"
 

diff --git a/extensions/tabs-minimized.c b/extensions/tabs-minimized.c
index f5130ee3c1a7939c1cc509264cadb5d6ff2c9445..feccfed5ded6d925ddbc0d8baad5c31ef017aa46 100644 (file)
--- a/extensions/tabs-minimized.c
+++ b/extensions/tabs-minimized.c
@@ -10,7 +10,6 @@
 */
 
 #include <midori/midori.h>
-#include <midori/sokoke.h>
 
 static void
 tabs_minimized_app_add_browser_cb (MidoriApp*       app,

diff --git a/extensions/web-cache.c b/extensions/web-cache.c
index 1980d53dfb91bcb707e8ee4601fbb159130b130b..a5ae6cdc4287962b36ae6a48bfd80d501feeeda3 100644 (file)
--- a/extensions/web-cache.c
+++ b/extensions/web-cache.c
@@ -11,12 +11,10 @@
 */
 
 #include <midori/midori.h>
-
-#include <midori/sokoke.h>
-#include "config.h"
-
 #include <glib/gstdio.h>
 #include <stdlib.h>
+
+#include "config.h"
 #if HAVE_UNISTD_H
     #include <unistd.h>
 #endif

diff --git a/midori/gtkiconentry.h b/midori/gtkiconentry.h
index 3b566c8c133272a9e1c5f42f8fadbce84792d1d3..18ec4e100cb5d5ad3237841f3e9461aa04be9f54 100644 (file)
--- a/midori/gtkiconentry.h
+++ b/midori/gtkiconentry.h
@@ -21,10 +21,6 @@
 #ifndef __GTK_ICON_ENTRY_H__
 #define __GTK_ICON_ENTRY_H__
 
-#if HAVE_CONFIG_H
-    #include <config.h>
-#endif
-
 #include <gio/gio.h>
 #include <gtk/gtk.h>
 

diff --git a/midori/main.c b/midori/main.c
index 7906c9d310b554de1e74ca653bd6c9c72425acf4..90b8e9a7049067c50f3b66953071dd8bd5ecce5a 100644 (file)
--- a/midori/main.c
+++ b/midori/main.c
@@ -10,20 +10,19 @@
  See the file COPYING for the full license text.
 */
 
-#if HAVE_CONFIG_H
-    #include <config.h>
-#endif
-
-#include "midori.h"
+#include "midori-app.h"
 #include "midori-array.h"
 #include "midori-bookmarks.h"
+#include "midori-extension.h"
 #include "midori-extensions.h"
 #include "midori-history.h"
 #include "midori-transfers.h"
+#include "midori-panel.h"
+#include "midori-platform.h"
+#include "midori-preferences.h"
 #include <midori/midori-core.h>
 
-#include "sokoke.h"
-
+#include <config.h>
 #if HAVE_UNISTD_H
     #include <unistd.h>
 #endif
@@ -32,6 +31,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib/gstdio.h>
+#include <glib/gi18n-lib.h>
 #include <webkit/webkit.h>
 #include <sqlite3.h>
 
@@ -57,12 +57,6 @@
     #include <gdk/gdkx.h>
 #endif
 
-#ifdef G_OS_WIN32
-    #define LIBPREFIX ""
-#else
-    #define LIBPREFIX "lib"
-#endif
-
 static gchar*
 build_config_filename (const gchar* filename)
 {
@@ -1805,7 +1799,7 @@ midori_clear_saved_logins_cb (void)
     g_unlink (path);
     /* Form History database, written by the extension */
     katze_assign (path, g_build_filename (sokoke_set_config_dir (NULL),
-        "extensions", LIBPREFIX "formhistory." G_MODULE_SUFFIX, "forms.db", NULL));
+        "extensions", MIDORI_MODULE_PREFIX "formhistory." G_MODULE_SUFFIX, "forms.db", NULL));
     if (sqlite3_open (path, &db) == SQLITE_OK)
     {
         sqlite3_exec (db, "DELETE FROM forms", NULL, NULL, NULL);

diff --git a/midori/midori-app.c b/midori/midori-app.c
index 646038e426be09924328f021032a95e965c52392..772c13f10bc398ea336415a6066df5c218e933ac 100644 (file)
--- a/midori/midori-app.c
+++ b/midori/midori-app.c
@@ -14,8 +14,7 @@
 #endif
 
 #include "midori-app.h"
-#include "midori-stock.h"
-#include "sokoke.h"
+#include "midori-platform.h"
 
 #include <string.h>
 #include <gtk/gtk.h>

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index fee9807502c7087a45a18c0344b4ea9c762f5cbd..dae48ad9e1688b6cf269a7a6ffdb7d020d760a45 100644 (file)
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -11,8 +11,6 @@
  See the file COPYING for the full license text.
 */
 
-#include "gtk3-compat.h"
-
 #include "midori-browser.h"
 
 #include "midori-array.h"
@@ -21,21 +19,19 @@
 #include "midori-panel.h"
 #include "midori-locationaction.h"
 #include "midori-searchaction.h"
-#include "midori-stock.h"
 #include "midori-findbar.h"
 #include "midori-transferbar.h"
 #include "midori-platform.h"
 #include "midori-core.h"
 
-#include "gtkiconentry.h"
 #include "marshal.h"
-#include "sokoke.h"
 
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtk.h>
 #include <string.h>
+
+#include <config.h>
 #ifdef HAVE_UNISTD_H
     #include <unistd.h>
 #endif
@@ -58,10 +54,6 @@
 
 #include <sqlite3.h>
 
-#if HAVE_CONFIG_H
-    #include <config.h>
-#endif
-
 struct _MidoriBrowser
 {
     #if HAVE_HILDON

diff --git a/midori/midori-extension.c b/midori/midori-extension.c
index 634462cc015310ec9ff018f853c7e7ef48aa44fd..3a5cbd1373bbb45e9d2cb32123e226f61ad8255c 100644 (file)
--- a/midori/midori-extension.c
+++ b/midori/midori-extension.c
@@ -12,12 +12,8 @@
 
 #include "midori-extension.h"
 
-#if HAVE_CONFIG_H
-    #include <config.h>
-#endif
-
 #include <katze/katze.h>
-#include "sokoke.h"
+#include "midori-platform.h"
 #include <glib/gi18n.h>
 
 G_DEFINE_TYPE (MidoriExtension, midori_extension, G_TYPE_OBJECT);
@@ -295,8 +291,8 @@ midori_extension_activate_cb (MidoriExtension* extension,
             {
                 gchar* filename = g_object_get_data (G_OBJECT (extension), "filename");
                 gchar* folder;
-                if (g_str_has_prefix (filename, "lib"))
-                    filename = &filename[strlen ("len")];
+                if (g_str_has_prefix (filename, MIDORI_MODULE_PREFIX))
+                    filename = &filename[strlen (MIDORI_MODULE_PREFIX)];
                 if (g_str_has_suffix (filename, G_MODULE_SUFFIX))
                     filename = g_strndup (filename,
                         strlen (filename) - strlen ("." G_MODULE_SUFFIX));

diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c
index ee2d0d3b5485626d8d42818b0ccdd662a6a438a5..682420c70d9d07c772954130e73938f173baaf5d 100644 (file)
--- a/midori/midori-locationaction.c
+++ b/midori/midori-locationaction.c
@@ -12,14 +12,13 @@
 
 #include "midori-locationaction.h"
 
-#include "gtkiconentry.h"
 #include "marshal.h"
-#include "sokoke.h"
 #include "midori-browser.h"
 #include "midori-searchaction.h"
 #include "midori-platform.h"
 #include <midori/midori-core.h>
 
+#include "config.h"
 #include <string.h>
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>

diff --git a/midori/midori-panel.c b/midori/midori-panel.c
index 260a12baae3bf503ac621474cb1c1840d4b273eb..c14577907073cc37df57c07134bbe0efed4c0585 100644 (file)
--- a/midori/midori-panel.c
+++ b/midori/midori-panel.c
@@ -11,17 +11,15 @@
 
 #include "midori-panel.h"
 
-#include "midori-view.h"
-
 #include "midori-browser.h"
+#include "midori-platform.h"
+#include "midori-view.h"
 
 #include "marshal.h"
-#include "sokoke.h"
 
 #include <glib/gi18n.h>
 
 #include "config.h"
-
 #ifdef HAVE_HILDON_2_2
     #include <hildon/hildon.h>
 #endif

diff --git a/midori/midori-platform.h b/midori/midori-platform.h
index 194bf57b3533e4c8e89283561331452b0230184e..e974ed8187dd9aa1b41aa8f5577012982b56e99b 100644 (file)
--- a/midori/midori-platform.h
+++ b/midori/midori-platform.h
@@ -12,7 +12,10 @@
 #ifndef __MIDORI_PLATFORM_H__
 #define __MIDORI_PLATFORM_H__ 1
 
-#include <gtk/gtk.h>
+#include "midori/midori-stock.h"
+#include "katze/gtk3-compat.h"
+#include "midori/gtkiconentry.h"
+#include "midori/sokoke.h"
 
 /* Common behavior modifiers */
 #define MIDORI_MOD_NEW_WINDOW(state) (state & GDK_SHIFT_MASK)
@@ -34,4 +37,11 @@
      && MIDORI_MOD_NEW_TAB(((GdkEventButton*)evt)->state)) \
     || (((GdkEventButton*)evt)->button == 2))
 
+#ifndef G_OS_WIN32
+    #define MIDORI_MODULE_PREFIX "lib"
+#else
+    #define MIDORI_MODULE_PREFIX ""
+#endif
+
+
 #endif /* !__MIDORI_PLATFORM_H__ */

diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c
index 1dc9f9e6f02053aff5cba33f9be53ab243da9137..6bfe1218b0bd46d426dc85ec62ffdb379337f7b9 100644 (file)
--- a/midori/midori-preferences.c
+++ b/midori/midori-preferences.c
@@ -11,12 +11,7 @@
 
 #include "midori-preferences.h"
 
-#if HAVE_CONFIG_H
-    #include <config.h>
-#endif
-
-#include "sokoke.h"
-#include "midori-stock.h"
+#include "midori-platform.h"
 
 #include <string.h>
 #include <glib/gi18n.h>
@@ -27,6 +22,7 @@
     #include <libsoup/soup-cache.h>
 #endif
 
+#include <config.h>
 #if HAVE_LIBNOTIFY
     #include <libnotify/notify.h>
 #endif

diff --git a/midori/midori-searchaction.c b/midori/midori-searchaction.c
index 6c7acbcc6949019b98861dc42aa1c908a04776f6..bb87bab81930dbcb8eeacc045291cdb2e30e451e 100644 (file)
--- a/midori/midori-searchaction.c
+++ b/midori/midori-searchaction.c
@@ -11,13 +11,11 @@
 
 #include "midori-searchaction.h"
 
-#include "gtk3-compat.h"
-#include "gtkiconentry.h"
 #include "marshal.h"
-#include "sokoke.h"
 #include "midori-platform.h"
 #include "midori-core.h"
 
+#include "config.h"
 #include <string.h>
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>

diff --git a/midori/midori-stock.h b/midori/midori-stock.h
index 991d2ecd0991d1c71e4e856ffac6d30e9f3be48b..7fe9f1270f21b21272ef75051523cf0cd77e76ab 100644 (file)
--- a/midori/midori-stock.h
+++ b/midori/midori-stock.h
@@ -12,8 +12,6 @@
 #ifndef __MIDORI_STOCK_H__
 #define __MIDORI_STOCK_H__ 1
 
-#include <gtk/gtk.h>
-
 /* Custom stock items
 
    We should distribute these

diff --git a/midori/midori-view.c b/midori/midori-view.c
index 9c537e6566345768465489f012fee28615d5db08..d3837811a679dd6de0c596280a0a4602c8045308 100644 (file)
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -10,20 +10,13 @@
  See the file COPYING for the full license text.
 */
 
-#if HAVE_CONFIG_H
-    #include <config.h>
-#endif
-
-#include "gtk3-compat.h"
 #include "midori-view.h"
-#include "midori-stock.h"
 #include "midori-browser.h"
 #include "midori-searchaction.h"
 #include "midori-platform.h"
 #include "midori-core.h"
 
 #include "marshal.h"
-#include "sokoke.h"
 
 #include <string.h>
 #include <stdlib.h>
@@ -33,10 +26,10 @@
 #include <gdk/gdkkeysyms.h>
 #include <webkit/webkit.h>
 
+#include <config.h>
 #if HAVE_UNISTD_H
     #include <unistd.h>
 #endif
-
 #ifndef G_OS_WIN32
     #include <sys/utsname.h>
 #endif

diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c
index 9ef144ca8ff76888e91444b3d2d771338f7f2add..b6794a5577e03a1a3eca8f073b52d124e2b34a5f 100644 (file)
--- a/midori/midori-websettings.c
+++ b/midori/midori-websettings.c
@@ -18,14 +18,10 @@
 #include <glib/gstdio.h>
 #include <string.h>
 
+#include <config.h>
 #if HAVE_UNISTD_H
     #include <unistd.h>
 #endif
-
-#if HAVE_CONFIG_H
-    #include <config.h>
-#endif
-
 #if defined (G_OS_UNIX)
     #include <sys/utsname.h>
 #endif

diff --git a/midori/midori.h b/midori/midori.h
index f4e7a95347a45b53328cbf34d2b44de62d6dbcc0..02af3671ce1097a14a55058d0eb0282c9c9cc05f 100644 (file)
--- a/midori/midori.h
+++ b/midori/midori.h
@@ -20,7 +20,6 @@
 #include "midori-panel.h"
 #include "midori-preferences.h"
 #include "midori-searchaction.h"
-#include "midori-stock.h"
 #include "midori-view.h"
 #include "midori-viewable.h"
 #include "midori-websettings.h"

diff --git a/midori/socket.h b/midori/socket.h
index e7f175dc79e66ef29d6ad920d2f6f734ed234f7e..45ae384eae96f50921fa4b7a7733549c087ad9a7 100644 (file)
--- a/midori/socket.h
+++ b/midori/socket.h
@@ -12,11 +12,8 @@
 #ifndef __SYLPH_SOCKET_H__
 #define __SYLPH_SOCKET_H__
 
-#if HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
 #include <glib.h>
+#include "config.h"
 #if HAVE_NETDB_H
 #  include <netdb.h>
 #endif

diff --git a/midori/sokoke.c b/midori/sokoke.c
index 71c294dadf6ebed3349ad81388b1c3d3d1807401..6387491748620704d116b9bcd5fed6b371cf3a09 100644 (file)
--- a/midori/sokoke.c
+++ b/midori/sokoke.c
@@ -13,13 +13,10 @@
 
 #include "sokoke.h"
 
-#if HAVE_CONFIG_H
-    #include <config.h>
-#endif
-
-#include "midori-stock.h"
 #include "midori-core.h"
+#include "midori-platform.h"
 
+#include <config.h>
 #if HAVE_UNISTD_H
     #include <unistd.h>
 #endif

diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c
index dca50faaf53628ff87467ebbc482ea222fd619b1..8bf7e48b871169c026691d7682db36700139b6d9 100644 (file)
--- a/panels/midori-bookmarks.c
+++ b/panels/midori-bookmarks.c
@@ -10,18 +10,14 @@
 */
 
 #include "midori-bookmarks.h"
-#include "gtk3-compat.h"
 
 #include "midori-array.h"
 #include "midori-app.h"
 #include "midori-browser.h"
-#include "midori-stock.h"
+#include "midori-platform.h"
 #include "midori-view.h"
 #include "midori-viewable.h"
 
-#include "sokoke.h"
-#include "gtkiconentry.h"
-
 #include <glib/gi18n.h>
 #include <string.h>
 

diff --git a/panels/midori-bookmarks.h b/panels/midori-bookmarks.h
index 3dc260bed22fc3432bf260210b94d3aeb8dfd1d1..1be04121d085fe92d67ce3547e90d34951ef2107 100644 (file)
--- a/panels/midori-bookmarks.h
+++ b/panels/midori-bookmarks.h
@@ -12,8 +12,6 @@
 #ifndef __MIDORI_BOOKMARKS_H__
 #define __MIDORI_BOOKMARKS_H__
 
-#include "config.h"
-
 #include <sqlite3.h>
 #include <gtk/gtk.h>
 #include <katze/katze.h>

diff --git a/panels/midori-extensions.c b/panels/midori-extensions.c
index b55b6ba20327a3aaf63eed395d94f2b0e01f4cda..ad2de72f6b07ee6f332e73b59d7d69640582dcd7 100644 (file)
--- a/panels/midori-extensions.c
+++ b/panels/midori-extensions.c
@@ -13,11 +13,10 @@
 
 #include "midori-app.h"
 #include "midori-extension.h"
-#include "midori-stock.h"
+#include "midori-platform.h"
 #include "midori-viewable.h"
 #include "midori-core.h"
 
-#include "sokoke.h"
 #include <glib/gi18n.h>
 
 struct _MidoriExtensions

diff --git a/panels/midori-history.c b/panels/midori-history.c
index 9dfa1400d3a5154d955c6a580c9c79e37e17cae0..0678df8210049a667df9ac8e89a7ae11e11588b1 100644 (file)
--- a/panels/midori-history.c
+++ b/panels/midori-history.c
@@ -10,21 +10,16 @@
 */
 
 #include "midori-history.h"
-#include "gtk3-compat.h"
 
 #include "midori-app.h"
 #include "midori-array.h"
 #include "midori-browser.h"
-#include "midori-stock.h"
+#include "midori-platform.h"
 #include "midori-view.h"
 #include "midori-viewable.h"
 
-#include "sokoke.h"
-#include "gtkiconentry.h"
-
 #include <glib/gi18n.h>
 #include <string.h>
-
 #include <gdk/gdkkeysyms.h>
 
 #define COMPLETION_DELAY 200

diff --git a/panels/midori-transfers.c b/panels/midori-transfers.c
index 3309e6e09b4b1ea0a327481f325ab554fc3c4c6c..83d070bab47f28baa8a25b42b989fdd58cea80ab 100644 (file)
--- a/panels/midori-transfers.c
+++ b/panels/midori-transfers.c
@@ -13,10 +13,9 @@
 
 #include "midori-app.h"
 #include "midori-browser.h"
-#include "midori-stock.h"
+#include "midori-platform.h"
 #include "midori-view.h"
 
-#include "sokoke.h"
 #include <glib/gi18n.h>
 
 struct _MidoriTransfers

diff --git a/tests/browser.c b/tests/browser.c
index 866292324e77a4987e91177302ab7dbc08ff8976..7cf359e94b2cc347845b66d4f53283cc6b6ca971 100644 (file)
--- a/tests/browser.c
+++ b/tests/browser.c
@@ -9,13 +9,7 @@
  See the file COPYING for the full license text.
 */
 
-#if HAVE_CONFIG_H
-    #include <config.h>
-#endif
-
 #include "midori.h"
-#include "midori-stock.h"
-#include "sokoke.h"
 
 static void
 browser_create (void)

diff --git a/tests/extensions.c b/tests/extensions.c
index b471da2a7b56dc4ceffc0dd005fb8aa014cf5b7f..911ebf09721779eeebb599684de486f654c12949 100644 (file)
--- a/tests/extensions.c
+++ b/tests/extensions.c
@@ -9,10 +9,6 @@
  See the file COPYING for the full license text.
 */
 
-#if HAVE_CONFIG_H
-    #include <config.h>
-#endif
-
 #include "midori.h"
 
 const gpointer magic = (gpointer)0xdeadbeef;

diff --git a/tests/magic-uri.c b/tests/magic-uri.c
index f9ce3b534bd6905f2c99c56e142b8527e30087a9..b9a211cce8dafdac9dbadab78468b15fd51f8e70 100644 (file)
--- a/tests/magic-uri.c
+++ b/tests/magic-uri.c
@@ -10,11 +10,6 @@
  See the file COPYING for the full license text.
 */
 
-#if HAVE_CONFIG_H
-    #include <config.h>
-#endif
-
-#include "sokoke.h"
 #include <midori/midori.h>
 
 #define SM "http://www.searchmash.com/search/"

diff --git a/tests/properties.c b/tests/properties.c
index 2504b0f9eb7980b87f1c066a11c5836d73fcc30d..cd6b61cd27a8d596cec404de1ee0f1793787a2e1 100644 (file)
--- a/tests/properties.c
+++ b/tests/properties.c
@@ -9,13 +9,8 @@
  See the file COPYING for the full license text.
 */
 
-#if HAVE_CONFIG_H
-    #include <config.h>
-#endif
-
 #include "midori.h"
 #include "midori-bookmarks.h"
-#include "sokoke.h"
 
 typedef struct
 {

diff --git a/toolbars/midori-findbar.c b/toolbars/midori-findbar.c
index a639035d943a512931fea15937363a239aa12e11..c3296809423d0b3bb57201be995550ddc38a7eeb 100644 (file)
--- a/toolbars/midori-findbar.c
+++ b/toolbars/midori-findbar.c
@@ -10,19 +10,15 @@
 */
 
 #include "midori-findbar.h"
-#include "gtk3-compat.h"
 
 #include "midori-browser.h"
-#include "gtkiconentry.h"
-#include "sokoke.h"
+#include "midori-platform.h"
 
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
-#if HAVE_CONFIG_H
-    #include "config.h"
-#endif
+#include "config.h"
 
 struct _MidoriFindbar
 {