diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-07-15 00:41:54 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-07-15 01:38:12 +0800 |
| commit | 6d9e836a6fa0bb501f9fad4306373092bd758d29 (patch) | |
| tree | 7843b42c00bc45175bbe8e80059cf2643aa1ee89 /plugins/mail-notification | |
| parent | 374bd42f69aca2e132fd854c9619f3d7491f1f96 (diff) | |
| parent | e5fe0c9a3b74bf4910d768d65bb59a53c3792001 (diff) | |
| download | gsoc2013-evolution-6d9e836a6fa0bb501f9fad4306373092bd758d29.tar gsoc2013-evolution-6d9e836a6fa0bb501f9fad4306373092bd758d29.tar.gz gsoc2013-evolution-6d9e836a6fa0bb501f9fad4306373092bd758d29.tar.bz2 gsoc2013-evolution-6d9e836a6fa0bb501f9fad4306373092bd758d29.tar.lz gsoc2013-evolution-6d9e836a6fa0bb501f9fad4306373092bd758d29.tar.xz gsoc2013-evolution-6d9e836a6fa0bb501f9fad4306373092bd758d29.tar.zst gsoc2013-evolution-6d9e836a6fa0bb501f9fad4306373092bd758d29.zip | |
Merge branch 'master' into kill-bonobo
Diffstat (limited to 'plugins/mail-notification')
| -rw-r--r-- | plugins/mail-notification/Makefile.am | 11 | ||||
| -rw-r--r-- | plugins/mail-notification/mail-notification.c | 13 |
2 files changed, 6 insertions, 18 deletions
diff --git a/plugins/mail-notification/Makefile.am b/plugins/mail-notification/Makefile.am index 674c8cd486..f409f8831a 100644 --- a/plugins/mail-notification/Makefile.am +++ b/plugins/mail-notification/Makefile.am @@ -9,12 +9,11 @@ AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ $(EVOLUTION_MAIL_CFLAGS) \ - $(LIBNOTIFY_CFLAGS) + $(LIBNOTIFY_CFLAGS) -if ENABLE_DBUS +if DBUS_SUPPORT AM_CPPFLAGS += -DDBUS_API_SUBJECT_TO_CHANGE=1 \ - -DFOUND_DBUS_VERSION=$(FOUND_DBUS_VERSION) \ - $(NMN_CFLAGS) + $(DBUS_GLIB_CFLAGS) endif @EVO_PLUGIN_RULE@ @@ -31,8 +30,8 @@ liborg_gnome_mail_notification_la_LIBADD = \ $(top_builddir)/mail/libevolution-mail.la \ $(GNOME_PLATFORM_LIBS) -if ENABLE_DBUS -liborg_gnome_mail_notification_la_LIBADD += $(NMN_LIBS) +if DBUS_SUPPORT +liborg_gnome_mail_notification_la_LIBADD += $(DBUS_GLIB_LIBS) endif schemadir = $(GCONF_SCHEMA_FILE_DIR) diff --git a/plugins/mail-notification/mail-notification.c b/plugins/mail-notification/mail-notification.c index 46b434b65f..b0a0aa279e 100644 --- a/plugins/mail-notification/mail-notification.c +++ b/plugins/mail-notification/mail-notification.c @@ -136,24 +136,13 @@ send_dbus_message (const gchar *name, const gchar *data, guint new) return; /* Appends the data as an argument to the message */ - dbus_message_append_args (message, -#if FOUND_DBUS_VERSION >= 310 - DBUS_TYPE_STRING, &data, -#else - DBUS_TYPE_STRING, data, -#endif - DBUS_TYPE_INVALID); + dbus_message_append_args (message, DBUS_TYPE_STRING, &data, DBUS_TYPE_INVALID); if (new) { gchar * display_name = em_utils_folder_name_from_uri (data); dbus_message_append_args (message, -#if FOUND_DBUS_VERSION >= 310 DBUS_TYPE_STRING, &display_name, DBUS_TYPE_UINT32, &new, -#else - DBUS_TYPE_STRING, display_name, DBUS_TYPE_UINT32, new, -#endif DBUS_TYPE_INVALID); - } /* Sends the message */ |