2005-01-03 [colin] 0.9.13cvs26
authorColin Leroy <colin@colino.net>
Mon, 3 Jan 2005 08:43:58 +0000 (08:43 +0000)
committerColin Leroy <colin@colino.net>
Mon, 3 Jan 2005 08:43:58 +0000 (08:43 +0000)
* src/main.c
Plugins should be loaded before --receive or --receive-all
is processed.
Patch by Felix Eckhofer <felix-ml@tribut.de>

ChangeLog.claws
PATCHSETS
configure.ac
src/main.c

index 96413ea..60f89de 100644 (file)
@@ -1,3 +1,10 @@
+2005-01-03 [colin]     0.9.13cvs26
+
+       * src/main.c
+               Plugins should be loaded before --receive or --receive-all 
+               is processed. 
+               Patch by Felix Eckhofer <felix-ml@tribut.de>
+
 2005-01-03 [colin]     0.9.13cvs25
 
        * src/pop.c
index 6471b4d..16203e8 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.77 -r 1.78 src/account.c; ) > 0.9.13cvs23.patchset
 ( cvs diff -u -r 1.101 -r 1.102 src/procmime.c; ) > 0.9.13cvs24.patchset
 ( cvs diff -u -r 1.72 -r 1.73 src/pop.c; cvs diff -u -r 1.22 -r 1.23 src/pop.h; ) > 0.9.13cvs25.patchset
+( cvs diff -u -r 1.150 -r 1.151 src/main.c; ) > 0.9.13cvs26.patchset
index 3a81a7c..094074a 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=13
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=25
+EXTRA_VERSION=26
 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
index f32c84a..0e024a3 100644 (file)
@@ -386,6 +386,27 @@ int main(int argc, char *argv[])
        if (cmd.online_mode == ONLINE_MODE_ONLINE)
                main_window_toggle_work_offline(mainwin, FALSE);
 
+       if (cmd.status_folders) {
+               g_ptr_array_free(cmd.status_folders, TRUE);
+               cmd.status_folders = NULL;
+       }
+       if (cmd.status_full_folders) {
+               g_ptr_array_free(cmd.status_full_folders, TRUE);
+               cmd.status_full_folders = NULL;
+       }
+
+       sylpheed_register_idle_function(sylpheed_gtk_idle);
+
+       prefs_toolbar_init();
+
+       plugin_load_all("GTK");
+       
+       static_mainwindow = mainwin;
+
+#ifdef HAVE_STARTUP_NOTIFICATION
+       startup_notification_complete(FALSE);
+#endif
+
        if (cmd.receive_all)
                inc_all_account_mail(mainwin, FALSE, 
                                     prefs_common.newmail_notify_manu);
@@ -406,26 +427,7 @@ int main(int argc, char *argv[])
        }
        if (cmd.send)
                send_queue();
-       if (cmd.status_folders) {
-               g_ptr_array_free(cmd.status_folders, TRUE);
-               cmd.status_folders = NULL;
-       }
-       if (cmd.status_full_folders) {
-               g_ptr_array_free(cmd.status_full_folders, TRUE);
-               cmd.status_full_folders = NULL;
-       }
-
-       sylpheed_register_idle_function(sylpheed_gtk_idle);
-
-       prefs_toolbar_init();
-
-       plugin_load_all("GTK");
-       
-       static_mainwindow = mainwin;
 
-#ifdef HAVE_STARTUP_NOTIFICATION
-       startup_notification_complete(FALSE);
-#endif 
        gtk_main();
 
        exit_sylpheed(mainwin);