2005-01-03 [colin] 0.9.13cvs25.2

	* src/main.c
	* AUTHORS
		Sync with HEAD

diff --git a/AUTHORS b/AUTHORS
index 66093b4..d54ce8e 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -214,3 +214,5 @@ contributors (beside the above; based on Changelog)
        Jean-Yves Lefort
        George Michaelson
        IWAMOTO Kouichi
+       Alex S Moore
+       Felix Eckhofer

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index b0b0150..ad48578 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,9 @@
+2005-01-03 [colin]     0.9.13cvs25.2
+
+       * src/main.c
+       * AUTHORS
+               Sync with HEAD
+
 2005-01-03 [colin]     0.9.13cvs25.1
 
        * src/pop.c

diff --git a/PATCHSETS b/PATCHSETS
index c9f7b05..a6267fa 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -301,3 +301,4 @@
 ( cvs diff -u -r 1.60.2.7 -r 1.60.2.8 src/prefs_actions.c; ) > 0.9.13cvs24.2.patchset
 ( cvs diff -u -r 1.61.2.18 -r 1.61.2.19 src/account.c; ) > 0.9.13cvs24.3.patchset
 ( cvs diff -u -r 1.56.2.30 -r 1.56.2.31 src/pop.c; cvs diff -u -r 1.17.2.12 -r 1.17.2.13 src/pop.h; ) > 0.9.13cvs25.1.patchset
+( cvs diff -u -r 1.115.2.25 -r 1.115.2.26 src/main.c; cvs diff -u -r 1.100.2.9 -r 1.100.2.10 AUTHORS; ) > 0.9.13cvs25.2.patchset

diff --git a/configure.ac b/configure.ac
index 6183d38..a48f9af 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ INTERFACE_AGE=0
 BINARY_AGE=0
 EXTRA_VERSION=25
 EXTRA_RELEASE=
-EXTRA_GTK2_VERSION=.1
+EXTRA_GTK2_VERSION=.2
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}

diff --git a/src/main.c b/src/main.c
index 96cc3a4..6d5742d 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -395,6 +395,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("GTK2");
+       
+       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);
@@ -415,26 +436,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("GTK2");
        
-       static_mainwindow = mainwin;
-
-#ifdef HAVE_STARTUP_NOTIFICATION
-       startup_notification_complete(FALSE);
-#endif
        gtk_main();
 
        exit_sylpheed(mainwin);