Updating branch refs/heads/master
to cd377bb7a85c8199627ba6f377e88efa3291b314 (commit)
from 93ef102c231997fc4941ddf6b8e160bafa53c9ba (commit)
commit cd377bb7a85c8199627ba6f377e88efa3291b314
Author: Johannes Sasongko <[email protected]>
Date: Thu Jul 12 00:22:13 2012 +0200
Include config.h before HAVE_GRANITE
Fixes: https://bugs.launchpad.net/midori/+bug/980355
midori/midori-browser.c | 3 ++-
midori/midori-view.c | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index adf81ca..369405e 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -32,11 +32,12 @@
#include <gdk/gdkkeysyms.h>
#include <string.h>
+#include <config.h>
+
#ifdef HAVE_GRANITE
#include <granite.h>
#endif
-#include <config.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
diff --git a/midori/midori-view.c b/midori/midori-view.c
index 05e646e..50447ce 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -20,6 +20,8 @@
#include "marshal.h"
+#include <config.h>
+
#ifdef HAVE_GRANITE
#include <granite.h>
#endif
@@ -32,7 +34,6 @@
#include <gdk/gdkkeysyms.h>
#include <webkit/webkit.h>
-#include <config.h>
#if HAVE_UNISTD_H
#include <unistd.h>
#endif
_______________________________________________
Xfce4-commits mailing list
[email protected]
https://mail.xfce.org/mailman/listinfo/xfce4-commits
