aboutsummaryrefslogtreecommitdiffstats
path: root/mail
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 /mail
parent2de8babf9a0cb55073d8cd6fd7252d0df20d7946 (diff)
downloadgsoc2013-evolution-5e4b6fcb89797b533b9a741c491ec592d2a06721.tar
gsoc2013-evolution-5e4b6fcb89797b533b9a741c491ec592d2a06721.tar.gz
gsoc2013-evolution-5e4b6fcb89797b533b9a741c491ec592d2a06721.tar.bz2
gsoc2013-evolution-5e4b6fcb89797b533b9a741c491ec592d2a06721.tar.lz
gsoc2013-evolution-5e4b6fcb89797b533b9a741c491ec592d2a06721.tar.xz
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 'mail')
-rw-r--r--mail/ChangeLog7
-rw-r--r--mail/e-searching-tokenizer.c3
2 files changed, 10 insertions, 0 deletions
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