2008-05-13 [wwp] 3.4.0cvs31

	* src/addressbook_foldersel.c
		Fix wrong check (completes 3.4.0.cvs30).

diff --git a/ChangeLog b/ChangeLog
index 0362f4ed97c18c4014d460af00b75ba2b21b70e3..6604610746a6db7939952e07935680bab2c6ac8b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-13 [wwp]       3.4.0cvs31
+
+       * src/addressbook_foldersel.c
+               Fix wrong check (completes 3.4.0.cvs30).
+
 2008-05-12 [wwp]       3.4.0cvs30
 
        * src/addressbook.c

diff --git a/PATCHSETS b/PATCHSETS
index 72685ddec0ae10f3f78c626630615405b13eb809..c53e416b9669654db0b0e8edbfd29a16b1a4b004 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3326,3 +3326,4 @@
 ( cvs diff -u -r 1.654.2.3384 -r 1.654.2.3385 configure.ac;  cvs diff -u -r 1.61.2.78 -r 1.61.2.79 src/account.c;  cvs diff -u -r 1.27.2.40 -r 1.27.2.41 src/addr_compl.c;  cvs diff -u -r 1.382.2.447 -r 1.382.2.448 src/compose.c;  cvs diff -u -r 1.14.2.49 -r 1.14.2.50 src/editaddress.c;  cvs diff -u -r 1.207.2.199 -r 1.207.2.200 src/folderview.c;  cvs diff -u -r 1.274.2.239 -r 1.274.2.240 src/mainwindow.c;  cvs diff -u -r 1.94.2.176 -r 1.94.2.177 src/messageview.c;  cvs diff -u -r 1.83.2.129 -r 1.83.2.130 src/mimeview.c;  cvs diff -u -r 1.105.2.130 -r 1.105.2.131 src/prefs_account.c;  cvs diff -u -r 1.204.2.168 -r 1.204.2.169 src/prefs_common.c;  cvs diff -u -r 1.16.2.34 -r 1.16.2.35 src/prefs_display_header.c;  cvs diff -u -r 1.59.2.67 -r 1.59.2.68 src/prefs_filtering.c;  cvs diff -u -r 1.1.2.51 -r 1.1.2.52 src/prefs_summaries.c;  cvs diff -u -r 1.12.2.62 -r 1.12.2.63 src/prefs_template.c;  cvs diff -u -r 1.30.2.49 -r 1.30.2.50 src/prefs_toolbar.c;  cvs diff -u -r 1.25.2.53 -r 1.25.2.54 src/stock_pixmap.c;  cvs diff -u -r 1.395.2.366 -r 1.395.2.367 src/summaryview.c;  cvs diff -u -r 1.68.2.45 -r 1.68.2.46 src/summaryview.h;  cvs diff -u -r 1.96.2.200 -r 1.96.2.201 src/textview.c;  cvs diff -u -r 1.43.2.97 -r 1.43.2.98 src/toolbar.c;  cvs diff -u -r 1.4.2.61 -r 1.4.2.62 src/gtk/about.c;  cvs diff -u -r 1.1.4.43 -r 1.1.4.44 src/gtk/gtksctree.c;  cvs diff -u -r 1.5.2.27 -r 1.5.2.28 src/gtk/menu.c;  cvs diff -u -r 1.12.2.45 -r 1.12.2.46 src/gtk/prefswindow.c;  cvs diff -u -r 1.9.2.19 -r 1.9.2.20 src/gtk/sslcertwindow.c;  ) > 3.4.0cvs28.patchset
 ( cvs diff -u -r 1.654.2.3385 -r 1.654.2.3386 configure.ac;  ) > 3.4.0cvs29.patchset
 ( cvs diff -u -r 1.60.2.115 -r 1.60.2.116 src/addressbook.c;  cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/addressbook_foldersel.c;  cvs diff -u -r 1.60.2.43 -r 1.60.2.44 src/filtering.c;  cvs diff -u -r 1.75.2.58 -r 1.75.2.59 src/matcher.c;  cvs diff -u -r 1.43.2.71 -r 1.43.2.72 src/prefs_matcher.c;  cvs diff -u -r 1.1.2.37 -r 1.1.2.38 src/plugins/bogofilter/bogofilter.c;  cvs diff -u -r 1.1.2.31 -r 1.1.2.32 src/plugins/bogofilter/bogofilter_gtk.c;  cvs diff -u -r 1.5.2.21 -r 1.5.2.22 src/plugins/dillo_viewer/dillo_prefs.c;  cvs diff -u -r 1.18.2.59 -r 1.18.2.60 src/plugins/spamassassin/spamassassin.c;  cvs diff -u -r 1.23.2.47 -r 1.23.2.48 src/plugins/spamassassin/spamassassin_gtk.c;  ) > 3.4.0cvs30.patchset
+( cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/addressbook_foldersel.c;  ) > 3.4.0cvs31.patchset

diff --git a/configure.ac b/configure.ac
index c880038d2b03f08eacd9ae38dbd1e0b539dfc6ab..5fef2152b756cd49018de658565a8d2c4d49252e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=30
+EXTRA_VERSION=31
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/addressbook_foldersel.c b/src/addressbook_foldersel.c
index 76b22a10da69bf7c4097cd431b5e599bb8f47d39..ef4a6fce3380ef0f0be7973696ab0897c46c3a58 100644 (file)
--- a/src/addressbook_foldersel.c
+++ b/src/addressbook_foldersel.c
@@ -388,7 +388,7 @@ gboolean addressbook_foldersel_selection( AddressIndex *addrIndex,
        corresponds to what we received */
 
        if ( path != NULL ) {
-               if ( g_utf8_collate(path, _("Any")) == 0 || strcasecmp(path, "Any") || *path == '\0' )
+               if ( g_utf8_collate(path, _("Any")) == 0 || strcasecmp(path, "Any") ==0 || *path == '\0' )
                        /* consider "Any" (both translated or untranslated forms) and ""
                           as valid addressbook roots */
                        folder_path_match.matched = TRUE;