summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@gnome.org>2006-10-02 17:34:17 +0000
committerBehdad Esfahbod <behdad@src.gnome.org>2006-10-02 17:34:17 +0000
commitb6a5bbb514ba75d70fe45d8edc0196a0179780d9 (patch)
tree21da9a7ce072479782c87b22e7cdb348a0f6810e
parentec366a479924d1ee15c3f1f877de06ed079f1ecf (diff)
downloadgtk+-b6a5bbb514ba75d70fe45d8edc0196a0179780d9.tar.gz
Move all includes before including gdkalias.h.
2006-10-02 Behdad Esfahbod <behdad@gnome.org> * gdk/x11/gdkevents-x11.c: Move all includes before including gdkalias.h.
-rw-r--r--ChangeLog5
-rw-r--r--gdk/x11/gdkevents-x11.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index a4812c3f84..0694d860e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2006-10-02 Behdad Esfahbod <behdad@gnome.org>
+ * gdk/x11/gdkevents-x11.c: Move all includes before including
+ gdkalias.h.
+
+2006-10-02 Behdad Esfahbod <behdad@gnome.org>
+
* gtk/Makefile.am: Fix typo in file name. (#358931)
2006-10-02 Matthias Clasen <mclasen@redhat.com>
diff --git a/gdk/x11/gdkevents-x11.c b/gdk/x11/gdkevents-x11.c
index 52e4aca346..58efcdd897 100644
--- a/gdk/x11/gdkevents-x11.c
+++ b/gdk/x11/gdkevents-x11.c
@@ -41,9 +41,10 @@
#include <string.h>
#include "gdkinputprivate.h"
-
+#include "gdksettings.c"
#include "gdkalias.h"
+
#ifdef HAVE_XKB
#include <X11/XKBlib.h>
#endif
@@ -2811,7 +2812,6 @@ gdk_net_wm_supports (GdkAtom property)
return gdk_x11_screen_supports_net_wm_hint (gdk_screen_get_default (), property);
}
-#include "gdksettings.c"
static void
gdk_xsettings_notify_cb (const char *name,