From 672adf12a0923437e90d08ab7925bd9329fcce0d Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Sun, 16 Aug 2009 11:25:08 -0400
Subject: Fix compiler warnings and deprecated GTK+ API usage.

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

(limited to 'calendar/conduits')

diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c
index 0052c13f30..cd91981799 100644
--- a/calendar/conduits/calendar/calendar-conduit.c
+++ b/calendar/conduits/calendar/calendar-conduit.c
@@ -27,6 +27,13 @@
 
 #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
+
 #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 ac28e0465c..a7bc8952a1 100644
--- a/calendar/conduits/memo/memo-conduit.c
+++ b/calendar/conduits/memo/memo-conduit.c
@@ -29,6 +29,13 @@
 
 #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
+
 #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 89e012bfd7..6868b4681a 100644
--- a/calendar/conduits/todo/todo-conduit.c
+++ b/calendar/conduits/todo/todo-conduit.c
@@ -29,6 +29,13 @@
 
 #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
+
 #include <glib/gi18n.h>
 #include <libecal/e-cal-types.h>
 #include <libecal/e-cal.h>
-- 
cgit v1.2.3