From c03bf9a20d3f30c68d7d12f32c5d2230925af3d2 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Thu, 24 Sep 2009 13:40:46 -0400
Subject: Work around build break caused by gnome-pilot headers.

---
 addressbook/conduit/address-conduit.c         | 2 ++
 calendar/conduits/calendar/calendar-conduit.c | 2 ++
 calendar/conduits/memo/memo-conduit.c         | 2 ++
 calendar/conduits/todo/todo-conduit.c         | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/addressbook/conduit/address-conduit.c b/addressbook/conduit/address-conduit.c
index 79c82cdb77..b9a5731400 100644
--- a/addressbook/conduit/address-conduit.c
+++ b/addressbook/conduit/address-conduit.c
@@ -36,6 +36,8 @@
 typedef GType GtkType;
 #endif
 
+#undef GTK_DISABLE_SINGLE_INCLUDES
+
 #include <glib/gi18n.h>
 #include <libxml/parser.h>
 #include <pi-source.h>
diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c
index cd91981799..b5897396ca 100644
--- a/calendar/conduits/calendar/calendar-conduit.c
+++ b/calendar/conduits/calendar/calendar-conduit.c
@@ -34,6 +34,8 @@
 typedef GType GtkType;
 #endif
 
+#undef GTK_DISABLE_SINGLE_INCLUDES
+
 #include <glib/gi18n.h>
 #include <libecal/e-cal-types.h>
 #include <libecal/e-cal.h>
diff --git a/calendar/conduits/memo/memo-conduit.c b/calendar/conduits/memo/memo-conduit.c
index a7bc8952a1..af432f5809 100644
--- a/calendar/conduits/memo/memo-conduit.c
+++ b/calendar/conduits/memo/memo-conduit.c
@@ -36,6 +36,8 @@
 typedef GType GtkType;
 #endif
 
+#undef GTK_DISABLE_SINGLE_INCLUDES
+
 #include <glib/gi18n.h>
 #include <libecal/e-cal-types.h>
 #include <libecal/e-cal.h>
diff --git a/calendar/conduits/todo/todo-conduit.c b/calendar/conduits/todo/todo-conduit.c
index 6868b4681a..f4bc98ce5b 100644
--- a/calendar/conduits/todo/todo-conduit.c
+++ b/calendar/conduits/todo/todo-conduit.c
@@ -36,6 +36,8 @@
 typedef GType GtkType;
 #endif
 
+#undef GTK_DISABLE_SINGLE_INCLUDES
+
 #include <glib/gi18n.h>
 #include <libecal/e-cal-types.h>
 #include <libecal/e-cal.h>
-- 
cgit v1.2.3