aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mail-notification/mail-notification.c
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2008-07-22 16:43:06 +0800
committerMilan Crha <mcrha@src.gnome.org>2008-07-22 16:43:06 +0800
commit5e4b6fcb89797b533b9a741c491ec592d2a06721 (patch)
tree012b019d2cb42765d3bcb818093e094d020f2104 /plugins/mail-notification/mail-notification.c
parent2de8babf9a0cb55073d8cd6fd7252d0df20d7946 (diff)
downloadgsoc2013-evolution-5e4b6fcb89797b533b9a741c491ec592d2a06721.tar.gz
gsoc2013-evolution-5e4b6fcb89797b533b9a741c491ec592d2a06721.tar.zst
gsoc2013-evolution-5e4b6fcb89797b533b9a741c491ec592d2a06721.zip
** Fix for bug #544022
2008-07-22 Milan Crha <mcrha@redhat.com> ** Fix for bug #544022 * configure.in: Do not redefine DBUS_VERSION define supplied by dbus itself, rather rename our define to FOUND_DBUS_VERSION. * mail/e-searching-tokenizer.c: (dump_trie): Define function only when required. (Compiler warning cleanup.) * shell/e-shell-window-commands.c: (char *authors[]): Break the escape sequence properly (compiler warning cleanup). * plugins/email-custom-header/email-custom-header.c: Compiler warning cleanup. * plugins/mail-notification/Makefile.am: * plugins/mail-notification/mail-notification.c: (send_dbus_message): Do not redefine DBUS_VERSION define, it's supplied by dbus itself. svn path=/trunk/; revision=35819
Diffstat (limited to 'plugins/mail-notification/mail-notification.c')
-rw-r--r--plugins/mail-notification/mail-notification.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/mail-notification/mail-notification.c b/plugins/mail-notification/mail-notification.c
index 3625ecf9ee..f9bfd4b8dd 100644
--- a/plugins/mail-notification/mail-notification.c
+++ b/plugins/mail-notification/mail-notification.c
@@ -136,7 +136,7 @@ send_dbus_message (const char *name, const char *data, guint new)
/* Appends the data as an argument to the message */
dbus_message_append_args (message,
-#if DBUS_VERSION >= 310
+#if FOUND_DBUS_VERSION >= 310
DBUS_TYPE_STRING, &data,
#else
DBUS_TYPE_STRING, data,
@@ -146,7 +146,7 @@ send_dbus_message (const char *name, const char *data, guint new)
if (new) {
char * display_name = em_utils_folder_name_from_uri (data);
dbus_message_append_args (message,
-#if DBUS_VERSION >= 310
+#if FOUND_DBUS_VERSION >= 310
DBUS_TYPE_STRING, &display_name, DBUS_TYPE_UINT32, &new,
#else
DBUS_TYPE_STRING, display_name, DBUS_TYPE_UINT32, new,