2012-09-10 [colin] 3.8.1cvs48

	* src/main.c
		Create lock socket as soon as possible, not after
		a few things like caching all prefs.

diff --git a/ChangeLog b/ChangeLog
index e777be6042c4d67398cba257f3c4d9b0b4c641f0..ad4a7cbd3dcd484b4b9ff118a0a467dc9d6e6b7a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-09-10 [colin]     3.8.1cvs48
+
+       * src/main.c
+               Create lock socket as soon as possible, not after
+               a few things like caching all prefs.
+

 2012-09-09 [mones]     3.8.1cvs47
 
        * src/plugins/bogofilter/bogofilter.c
 2012-09-09 [mones]     3.8.1cvs47
 
        * src/plugins/bogofilter/bogofilter.c

diff --git a/PATCHSETS b/PATCHSETS
index 66e87af796c23082c075cf0db14e33bc7221f4fa..309243e0aac7d8f95819898fdcb58cbfa856fb21 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4422,3 +4422,4 @@
 ( cvs diff -u -r 1.96.2.245 -r 1.96.2.246 src/textview.c;  ) > 3.8.1cvs45.patchset
 ( cvs diff -u -r 1.100.2.83 -r 1.100.2.84 AUTHORS;  cvs diff -u -r 1.155.2.101 -r 1.155.2.102 src/Makefile.am;  cvs diff -u -r 1.12.2.72 -r 1.12.2.73 src/action.c;  cvs diff -u -r 1.27.2.63 -r 1.27.2.64 src/addr_compl.c;  cvs diff -u -r 1.22.2.28 -r 1.22.2.29 src/addrbook.c;  cvs diff -u -r 1.382.2.609 -r 1.382.2.610 src/compose.c;  cvs diff -u -r 1.50.2.67 -r 1.50.2.68 src/compose.h;  cvs diff -u -r 1.14.2.63 -r 1.14.2.64 src/editaddress.c;  cvs diff -u -r 1.60.2.63 -r 1.60.2.64 src/filtering.c;  cvs diff -u -r 1.213.2.209 -r 1.213.2.210 src/folder.c;  cvs diff -u -r 1.87.2.66 -r 1.87.2.67 src/folder.h;  cvs diff -u -r 1.20.2.29 -r 1.20.2.30 src/folderview.h;  cvs diff -u -r 1.2.2.8 -r 1.2.2.9 src/headerview.h;  cvs diff -u -r 1.1.2.71 -r 1.1.2.72 src/imap_gtk.c;  cvs diff -u -r 1.3.4.9 -r 1.3.4.10 src/localfolder.c;  cvs diff -u -r 1.115.2.253 -r 1.115.2.254 src/main.c;  cvs diff -u -r 1.274.2.349 -r 1.274.2.350 src/mainwindow.c;  cvs diff -u -r 1.39.2.64 -r 1.39.2.65 src/mainwindow.h;  cvs diff -u -r 1.75.2.73 -r 1.75.2.74 src/matcher.c;  cvs diff -u -r 1.25.2.35 -r 1.25.2.36 src/matcher_parser_parse.y;  cvs diff -u -r 1.94.2.238 -r 1.94.2.239 src/messageview.c;  cvs diff -u -r 1.19.2.32 -r 1.19.2.33 src/messageview.h;  cvs diff -u -r 1.79.2.74 -r 1.79.2.75 src/mh.c;  cvs diff -u -r 1.2.2.43 -r 1.2.2.44 src/mh_gtk.c;  cvs diff -u -r 1.83.2.193 -r 1.83.2.194 src/mimeview.c;  cvs diff -u -r 1.20.2.38 -r 1.20.2.39 src/mimeview.h;  cvs diff -u -r 1.3.8.12 -r 1.3.8.13 src/noticeview.h;  cvs diff -u -r 1.105.2.174 -r 1.105.2.175 src/prefs_account.c;  cvs diff -u -r 1.49.2.49 -r 1.49.2.50 src/prefs_account.h;  cvs diff -u -r 1.59.2.91 -r 1.59.2.92 src/prefs_filtering.c;  cvs diff -u -r 1.1.4.77 -r 1.1.4.78 src/prefs_filtering_action.c;  cvs diff -u -r 1.5.2.21 -r 1.5.2.22 src/prefs_gtk.h;  cvs diff -u -r 1.43.2.95 -r 1.43.2.96 src/prefs_matcher.c;  cvs diff -u -r 1.12.2.81 -r 1.12.2.82 src/prefs_template.c;  cvs diff -u -r 1.30.2.72 -r 1.30.2.73 src/prefs_toolbar.c;  cvs diff -u -r 1.10.2.27 -r 1.10.2.28 src/privacy.c;  cvs diff -u -r 1.11.2.14 -r 1.11.2.15 src/procheader.h;  cvs diff -u -r 1.49.2.148 -r 1.49.2.149 src/procmime.c;  cvs diff -u -r 1.17.2.29 -r 1.17.2.30 src/procmime.h;  cvs diff -u -r 1.150.2.125 -r 1.150.2.126 src/procmsg.c;  cvs diff -u -r 1.60.2.63 -r 1.60.2.64 src/procmsg.h;  diff -u /dev/null src/proctypes.h;  cvs diff -u -r 1.1.4.10 -r 1.1.4.11 src/remotefolder.c;  cvs diff -u -r 1.395.2.451 -r 1.395.2.452 src/summaryview.c;  cvs diff -u -r 1.68.2.60 -r 1.68.2.61 src/summaryview.h;  cvs diff -u -r 1.96.2.246 -r 1.96.2.247 src/textview.c;  cvs diff -u -r 1.12.2.34 -r 1.12.2.35 src/textview.h;  cvs diff -u -r 1.43.2.129 -r 1.43.2.130 src/toolbar.c;  cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/uri_opener.c;  diff -u /dev/null src/viewtypes.h;  cvs diff -u -r 1.9.2.58 -r 1.9.2.59 src/common/defs.h;  cvs diff -u -r 1.1.2.79 -r 1.1.2.80 src/gtk/authors.h;  cvs diff -u -r 1.5.2.35 -r 1.5.2.36 src/gtk/description_window.c;  cvs diff -u -r 1.14.2.82 -r 1.14.2.83 src/plugins/trayicon/trayicon.c;  ) > 3.8.1cvs46.patchset
 ( cvs diff -u -r 1.1.2.43 -r 1.1.2.44 src/plugins/bogofilter/bogofilter.c;  ) > 3.8.1cvs47.patchset
 ( cvs diff -u -r 1.96.2.245 -r 1.96.2.246 src/textview.c;  ) > 3.8.1cvs45.patchset
 ( cvs diff -u -r 1.100.2.83 -r 1.100.2.84 AUTHORS;  cvs diff -u -r 1.155.2.101 -r 1.155.2.102 src/Makefile.am;  cvs diff -u -r 1.12.2.72 -r 1.12.2.73 src/action.c;  cvs diff -u -r 1.27.2.63 -r 1.27.2.64 src/addr_compl.c;  cvs diff -u -r 1.22.2.28 -r 1.22.2.29 src/addrbook.c;  cvs diff -u -r 1.382.2.609 -r 1.382.2.610 src/compose.c;  cvs diff -u -r 1.50.2.67 -r 1.50.2.68 src/compose.h;  cvs diff -u -r 1.14.2.63 -r 1.14.2.64 src/editaddress.c;  cvs diff -u -r 1.60.2.63 -r 1.60.2.64 src/filtering.c;  cvs diff -u -r 1.213.2.209 -r 1.213.2.210 src/folder.c;  cvs diff -u -r 1.87.2.66 -r 1.87.2.67 src/folder.h;  cvs diff -u -r 1.20.2.29 -r 1.20.2.30 src/folderview.h;  cvs diff -u -r 1.2.2.8 -r 1.2.2.9 src/headerview.h;  cvs diff -u -r 1.1.2.71 -r 1.1.2.72 src/imap_gtk.c;  cvs diff -u -r 1.3.4.9 -r 1.3.4.10 src/localfolder.c;  cvs diff -u -r 1.115.2.253 -r 1.115.2.254 src/main.c;  cvs diff -u -r 1.274.2.349 -r 1.274.2.350 src/mainwindow.c;  cvs diff -u -r 1.39.2.64 -r 1.39.2.65 src/mainwindow.h;  cvs diff -u -r 1.75.2.73 -r 1.75.2.74 src/matcher.c;  cvs diff -u -r 1.25.2.35 -r 1.25.2.36 src/matcher_parser_parse.y;  cvs diff -u -r 1.94.2.238 -r 1.94.2.239 src/messageview.c;  cvs diff -u -r 1.19.2.32 -r 1.19.2.33 src/messageview.h;  cvs diff -u -r 1.79.2.74 -r 1.79.2.75 src/mh.c;  cvs diff -u -r 1.2.2.43 -r 1.2.2.44 src/mh_gtk.c;  cvs diff -u -r 1.83.2.193 -r 1.83.2.194 src/mimeview.c;  cvs diff -u -r 1.20.2.38 -r 1.20.2.39 src/mimeview.h;  cvs diff -u -r 1.3.8.12 -r 1.3.8.13 src/noticeview.h;  cvs diff -u -r 1.105.2.174 -r 1.105.2.175 src/prefs_account.c;  cvs diff -u -r 1.49.2.49 -r 1.49.2.50 src/prefs_account.h;  cvs diff -u -r 1.59.2.91 -r 1.59.2.92 src/prefs_filtering.c;  cvs diff -u -r 1.1.4.77 -r 1.1.4.78 src/prefs_filtering_action.c;  cvs diff -u -r 1.5.2.21 -r 1.5.2.22 src/prefs_gtk.h;  cvs diff -u -r 1.43.2.95 -r 1.43.2.96 src/prefs_matcher.c;  cvs diff -u -r 1.12.2.81 -r 1.12.2.82 src/prefs_template.c;  cvs diff -u -r 1.30.2.72 -r 1.30.2.73 src/prefs_toolbar.c;  cvs diff -u -r 1.10.2.27 -r 1.10.2.28 src/privacy.c;  cvs diff -u -r 1.11.2.14 -r 1.11.2.15 src/procheader.h;  cvs diff -u -r 1.49.2.148 -r 1.49.2.149 src/procmime.c;  cvs diff -u -r 1.17.2.29 -r 1.17.2.30 src/procmime.h;  cvs diff -u -r 1.150.2.125 -r 1.150.2.126 src/procmsg.c;  cvs diff -u -r 1.60.2.63 -r 1.60.2.64 src/procmsg.h;  diff -u /dev/null src/proctypes.h;  cvs diff -u -r 1.1.4.10 -r 1.1.4.11 src/remotefolder.c;  cvs diff -u -r 1.395.2.451 -r 1.395.2.452 src/summaryview.c;  cvs diff -u -r 1.68.2.60 -r 1.68.2.61 src/summaryview.h;  cvs diff -u -r 1.96.2.246 -r 1.96.2.247 src/textview.c;  cvs diff -u -r 1.12.2.34 -r 1.12.2.35 src/textview.h;  cvs diff -u -r 1.43.2.129 -r 1.43.2.130 src/toolbar.c;  cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/uri_opener.c;  diff -u /dev/null src/viewtypes.h;  cvs diff -u -r 1.9.2.58 -r 1.9.2.59 src/common/defs.h;  cvs diff -u -r 1.1.2.79 -r 1.1.2.80 src/gtk/authors.h;  cvs diff -u -r 1.5.2.35 -r 1.5.2.36 src/gtk/description_window.c;  cvs diff -u -r 1.14.2.82 -r 1.14.2.83 src/plugins/trayicon/trayicon.c;  ) > 3.8.1cvs46.patchset
 ( cvs diff -u -r 1.1.2.43 -r 1.1.2.44 src/plugins/bogofilter/bogofilter.c;  ) > 3.8.1cvs47.patchset

+( cvs diff -u -r 1.115.2.254 -r 1.115.2.255 src/main.c;  ) > 3.8.1cvs48.patchset

diff --git a/configure.ac b/configure.ac
index cea1ac6b77805e3dc730e0e9759576f45b1c34b4..e27246bec97c39641e277e0c003172cd6e40e52d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=8
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=47
+EXTRA_VERSION=48

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/main.c b/src/main.c
index 6223096433cfb4e20290b6c34fac72970ab038aa..c01d236fcaca7bcb3ba13e47db24cae8c7cdcfb3 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1088,13 +1088,24 @@ int main(int argc, char *argv[])
                return 0;
        }
 
                return 0;
        }
 

-       main_dump_features_list(TRUE);
-

        prog_version = PROG_VERSION;
        argv0 = g_strdup(argv[0]);
 
        parse_cmd_opt(argc, argv);
 
        prog_version = PROG_VERSION;
        argv0 = g_strdup(argv[0]);
 
        parse_cmd_opt(argc, argv);
 

+       sock_init();
+
+       /* check and create unix domain socket for remote operation */
+       lock_socket = prohibit_duplicate_launch();
+       if (lock_socket < 0) {
+#ifdef HAVE_STARTUP_NOTIFICATION
+               if(gtk_init_check(&argc, &argv))
+                       startup_notification_complete(TRUE);
+#endif
+               return 0;
+       }
+
+       main_dump_features_list(TRUE);

        prefs_prepare_cache();
 
 #ifdef CRASH_DIALOG
        prefs_prepare_cache();
 
 #ifdef CRASH_DIALOG


@@ -1113,17 +1124,6 @@ int main(int argc, char *argv[])
 #if (defined linux && defined SIGIO)
        install_memory_sighandler();
 #endif
 #if (defined linux && defined SIGIO)
        install_memory_sighandler();
 #endif

-       sock_init();
-
-       /* check and create unix domain socket for remote operation */
-       lock_socket = prohibit_duplicate_launch();
-       if (lock_socket < 0) {
-#ifdef HAVE_STARTUP_NOTIFICATION
-               if(gtk_init_check(&argc, &argv))
-                       startup_notification_complete(TRUE);
-#endif
-               return 0;
-       }

 
        if (cmd.status || cmd.status_full || cmd.search ||
                cmd.statistics || cmd.reset_statistics) {
 
        if (cmd.status || cmd.status_full || cmd.search ||
                cmd.statistics || cmd.reset_statistics) {