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

[statc at users.sourceforge.net]

Revision: 4672
          http://geany.svn.sourceforge.net/geany/?rev=4672&view=rev
Author:   statc
Date:     2010-02-15 09:41:53 +0000 (Mon, 15 Feb 2010)

Log Message:
-----------
Load files from command line even if a project is being opened.

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

Modified: branches/sm/ChangeLog
===================================================================
--- branches/sm/ChangeLog	2010-02-15 09:41:33 UTC (rev 4671)
+++ branches/sm/ChangeLog	2010-02-15 09:41:53 UTC (rev 4672)
@@ -3,6 +3,8 @@
  * src/project.c, src/sm.c, src/utils.c, src/utils.h:
    Use absolute paths to project files. Particularly, paths to recent
    projects' files are now stored as absolute.
+ * src/main.c:
+   Load files from command line even if a project is being opened.
 
 
 2010-02-07  Eugene Arshinov  <earshinov(at)gmail(dot)com>

Modified: branches/sm/src/main.c
===================================================================
--- branches/sm/src/main.c	2010-02-15 09:41:33 UTC (rev 4671)
+++ branches/sm/src/main.c	2010-02-15 09:41:53 UTC (rev 4672)
@@ -891,9 +891,9 @@
 
 static void load_startup_files(gint argc, gchar **argv)
 {
-	gboolean load_files = TRUE;
 	gboolean load_default_session = TRUE;
 	gboolean load_session = FALSE;
+	gint files_argv_index = 0;
 
 	if (!prefs.load_session)
 	{
@@ -905,21 +905,15 @@
 	{
 		/* load project filenames into global session_files variable */
 		main_load_project_from_command_line(argv[1], FALSE);
+		files_argv_index = 1;
 
-		load_files = FALSE;
-		if (argc > 2)
-			g_print("Ignoring extra filenames after %s", argv[1]);
-
 		load_default_session = FALSE;
 		load_session = TRUE;
 	}
 
-	if (load_files)
-	{
-		gboolean any_files_opened = open_cl_files(argc, argv);
-		if (any_files_opened)
-			load_default_session = FALSE;
-	}
+	gboolean any_files_opened = open_cl_files(argc - files_argv_index, argv + files_argv_index);
+	if (any_files_opened)
+		load_default_session = FALSE;
 
 	if (!cl_options.load_session)
 		load_default_session = FALSE;


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