[Commits] main.c 1.115.2.254 1.115.2.255

[colin at claws-mail.org]

Update of /home/claws-mail/claws/src
In directory srv:/tmp/cvs-serv28579/src

Modified Files:
      Tag: gtk2
	main.c 
Log Message:
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.

Index: main.c
===================================================================
RCS file: /home/claws-mail/claws/src/main.c,v
retrieving revision 1.115.2.254
retrieving revision 1.115.2.255
diff -u -d -r1.115.2.254 -r1.115.2.255
--- main.c	8 Sep 2012 20:23:10 -0000	1.115.2.254
+++ main.c	10 Sep 2012 19:04:42 -0000	1.115.2.255
@@ -1088,13 +1088,24 @@
 		return 0;
 	}
 
-	main_dump_features_list(TRUE);
-
 	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
@@ -1113,17 +1124,6 @@
 #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) {