From 656178049b4d1b73d4997aa983b778d4eb4054ae Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Thu, 1 Oct 2009 16:24:49 -0400
Subject: Build with GTK_DISABLE_DEPRECATED and fix resulting breakage.

---
 calendar/conduits/calendar/calendar-conduit.c | 7 +------
 calendar/conduits/memo/memo-conduit.c         | 7 +------
 calendar/conduits/todo/todo-conduit.c         | 7 +------
 3 files changed, 3 insertions(+), 18 deletions(-)

(limited to 'calendar/conduits')

diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c
index b5897396ca..624615e49a 100644
--- a/calendar/conduits/calendar/calendar-conduit.c
+++ b/calendar/conduits/calendar/calendar-conduit.c
@@ -28,12 +28,7 @@
 #define G_LOG_DOMAIN "ecalconduit"
 
 /* Work around deprecated API usage in GnomePilot. */
-#ifdef GTK_DISABLE_DEPRECATED
-#include <glib-object.h>
-#define GTK_CHECK_CAST G_TYPE_CHECK_INSTANCE_CAST
-typedef GType GtkType;
-#endif
-
+#undef GTK_DISABLE_DEPRECATED
 #undef GTK_DISABLE_SINGLE_INCLUDES
 
 #include <glib/gi18n.h>
diff --git a/calendar/conduits/memo/memo-conduit.c b/calendar/conduits/memo/memo-conduit.c
index af432f5809..2a1b190423 100644
--- a/calendar/conduits/memo/memo-conduit.c
+++ b/calendar/conduits/memo/memo-conduit.c
@@ -30,12 +30,7 @@
 #define G_LOG_DOMAIN "ememoconduit"
 
 /* Work around deprecated API usage in GnomePilot. */
-#ifdef GTK_DISABLE_DEPRECATED
-#include <glib-object.h>
-#define GTK_CHECK_CAST G_TYPE_CHECK_INSTANCE_CAST
-typedef GType GtkType;
-#endif
-
+#undef GTK_DISABLE_DEPRECATED
 #undef GTK_DISABLE_SINGLE_INCLUDES
 
 #include <glib/gi18n.h>
diff --git a/calendar/conduits/todo/todo-conduit.c b/calendar/conduits/todo/todo-conduit.c
index f4bc98ce5b..a625cc7c39 100644
--- a/calendar/conduits/todo/todo-conduit.c
+++ b/calendar/conduits/todo/todo-conduit.c
@@ -30,12 +30,7 @@
 #define G_LOG_DOMAIN "etodoconduit"
 
 /* Work around deprecated API usage in GnomePilot. */
-#ifdef GTK_DISABLE_DEPRECATED
-#include <glib-object.h>
-#define GTK_CHECK_CAST G_TYPE_CHECK_INSTANCE_CAST
-typedef GType GtkType;
-#endif
-
+#undef GTK_DISABLE_DEPRECATED
 #undef GTK_DISABLE_SINGLE_INCLUDES
 
 #include <glib/gi18n.h>
-- 
cgit