* src/main.c

	no mail incorporation allowed with --offline param.
	fixes bug #374, "--offline ignored"

diff --git a/ChangeLog.claws b/ChangeLog.claws
index dee450405b55d79062bfdbc54045261fd0288236..8ee304c89ac894645bc79f45740b72064c9c1a68 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,9 @@
+2003-11-21 [alfons]    0.9.6claws84
+
+       * src/main.c
+               no mail incorporation allowed with --offline param.
+               fixes bug #374, "--offline ignored"
+               
 2003-11-20 [christoph] 0.9.6claws83
 
        * src/mimeinfo.c

diff --git a/configure.ac b/configure.ac
index ab814e33aa763007d09df7426398034764e0cb9f..3999de510cf00b2c335e7bc0e4a9d35dc37e8f59 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=83
+EXTRA_VERSION=84
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else

diff --git a/src/main.c b/src/main.c
index 13bc4f827033b41d3197a01de5be5d424e985e49..554162e6d328210eaf3c531b25cfb21713d205c6 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -313,6 +313,11 @@ int main(int argc, char *argv[])
        /* ignore SIGPIPE signal for preventing sudden death of program */
        signal(SIGPIPE, SIG_IGN);
 
+       if (cmd.online_mode == ONLINE_MODE_OFFLINE)
+               main_window_toggle_work_offline(mainwin, TRUE);
+       if (cmd.online_mode == ONLINE_MODE_ONLINE)
+               main_window_toggle_work_offline(mainwin, FALSE);
+
        if (cmd.receive_all)
                inc_all_account_mail(mainwin, FALSE, 
                                     prefs_common.newmail_notify_manu);
@@ -342,11 +347,6 @@ int main(int argc, char *argv[])
                cmd.status_full_folders = NULL;
        }
 
-       if (cmd.online_mode == ONLINE_MODE_OFFLINE)
-               main_window_toggle_work_offline(mainwin, TRUE);
-       if (cmd.online_mode == ONLINE_MODE_ONLINE)
-               main_window_toggle_work_offline(mainwin, FALSE);
-
        prefs_toolbar_init();
 
        plugin_load_all("GTK");