SF.net SVN: geany:[4547] branches/sm/src

[statc at users.sourceforge.net]

Revision: 4547
          http://geany.svn.sourceforge.net/geany/?rev=4547&view=rev
Author:   statc
Date:     2010-01-24 20:24:13 +0000 (Sun, 24 Jan 2010)

Log Message:
-----------
Make --new-instance imply --no-session.

Modified Paths:
--------------
    branches/sm/src/keyfile.c
    branches/sm/src/main.c

Modified: branches/sm/src/keyfile.c
===================================================================
--- branches/sm/src/keyfile.c	2010-01-24 20:23:53 UTC (rev 4546)
+++ branches/sm/src/keyfile.c	2010-01-24 20:24:13 UTC (rev 4547)
@@ -531,7 +531,7 @@
 	save_recent_files(config, ui_prefs.recent_queue, "recent_files");
 	save_recent_files(config, ui_prefs.recent_projects_queue, "recent_projects");
 
-	if (cl_options.load_session)
+	if (cl_options.load_session && !cl_options.new_instance)
 		configuration_save_session_files(config);
 
 	/* write the file */
@@ -1097,4 +1097,3 @@
 	g_ptr_array_free(keyfile_groups, TRUE);
 	g_ptr_array_free(pref_groups, TRUE);
 }
-

Modified: branches/sm/src/main.c
===================================================================
--- branches/sm/src/main.c	2010-01-24 20:23:53 UTC (rev 4546)
+++ branches/sm/src/main.c	2010-01-24 20:24:13 UTC (rev 4547)
@@ -127,7 +127,7 @@
 	{ "generate-tags", 'g', 0, G_OPTION_ARG_NONE, &generate_tags, N_("Generate global tags file (see documentation)"), NULL },
 	{ "no-preprocessing", 'P', 0, G_OPTION_ARG_NONE, &no_preprocessing, N_("Don't preprocess C/C++ files when generating tags"), NULL },
 #ifdef HAVE_SOCKET
-	{ "new-instance", 'i', 0, G_OPTION_ARG_NONE, &cl_options.new_instance, N_("Don't open files in a running instance, force opening a new instance"), NULL },
+	{ "new-instance", 'i', 0, G_OPTION_ARG_NONE, &cl_options.new_instance, N_("Don't open files in a running instance, force opening a new instance. Implies --no-session"), NULL },
 	{ "socket-file", 0, 0, G_OPTION_ARG_FILENAME, &cl_options.socket_filename, N_("Use this socket filename for communication with a running Geany instance"), NULL },
 #endif
 	{ "line", 'l', 0, G_OPTION_ARG_INT, &cl_options.goto_line, N_("Set initial line number for the first opened file"), NULL },
@@ -137,7 +137,7 @@
 	{ "no-plugins", 'p', 0, G_OPTION_ARG_NONE, &no_plugins, N_("Don't load plugins"), NULL },
 #endif
 	{ "print-prefix", 0, 0, G_OPTION_ARG_NONE, &print_prefix, N_("Print Geany's installation prefix"), NULL },
-	{ "no-session", 's', G_OPTION_FLAG_REVERSE, G_OPTION_ARG_NONE, &cl_options.load_session, N_("Don't load the previous session's files"), NULL },
+	{ "no-session", 's', G_OPTION_FLAG_REVERSE, G_OPTION_ARG_NONE, &cl_options.load_session, N_("Don't load and save session's files"), NULL },
 #ifdef HAVE_VTE
 	{ "no-terminal", 't', 0, G_OPTION_ARG_NONE, &no_vte, N_("Don't load terminal support"), NULL },
 	{ "vte-lib", 0, 0, G_OPTION_ARG_FILENAME, &lib_vte, N_("Filename of libvte.so"), NULL },


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.