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

Also introduce #define MIDORI_MODULE_PREFIX.

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

extensions/adblock.c

@@ -11,11 +11,9 @@
 */
 
 #include <midori/midori.h>
-
-#include <midori/sokoke.h>
-#include "config.h"
-
 #include <glib/gstdio.h>
+
+#include "config.h"
 #if HAVE_UNISTD_H
     #include <unistd.h>
 #endif

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

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>
 

extensions/copy-tabs.c

@@ -10,7 +10,6 @@
 */
 
 #include <midori/midori.h>
-#include <midori/sokoke.h>
 
 static void
 copy_tabs_apply_cb (GtkWidget*     menuitem,

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

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

extensions/shortcuts.c

@@ -11,7 +11,6 @@
 
 #include <midori/midori.h>
 
-#include <midori/sokoke.h>
 #include "config.h"
 
 static void

extensions/statusbar-features.c

@@ -10,7 +10,6 @@
 */
 
 #include <midori/midori.h>
-#include <midori/sokoke.h>
 
 typedef struct
 {

extensions/tab-panel.c

@@ -10,7 +10,6 @@
 */
 
 #include <midori/midori.h>
-#include <midori/sokoke.h>
 
 #define STOCK_TAB_PANEL "tab-panel"
 

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,

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

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>
 

midori/main.c

@@ -10,20 +10,19 @@
  See the file COPYING for the full license text.
 */
 
-#if HAVE_CONFIG_H
+#include "midori-app.h"
-    #include <config.h>
-#endif
-
-#include "midori.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);

midori/midori-app.c

@@ -14,8 +14,7 @@
 #endif
 
 #include "midori-app.h"
-#include "midori-stock.h"
+#include "midori-platform.h"
-#include "sokoke.h"
 
 #include <string.h>
 #include <gtk/gtk.h>

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

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"))
+                if (g_str_has_prefix (filename, MIDORI_MODULE_PREFIX))
-                    filename = &filename[strlen ("len")];
+                    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));

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>

midori/midori-panel.c

@@ -11,17 +11,15 @@
 
 #include "midori-panel.h"
 
+#include "midori-browser.h"
+#include "midori-platform.h"
 #include "midori-view.h"
 
-#include "midori-browser.h"
-
 #include "marshal.h"
-#include "sokoke.h"
 
 #include <glib/gi18n.h>
 
 #include "config.h"
-
 #ifdef HAVE_HILDON_2_2
     #include <hildon/hildon.h>
 #endif

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__ */

midori/midori-preferences.c

@@ -11,12 +11,7 @@
 
 #include "midori-preferences.h"
 
-#if HAVE_CONFIG_H
+#include "midori-platform.h"
-    #include <config.h>
-#endif
-
-#include "sokoke.h"
-#include "midori-stock.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

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>

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

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

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

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"

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

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

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>
 

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>

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

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

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

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)

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;

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/"

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
 {

toolbars/midori-findbar.c

@@ -10,19 +10,15 @@
 */
 
 #include "midori-findbar.h"
-#include "gtk3-compat.h"
 
 #include "midori-browser.h"
-#include "gtkiconentry.h"
+#include "midori-platform.h"
-#include "sokoke.h"
 
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
-#if HAVE_CONFIG_H
+#include "config.h"
-    #include "config.h"
-#endif
 
 struct _MidoriFindbar
 {