From e8aaf61cab5c6e2b5aaa219a5b692ecc1564f5db Mon Sep 17 00:00:00 2001
From: Nick Gasson <nick@nickg.me.uk>
Date: Sat, 5 Feb 2011 10:00:21 +0000
Subject: [PATCH] Gtk3 compatibility: fix build with
 GTK_DISABLE_SINGLE_INCLUDES

---
 src/Makefile.am      | 3 ++-
 src/display_cow.c    | 1 -
 src/display_cow.h    | 1 -
 src/floating_shape.h | 1 -
 4 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 58a6533..8748061 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,8 @@
 bin_PROGRAMS = xcowsay
 bin_SCRIPTS = xcowfortune xcowdream xcowthink
 
-GTK3_CHECK = -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED
+GTK3_CHECK = -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED \
+	-DGTK_DISABLE_SINGLE_INCLUDES
 AM_CFLAGS = $(XCOWSAY_CFLAGS) -Wall $(GTK3_CHECK)
 LDADD = $(XCOWSAY_LIBS)
 
diff --git a/src/display_cow.c b/src/display_cow.c
index edc4982..dbedcd1 100644
--- a/src/display_cow.c
+++ b/src/display_cow.c
@@ -27,7 +27,6 @@
 #include <ctype.h>
 
 #include <gtk/gtk.h>
-#include <gtk/gtkwindow.h>
 
 #ifdef WITH_DBUS
 #include <dbus/dbus-glib-bindings.h>
diff --git a/src/display_cow.h b/src/display_cow.h
index fd22bb8..092f683 100644
--- a/src/display_cow.h
+++ b/src/display_cow.h
@@ -21,7 +21,6 @@
 #include <stdbool.h>
 
 #include <gtk/gtk.h>
-#include <gtk/gtkwindow.h>
 
 #define CALCULATE_DISPLAY_TIME -1   // Work out display time from word count
 
diff --git a/src/floating_shape.h b/src/floating_shape.h
index 7ee4546..7158ce3 100644
--- a/src/floating_shape.h
+++ b/src/floating_shape.h
@@ -19,7 +19,6 @@
 #define INC_FLOATING_SHAPE_H
 
 #include <gtk/gtk.h>
-#include <gtk/gtkwindow.h>
 
 /*
  * A widget type thing which used the XShape extension.
-- 
2.39.2