evolution r35819 - in trunk: . mail plugins/email-custom-header plugins/mail-notification shell

[mcrha svn gnome org]

Author: mcrha
Date: Tue Jul 22 08:43:06 2008
New Revision: 35819
URL: http://svn.gnome.org/viewvc/evolution?rev=35819&view=rev

Log:
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.



Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/mail/ChangeLog
   trunk/mail/e-searching-tokenizer.c
   trunk/plugins/email-custom-header/ChangeLog
   trunk/plugins/email-custom-header/email-custom-header.c
   trunk/plugins/mail-notification/ChangeLog
   trunk/plugins/mail-notification/Makefile.am
   trunk/plugins/mail-notification/mail-notification.c
   trunk/shell/ChangeLog
   trunk/shell/e-shell-window-commands.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Jul 22 08:43:06 2008
@@ -1824,8 +1824,8 @@
 	# Get the version of the DBus API, so we can hack around API changes until the API stabilises:
 	# multiply by 1000 to convert decimal to integer; so e.g. 0.31 become 310
 	# since preprocessor values must be integral
-	DBUS_VERSION="`$PKG_CONFIG --modversion dbus-1 | $AWK '{print 1000 * $1}'`"
-	AC_SUBST(DBUS_VERSION)
+	FOUND_DBUS_VERSION="`$PKG_CONFIG --modversion dbus-1 | $AWK '{print 1000 * $1}'`"
+	AC_SUBST(FOUND_DBUS_VERSION)
 	AC_DEFINE(HAVE_DBUS,1,[Define if you have DBUS support])
 	AC_SUBST(HAVE_DBUS)
 	AM_CONDITIONAL(ENABLE_DBUS, true)
@@ -2081,6 +2081,6 @@
 	SSL support:         $msg_ssl
 	SMIME support:       $msg_smime
 	Plugins:	     $msg_plugins
-	DBus API version:    $DBUS_VERSION
+	DBus API version:    $FOUND_DBUS_VERSION
 	User documentation:  $with_help
 "

Modified: trunk/mail/e-searching-tokenizer.c
==============================================================================
--- trunk/mail/e-searching-tokenizer.c	(original)
+++ trunk/mail/e-searching-tokenizer.c	Tue Jul 22 08:43:06 2008
@@ -224,6 +224,8 @@
 	EMemChunk *match_chunks;
 };
 
+/* will be enabled only if debug is enabled */
+#if d(1) -1 != -1
 static void
 dump_trie(struct _state *s, int d)
 {
@@ -242,6 +244,7 @@
 		m = m->next;
 	}
 }
+#endif
 
 /* This builds an Aho-Corasick search trie for a set of utf8 words */
 /* See

Modified: trunk/plugins/email-custom-header/email-custom-header.c
==============================================================================
--- trunk/plugins/email-custom-header/email-custom-header.c	(original)
+++ trunk/plugins/email-custom-header/email-custom-header.c	Tue Jul 22 08:43:06 2008
@@ -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 @@
 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)

Modified: trunk/plugins/mail-notification/Makefile.am
==============================================================================
--- trunk/plugins/mail-notification/Makefile.am	(original)
+++ trunk/plugins/mail-notification/Makefile.am	Tue Jul 22 08:43:06 2008
@@ -5,7 +5,7 @@
 
 if ENABLE_DBUS
 INCLUDES += 	-DDBUS_API_SUBJECT_TO_CHANGE=1		\
-		-DDBUS_VERSION=$(DBUS_VERSION)          \
+		-DFOUND_DBUS_VERSION=$(FOUND_DBUS_VERSION)          \
 		$(NMN_CFLAGS)
 endif
 

Modified: trunk/plugins/mail-notification/mail-notification.c
==============================================================================
--- trunk/plugins/mail-notification/mail-notification.c	(original)
+++ trunk/plugins/mail-notification/mail-notification.c	Tue Jul 22 08:43:06 2008
@@ -136,7 +136,7 @@
 
 	/* 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 @@
 	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,

Modified: trunk/shell/e-shell-window-commands.c
==============================================================================
--- trunk/shell/e-shell-window-commands.c	(original)
+++ trunk/shell/e-shell-window-commands.c	Tue Jul 22 08:43:06 2008
@@ -272,7 +272,7 @@
 	"Daniel van Eeden",
 	"Daniel Veillard",
 	"Daniel Yacob",
-	"Danilo \xC5\xA0egan",
+	"Danilo \xC5\xA0" "egan",
 	"Darin Adler",
 	"Dave Benson",
 	"Dave Camp",