Updating branch refs/heads/master to 8fff7d8fd3bdb1f595555b809b7da1f0934ce40d (commit) from 2bc0490bf00eef6bdbdabe90f5f5aa4010f3f9d3 (commit)
commit 8fff7d8fd3bdb1f595555b809b7da1f0934ce40d Author: Christian Dywan <christ...@twotoasts.de> Date: Mon Oct 31 22:10:39 2011 +0100 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 | 4 +--- extensions/addons.c | 2 -- extensions/cookie-manager/cookie-manager-page.c | 3 --- extensions/copy-tabs.c | 1 - extensions/feed-panel/feed-panel.c | 5 ----- extensions/formhistory.c | 4 +--- extensions/shortcuts.c | 1 - extensions/statusbar-features.c | 1 - extensions/tab-panel.c | 1 - extensions/tabs-minimized.c | 1 - extensions/web-cache.c | 6 ++---- midori/gtkiconentry.h | 4 ---- midori/main.c | 22 ++++++++-------------- midori/midori-app.c | 3 +-- midori/midori-browser.c | 12 ++---------- midori/midori-extension.c | 10 +++------- midori/midori-locationaction.c | 3 +-- midori/midori-panel.c | 6 ++---- midori/midori-platform.h | 12 +++++++++++- midori/midori-preferences.c | 8 ++------ midori/midori-searchaction.c | 4 +--- midori/midori-stock.h | 2 -- midori/midori-view.c | 9 +-------- midori/midori-websettings.c | 6 +----- midori/midori.h | 1 - midori/socket.h | 5 +---- midori/sokoke.c | 7 ++----- panels/midori-bookmarks.c | 6 +----- panels/midori-bookmarks.h | 2 -- panels/midori-extensions.c | 3 +-- panels/midori-history.c | 7 +------ panels/midori-transfers.c | 3 +-- tests/browser.c | 6 ------ tests/extensions.c | 4 ---- tests/magic-uri.c | 5 ----- tests/properties.c | 5 ----- toolbars/midori-findbar.c | 8 ++------ 37 files changed, 46 insertions(+), 146 deletions(-) diff --git a/extensions/adblock.c b/extensions/adblock.c index 803c197..a72c5da 100644 --- 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 2f82099..7db7ab5 100644 --- 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 70947dd..16710dc 100644 --- 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 60fe2db..55c4c31 100644 --- 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 576088c..327237d 100644 --- 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 04af872..e5ea71f 100644 --- 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 f10ba98..85cb808 100644 --- 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 be47b9d..2f0ee99 100644 --- 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 0c2291a..ce33af0 100644 --- 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 f5130ee..feccfed 100644 --- 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 1980d53..a5ae6cd 100644 --- 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 3b566c8..18ec4e1 100644 --- 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 7906c9d..90b8e9a 100644 --- 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 646038e..772c13f 100644 --- 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 fee9807..dae48ad 100644 --- 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 634462c..3a5cbd1 100644 --- 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 ee2d0d3..682420c 100644 --- 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 260a12b..c145779 100644 --- 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 194bf57..e974ed8 100644 --- 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 1dc9f9e..6bfe121 100644 --- 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 6c7acbc..bb87bab 100644 --- 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 991d2ec..7fe9f12 100644 --- 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 9c537e6..d383781 100644 --- 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 9ef144c..b6794a5 100644 --- 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 f4e7a95..02af367 100644 --- 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 e7f175d..45ae384 100644 --- 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 71c294d..6387491 100644 --- 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 dca50fa..8bf7e48 100644 --- 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 3dc260b..1be0412 100644 --- 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 b55b6ba..ad2de72 100644 --- 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 9dfa140..0678df8 100644 --- 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 3309e6e..83d070b 100644 --- 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 8662923..7cf359e 100644 --- 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 b471da2..911ebf0 100644 --- 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 f9ce3b5..b9a211c 100644 --- 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 2504b0f..cd6b61c 100644 --- 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 a639035..c329680 100644 --- 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 { _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits