aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
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
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')
-rw-r--r--plugins/email-custom-header/ChangeLog6
-rw-r--r--plugins/email-custom-header/email-custom-header.c2
-rw-r--r--plugins/mail-notification/ChangeLog8
-rw-r--r--plugins/mail-notification/Makefile.am2
-rw-r--r--plugins/mail-notification/mail-notification.c4
5 files changed, 19 insertions, 3 deletions
diff --git a/plugins/email-custom-header/ChangeLog b/plugins/email-custom-header/ChangeLog
index f40af40522..359dc8bbbb 100644
--- a/plugins/email-custom-header/ChangeLog
+++ b/plugins/email-custom-header/ChangeLog
@@ -1,3 +1,9 @@
+2008-07-22 Milan Crha <mcrha@redhat.com>
+
+ ** Part of fix for bug #544022
+
+ * email-custom-header.c: Compiler warning cleanup.
+
2008-06-25 Ashish Shrivastava <shashish@novell.com>
* email-custom-header.glade: Marked strings for
translation.
diff --git a/plugins/email-custom-header/email-custom-header.c b/plugins/email-custom-header/email-custom-header.c
index 5579e9c420..6918a9b43c 100644
--- a/plugins/email-custom-header/email-custom-header.c
+++ b/plugins/email-custom-header/email-custom-header.c
@@ -33,6 +33,7 @@
#include "mail/em-event.h"
#include "composer/e-msg-composer.h"
#include "libedataserver/e-account.h"
+#include "e-util/e-config.h"
#include "email-custom-header.h"
@@ -81,6 +82,7 @@ static void commit_changes (ConfigData *cd);
int e_plugin_lib_enable (EPluginLib *ep, int enable);
GtkWidget *e_plugin_lib_get_configure_widget (EPlugin *epl);
gboolean e_plugin_ui_init(GtkUIManager *manager, EMsgComposer *composer);
+GtkWidget *org_gnome_email_custom_header_config_option (struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data);
int
e_plugin_lib_enable (EPluginLib *ep, int enable)
diff --git a/plugins/mail-notification/ChangeLog b/plugins/mail-notification/ChangeLog
index 17dc034bee..0d1c8e60ca 100644
--- a/plugins/mail-notification/ChangeLog
+++ b/plugins/mail-notification/ChangeLog
@@ -1,3 +1,11 @@
+2008-07-22 Milan Crha <mcrha@redhat.com>
+
+ ** Part of fix for bug #544022
+
+ * Makefile.am:
+ * mail-notification.c: (send_dbus_message): Do not redefine
+ DBUS_VERSION define, it's supplied by dbus itself.
+
2008-07-16 Milan Crha <mcrha@redhat.com>
** Fix for bug #543134
diff --git a/plugins/mail-notification/Makefile.am b/plugins/mail-notification/Makefile.am
index 38b4f051f7..86fc91cc11 100644
--- a/plugins/mail-notification/Makefile.am
+++ b/plugins/mail-notification/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES = \
if ENABLE_DBUS
INCLUDES += -DDBUS_API_SUBJECT_TO_CHANGE=1 \
- -DDBUS_VERSION=$(DBUS_VERSION) \
+ -DFOUND_DBUS_VERSION=$(FOUND_DBUS_VERSION) \
$(NMN_CFLAGS)
endif
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,