diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.in | 6 | ||||
| -rw-r--r-- | mail/ChangeLog | 7 | ||||
| -rw-r--r-- | mail/e-searching-tokenizer.c | 3 | ||||
| -rw-r--r-- | plugins/email-custom-header/ChangeLog | 6 | ||||
| -rw-r--r-- | plugins/email-custom-header/email-custom-header.c | 2 | ||||
| -rw-r--r-- | plugins/mail-notification/ChangeLog | 8 | ||||
| -rw-r--r-- | plugins/mail-notification/Makefile.am | 2 | ||||
| -rw-r--r-- | plugins/mail-notification/mail-notification.c | 4 | ||||
| -rw-r--r-- | shell/ChangeLog | 7 | ||||
| -rw-r--r-- | shell/e-shell-window-commands.c | 2 |
11 files changed, 47 insertions, 7 deletions
@@ -1,3 +1,10 @@ +2008-07-22 Milan Crha <mcrha@redhat.com> + + ** Part of fix for bug #544022 + + * configure.in: Do not redefine DBUS_VERSION define supplied + by dbus itself, rather rename our define to FOUND_DBUS_VERSION. + 2008-07-21 Johnny Jacob <jjohnny@novell.com> * data/hicolor_actions_24x24_query-free-busy.png: Moved to diff --git a/configure.in b/configure.in index fbe677ec9c..37ea0e5704 100644 --- a/configure.in +++ b/configure.in @@ -1824,8 +1824,8 @@ if ${PKG_CONFIG} --exists dbus-glib-1 ; then # 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 @@ echo "\ 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 " diff --git a/mail/ChangeLog b/mail/ChangeLog index a0167e63fa..d355a445f4 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,10 @@ +2008-07-22 Milan Crha <mcrha@redhat.com> + + ** Part of fix for bug #544022 + + * e-searching-tokenizer.c: (dump_trie): + Define function only when required. (Compiler warning cleanup.) + 2008-07-21 Tor Lillqvist <tml@novell.com> * em-migrate.c: Rearrange G_OS_WIN32 ifdefs a bit, as we need to diff --git a/mail/e-searching-tokenizer.c b/mail/e-searching-tokenizer.c index 2880a9461a..1b603acd90 100644 --- a/mail/e-searching-tokenizer.c +++ b/mail/e-searching-tokenizer.c @@ -224,6 +224,8 @@ struct _trie { 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 @@ dump_trie(struct _state *s, int d) m = m->next; } } +#endif /* This builds an Aho-Corasick search trie for a set of utf8 words */ /* See 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, diff --git a/shell/ChangeLog b/shell/ChangeLog index cd5901f2bf..df4ac19595 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,10 @@ +2008-07-22 Milan Crha <mcrha@redhat.com> + + ** Part of fix for bug #544022 + + * e-shell-window-commands.c: (char *authors[]): + Break the escape sequence properly (compiler warning cleanup). + 2008-07-20 Andre Klapper <a9016009@gmx.de> ** Fixes bug #542828 diff --git a/shell/e-shell-window-commands.c b/shell/e-shell-window-commands.c index 666be38e50..a9f46205bb 100644 --- a/shell/e-shell-window-commands.c +++ b/shell/e-shell-window-commands.c @@ -272,7 +272,7 @@ static const char *authors[] = { "Daniel van Eeden", "Daniel Veillard", "Daniel Yacob", - "Danilo \xC5\xA0egan", + "Danilo \xC5\xA0" "egan", "Darin Adler", "Dave Benson", "Dave Camp", |