2007-07-19 [colin] 2.10.0cvs43

	* src/wizard.c
		Solve Mail/Mailbox name when specifying
		full /path/to/Mail.

diff --git a/ChangeLog b/ChangeLog
index 54973fcbae1b55be726f60c4425e1b8e4ec5569d..17a65649c753591a241d2f09520c1e80de1c8e5b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-19 [colin]     2.10.0cvs43
+
+       * src/wizard.c
+               Solve Mail/Mailbox name when specifying
+               full /path/to/Mail.
+

 2007-07-18 [colin]     2.10.0cvs42
 
        * src/inc.c
 2007-07-18 [colin]     2.10.0cvs42
 
        * src/inc.c

diff --git a/PATCHSETS b/PATCHSETS
index fdfece7a31f0e3701cd803801d4b50e0f11cc752..be99880c9bc37732470a18fd9ce1adc20de7866b 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2696,3 +2696,4 @@
 ( cvs diff -u -r 1.60.2.34 -r 1.60.2.35 src/filtering.c;  cvs diff -u -r 1.213.2.149 -r 1.213.2.150 src/folder.c;  ) > 2.10.0cvs40.patchset
 ( cvs diff -u -r 1.149.2.75 -r 1.149.2.76 src/inc.c;  cvs diff -u -r 1.5.2.17 -r 1.5.2.18 src/statusbar.c;  ) > 2.10.0cvs41.patchset
 ( cvs diff -u -r 1.149.2.76 -r 1.149.2.77 src/inc.c;  cvs diff -u -r 1.654.2.2751 -r 1.654.2.2752 configure.ac;  ) > 2.10.0cvs42.patchset
 ( cvs diff -u -r 1.60.2.34 -r 1.60.2.35 src/filtering.c;  cvs diff -u -r 1.213.2.149 -r 1.213.2.150 src/folder.c;  ) > 2.10.0cvs40.patchset
 ( cvs diff -u -r 1.149.2.75 -r 1.149.2.76 src/inc.c;  cvs diff -u -r 1.5.2.17 -r 1.5.2.18 src/statusbar.c;  ) > 2.10.0cvs41.patchset
 ( cvs diff -u -r 1.149.2.76 -r 1.149.2.77 src/inc.c;  cvs diff -u -r 1.654.2.2751 -r 1.654.2.2752 configure.ac;  ) > 2.10.0cvs42.patchset

+( cvs diff -u -r 1.1.2.55 -r 1.1.2.56 src/wizard.c;  ) > 2.10.0cvs43.patchset

diff --git a/configure.ac b/configure.ac
index 1306694972c471f7bad1f7361fe45987aeff1239..9a20a3a89b15f0bf3134afab6cc1bdca495d66aa 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=10
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=42
+EXTRA_VERSION=43

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/wizard.c b/src/wizard.c
index af10690d3bb94a58f277cf4a6dd8a4ce9ece6a45..07bdd1aa2471b36b812c32cffc3c6ba0f3a7a91b 100644 (file)
--- a/src/wizard.c
+++ b/src/wizard.c
@@ -688,7 +688,8 @@ static gboolean wizard_write_config(WizardWindow *wizard)
 
        tmp = g_path_get_basename(gtk_entry_get_text(GTK_ENTRY(wizard->mailbox_name)));
        prefs_account->inbox = g_strdup_printf("#mh/%s/inbox",
 
        tmp = g_path_get_basename(gtk_entry_get_text(GTK_ENTRY(wizard->mailbox_name)));
        prefs_account->inbox = g_strdup_printf("#mh/%s/inbox",

-                       (tmp && !strcmp("Mail", tmp))?_("Mailbox"):tmp);
+                       (!strcmp("Mail", gtk_entry_get_text(GTK_ENTRY(wizard->mailbox_name))))
+                               ?_("Mailbox"):tmp);

        g_free(tmp);
        prefs_account->local_inbox = g_strdup(prefs_account->inbox);
 
        g_free(tmp);
        prefs_account->local_inbox = g_strdup(prefs_account->inbox);