From 74c3ed3ad42ac11071f3477219df2a194af5008c Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Thu, 19 Jul 2007 06:19:09 +0000 Subject: [PATCH] 2007-07-19 [colin] 2.10.0cvs43 * src/wizard.c Solve Mail/Mailbox name when specifying full /path/to/Mail. --- ChangeLog | 6 ++++++ PATCHSETS | 1 + configure.ac | 2 +- src/wizard.c | 3 ++- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 54973fcba..17a65649c 100644 --- 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 diff --git a/PATCHSETS b/PATCHSETS index fdfece7a3..be99880c9 100644 --- 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.1.2.55 -r 1.1.2.56 src/wizard.c; ) > 2.10.0cvs43.patchset diff --git a/configure.ac b/configure.ac index 130669497..9a20a3a89 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=10 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=42 +EXTRA_VERSION=43 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/wizard.c b/src/wizard.c index af10690d3..07bdd1aa2 100644 --- 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 && !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); -- 2.25.1