aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/conduits
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2009-10-02 04:24:49 +0800
committerMatthew Barnes <mbarnes@redhat.com>2009-10-02 04:24:49 +0800
commit656178049b4d1b73d4997aa983b778d4eb4054ae (patch)
treea5ad9c59d4fd231f6b6cb2e77eca139eaac8fe8d /calendar/conduits
parentf62728b55e201ea92e682e07b3253ce4fb42d5af (diff)
downloadgsoc2013-evolution-656178049b4d1b73d4997aa983b778d4eb4054ae.tar.gz
gsoc2013-evolution-656178049b4d1b73d4997aa983b778d4eb4054ae.tar.zst
gsoc2013-evolution-656178049b4d1b73d4997aa983b778d4eb4054ae.zip
Build with GTK_DISABLE_DEPRECATED and fix resulting breakage.
Diffstat (limited to 'calendar/conduits')
-rw-r--r--calendar/conduits/calendar/calendar-conduit.c7
-rw-r--r--calendar/conduits/memo/memo-conduit.c7
-rw-r--r--calendar/conduits/todo/todo-conduit.c7
3 files changed, 3 insertions, 18 deletions
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>