aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Malcolm <dmalcolm@redhat.com>2005-04-05 15:28:15 +0800
committerMichael Zucci <zucchi@src.gnome.org>2005-04-05 15:28:15 +0800
commitd9211502d97552e4939b993d4491e05d532d5fc9 (patch)
tree180682a168503c88d511210fd9dfe9de3cc81c01
parentdfa81a4d18bafaf25db833e3188af2f6fb7dd0d5 (diff)
downloadgsoc2013-evolution-d9211502d97552e4939b993d4491e05d532d5fc9.tar
gsoc2013-evolution-d9211502d97552e4939b993d4491e05d532d5fc9.tar.gz
gsoc2013-evolution-d9211502d97552e4939b993d4491e05d532d5fc9.tar.bz2
gsoc2013-evolution-d9211502d97552e4939b993d4491e05d532d5fc9.tar.lz
gsoc2013-evolution-d9211502d97552e4939b993d4491e05d532d5fc9.tar.xz
gsoc2013-evolution-d9211502d97552e4939b993d4491e05d532d5fc9.tar.zst
gsoc2013-evolution-d9211502d97552e4939b993d4491e05d532d5fc9.zip
preprocessor hackery using the value of DBUS_VERSION to cope with changes
2005-03-11 David Malcolm <dmalcolm@redhat.com> * new-mail-notify.c: preprocessor hackery using the value of DBUS_VERSION to cope with changes to the semantics of dbus_message_append_args * Makefile.am: define the DBUS_VERSION in the preprocessor svn path=/trunk/; revision=29154
-rw-r--r--plugins/new-mail-notify/ChangeLog8
-rw-r--r--plugins/new-mail-notify/Makefile.am1
-rw-r--r--plugins/new-mail-notify/new-mail-notify.c4
3 files changed, 13 insertions, 0 deletions
diff --git a/plugins/new-mail-notify/ChangeLog b/plugins/new-mail-notify/ChangeLog
index ea34c56de4..45d2bcede2 100644
--- a/plugins/new-mail-notify/ChangeLog
+++ b/plugins/new-mail-notify/ChangeLog
@@ -1,3 +1,11 @@
+2005-03-11 David Malcolm <dmalcolm@redhat.com>
+
+ * new-mail-notify.c: preprocessor hackery using the value of
+ DBUS_VERSION to cope with changes to the semantics of
+ dbus_message_append_args
+
+ * Makefile.am: define the DBUS_VERSION in the preprocessor
+
2005-02-24 Björn Torkelsson <torkel@acc.umu.se>
* org-gnome-new-mail-notify.eplug.in: Added id for mail preferences.
diff --git a/plugins/new-mail-notify/Makefile.am b/plugins/new-mail-notify/Makefile.am
index bef0fd41d1..31c868b1ff 100644
--- a/plugins/new-mail-notify/Makefile.am
+++ b/plugins/new-mail-notify/Makefile.am
@@ -1,6 +1,7 @@
INCLUDES = \
-I$(top_srcdir) \
-DDBUS_API_SUBJECT_TO_CHANGE=1 \
+ -DDBUS_VERSION=$(DBUS_VERSION) \
$(EVOLUTION_MAIL_CFLAGS) \
$(NMN_CFLAGS)
diff --git a/plugins/new-mail-notify/new-mail-notify.c b/plugins/new-mail-notify/new-mail-notify.c
index e6147a1564..230a7fb8b1 100644
--- a/plugins/new-mail-notify/new-mail-notify.c
+++ b/plugins/new-mail-notify/new-mail-notify.c
@@ -113,7 +113,11 @@ send_dbus_message (const char *message_name, const char *data)
/* Appends the data as an argument to the message */
dbus_message_append_args (message,
+#if DBUS_VERSION >= 310
+ DBUS_TYPE_STRING, &data,
+#else
DBUS_TYPE_STRING, data,
+#endif
DBUS_TYPE_INVALID);
/* Sends the message */