SF.net SVN: geany:[4698] branches/sm

statc at users.sourceforge.net statc at xxxxx
Tue Feb 23 19:34:24 UTC 2010


Revision: 4698
          http://geany.svn.sourceforge.net/geany/?rev=4698&view=rev
Author:   statc
Date:     2010-02-23 19:34:23 +0000 (Tue, 23 Feb 2010)

Log Message:
-----------
Change the behaviour of the setting controlled by "Preferences > General > Misc > Use project-based session files" check button. Now if you open a project via command-line, files from the default session are not automatically appended to it.

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

Modified: branches/sm/ChangeLog
===================================================================
--- branches/sm/ChangeLog	2010-02-23 19:34:01 UTC (rev 4697)
+++ branches/sm/ChangeLog	2010-02-23 19:34:23 UTC (rev 4698)
@@ -1,3 +1,12 @@
+2010-02-23  Eugene Arshinov  <earshinov(at)gmail(dot)com>
+
+ * src/main.c:
+   Change the behaviour of the setting controlled by "Preferences >
+   General > Misc > Use project-based session files" check button. Now
+   if you open a project via command-line, files from the default
+   session are not automatically appended to it.
+
+
 2010-02-22  Eugene Arshinov  <earshinov(at)gmail(dot)com>
 
  * src/main.c, src/main.h, src/socket.c:

Modified: branches/sm/src/main.c
===================================================================
--- branches/sm/src/main.c	2010-02-23 19:34:01 UTC (rev 4697)
+++ branches/sm/src/main.c	2010-02-23 19:34:23 UTC (rev 4698)
@@ -905,11 +905,12 @@
 
 	if (cl_options.project)
 	{
-		/* load project filenames into global session_files variable */
 		main_load_project_from_command_line(cl_options.project, FALSE);
 
 		load_default_session = FALSE;
-		load_session = TRUE;
+		if (project_prefs.project_session)
+			/* project filenames are loaded into global session_files variable */
+			load_session = TRUE;
 	}
 
 	any_files_opened = open_cl_files(argc, argv);


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



More information about the Commits mailing list