allow 'local_mbox' value to point to either a directory or a file
authorPaul Mangan <paul@claws-mail.org>
Mon, 29 Sep 2003 07:53:38 +0000 (07:53 +0000)
committerPaul Mangan <paul@claws-mail.org>
Mon, 29 Sep 2003 07:53:38 +0000 (07:53 +0000)
ChangeLog.claws
configure.ac
src/inc.c
src/prefs_account.c

index 2b073a1..2e5863e 100644 (file)
@@ -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
index fb1e0d2..d01f1e7 100644 (file)
@@ -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
index 255f96d..3850358 100644 (file)
--- 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);
 }
index 206a18e..39ea542 100644 (file)
@@ -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);