talons

commit 8d5cf03effe55baaa6bfded773cb9d7c2c84827f
parent 449bc7d5ebadecdd4d09362f0642f51dd0691b49
Author: Paul Mangan <paul@claws-mail.org>
Date:   Mon, 24 Mar 2008 08:40:25 +0000

2008-03-24 [paul]	3.3.1cvs37

	* src/prefs_account.c
		If no MH mailbox and no account exists, when
		creating a POP/Local account, just create and
		use the default one instead of bailing with a
		"Mailbox doesn't exist" error

Diffstat:
M
ChangeLog
 | 
8
++++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/prefs_account.c
 | 
7
+------

4 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,11 @@
+2008-03-24 [paul]	3.3.1cvs37
+
+	* src/prefs_account.c
+		If no MH mailbox and no account exists, when
+		creating a POP/Local account, just create and
+		use the default one instead of bailing with a
+		"Mailbox doesn't exist" error
+
 2008-03-21 [colin]	3.3.1cvs36
 
 	* src/procmime.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3271,3 +3271,4 @@
 ( cvs diff -u -r 1.94.2.173 -r 1.94.2.174 src/messageview.c;  cvs diff -u -r 1.19.2.18 -r 1.19.2.19 src/messageview.h;  cvs diff -u -r 1.96.2.197 -r 1.96.2.198 src/textview.c;  ) > 3.3.1cvs34.patchset
 ( cvs diff -u -r 1.1.2.45 -r 1.1.2.46 manual/advanced.xml;  ) > 3.3.1cvs35.patchset
 ( cvs diff -u -r 1.49.2.107 -r 1.49.2.108 src/procmime.c;  ) > 3.3.1cvs36.patchset
+( cvs diff -u -r 1.105.2.128 -r 1.105.2.129 src/prefs_account.c;  ) > 3.3.1cvs37.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=3
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=36
+EXTRA_VERSION=37
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/prefs_account.c b/src/prefs_account.c
@@ -60,7 +60,6 @@
 
 static gboolean cancelled;
 static gboolean new_account;
-static gboolean create_mailbox;
 
 static PrefsAccount tmp_ac_prefs;
 
@@ -1230,7 +1229,6 @@ static void basic_create_widget_func(PrefsPage * _page,
 	page->uid_entry        = uid_entry;
 	page->pass_entry       = pass_entry;
 
-	create_mailbox = FALSE;
 	if (new_account) {
 		PrefsAccount *def_ac;
 		gchar *buf;
@@ -1258,8 +1256,6 @@ static void basic_create_widget_func(PrefsPage * _page,
 				gtk_entry_set_text(GTK_ENTRY(receive_page.local_inbox_entry),
 					id);
 				g_free(id);
-			} else {
-				create_mailbox = TRUE;
 			}
 		}
 	} else
@@ -2642,7 +2638,7 @@ static gint prefs_basic_apply(void)
 		GtkWidget *inbox_entry = (protocol == A_POP3 ? receive_page.inbox_entry : receive_page.local_inbox_entry );
 		const gchar *mailbox = gtk_entry_get_text(GTK_ENTRY(inbox_entry));
 		FolderItem *inbox =  folder_find_item_from_identifier(mailbox);
-		if (!inbox && create_mailbox) {
+		if (!inbox) {
 			gchar *id = NULL;
 			setup_write_mailbox_path(mainwindow_get_mainwindow(), "Mail");
 			id = folder_item_get_identifier(folder_get_default_inbox_for_class(F_MH));
@@ -2652,7 +2648,6 @@ static gint prefs_basic_apply(void)
 				id);
 			g_free(id);
 			mailbox = gtk_entry_get_text(GTK_ENTRY(inbox_entry));
-			create_mailbox = FALSE;
 			inbox =  folder_find_item_from_identifier(mailbox);
 		}
 	    	if (inbox == NULL) {