summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2011-10-13 02:53:09 -0700
committerBenjamin Otte <otte@redhat.com>2011-10-14 00:31:16 -0700
commite5c9f6c2063aeb419421b9fde76fb2075057a72e (patch)
tree9b477419643904b02f7f92644cd85724c50ceb73
parentd771bf5f0974585bde7d9a484daf7be477d685cc (diff)
window: Fix includes
We want to compile fine with GTK_DISABLE_SINGLE_INCLUDES
-rw-r--r--src/gnome/gnome-window.c5
-rw-r--r--src/gnome/gnome-window.h8
2 files changed, 7 insertions, 6 deletions
diff --git a/src/gnome/gnome-window.c b/src/gnome/gnome-window.c
index 69140e5..80bc126 100644
--- a/src/gnome/gnome-window.c
+++ b/src/gnome/gnome-window.c
@@ -21,8 +21,10 @@
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
-#include <glib/gi18n.h>
+#include "gnome-window.h"
+
+#include <glib/gi18n.h>
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
#include <string.h>
@@ -31,7 +33,6 @@
#include "gnome-board.h"
#include "gnome-cellrenderercolor.h"
-#include "gnome-window.h"
#include "gnome-keyboard-configuration.h"
#include "gnome-highscore.h"
#include "gnome-marshal.h"
diff --git a/src/gnome/gnome-window.h b/src/gnome/gnome-window.h
index ec546dc..97b252e 100644
--- a/src/gnome/gnome-window.h
+++ b/src/gnome/gnome-window.h
@@ -21,10 +21,7 @@
#ifndef __GAME_GNOME_WINDOW_H__
#define __GAME_GNOME_WINDOW_H__
-#include <gtk/gtkwindow.h>
-
-typedef struct _GameGnomeWindow GameGnomeWindow;
-typedef struct _GameGnomeWindowClass GameGnomeWindowClass;
+#include <gtk/gtk.h>
#include <libgame/game-game.h>
#include <libgame/game-recorder.h>
@@ -40,6 +37,9 @@ G_BEGIN_DECLS
#define GAME_IS_GNOME_WINDOW_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GAME_TYPE_GNOME_WINDOW))
#define GAME_GNOME_WINDOW_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GAME_TYPE_GNOME_WINDOW, GameGnomeWindowClass))
+typedef struct _GameGnomeWindow GameGnomeWindow;
+typedef struct _GameGnomeWindowClass GameGnomeWindowClass;
+
struct _GameGnomeWindow {
GtkWindow parent;