From: Paul Mangan <paul@claws-mail.org>
Date: Mon, 29 Sep 2003 07:53:38 +0000 (+0000)
Subject: allow 'local_mbox' value to point to either a directory or a file
X-Git-Tag: ch_branch_last_merge~1
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=6dcd053731f4fe7dc9bd25fe282693d8f6d70be5;ds=sidebyside

allow 'local_mbox' value to point to either a directory or a file
---

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 2b073a186..2e5863e51 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,11 @@
+2003-09-29 [paul]	0.9.5claws36
+
+	* src/inc.c
+	  src/prefs_account.c
+	  	allow 'local_mbox' value to point to either a directory 
+		(/var/mail -  default, new) or a file (/var/mail/username
+		- original)
+
 2003-09-28 [paul]	0.9.5claws35
 
 	* src/rfc2015.c
diff --git a/configure.ac b/configure.ac
index fb1e0d2f6..d01f1e75f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=35
+EXTRA_VERSION=36
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else
diff --git a/src/inc.c b/src/inc.c
index 255f96d60..385035875 100644
--- a/src/inc.c
+++ b/src/inc.c
@@ -1095,8 +1095,11 @@ static gint inc_spool_account(PrefsAccount *account)
 	} else
 		inbox = folder_get_default_inbox();
 
-	mbox = g_strconcat(account->local_mbox,
-			   G_DIR_SEPARATOR_S, logname, NULL);
+	if (is_file_exist(account->local_mbox))
+		mbox = g_strconcat(account->local_mbox, NULL);
+	else 
+		mbox = g_strconcat(account->local_mbox,
+			   	   G_DIR_SEPARATOR_S, logname, NULL);
 
 	return get_spool(inbox, mbox);
 }
diff --git a/src/prefs_account.c b/src/prefs_account.c
index 206a18edd..39ea542c4 100644
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -1026,7 +1026,7 @@ static void prefs_account_basic_create(void)
 			  GTK_FILL, 0, 0, 0);
 	gtk_misc_set_alignment (GTK_MISC (recvserv_label), 1, 0.5);
 
-	localmbox_label = gtk_label_new (_("Local mailbox directory"));
+	localmbox_label = gtk_label_new (_("Local mailbox"));
 	gtk_widget_show (localmbox_label);
 	gtk_table_attach (GTK_TABLE (serv_table), localmbox_label, 0, 1, 3, 4,
 			  GTK_FILL, 0, 0, 0);