Revision: 4671 http://geany.svn.sourceforge.net/geany/?rev=4671&view=rev Author: statc Date: 2010-02-15 09:41:33 +0000 (Mon, 15 Feb 2010)
Log Message: ----------- Make --new-instance imply --no-session, even if a project is opened. An addition to rev. 4567.
Modified Paths: -------------- branches/sm/src/keyfile.c branches/sm/src/main.c branches/sm/src/sm.c
Modified: branches/sm/src/keyfile.c =================================================================== --- branches/sm/src/keyfile.c 2010-02-15 09:41:12 UTC (rev 4670) +++ branches/sm/src/keyfile.c 2010-02-15 09:41:33 UTC (rev 4671) @@ -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 && !cl_options.new_instance) + if (cl_options.load_session) configuration_save_session_files(config);
/* write the file */
Modified: branches/sm/src/main.c =================================================================== --- branches/sm/src/main.c 2010-02-15 09:41:12 UTC (rev 4670) +++ branches/sm/src/main.c 2010-02-15 09:41:33 UTC (rev 4671) @@ -921,7 +921,7 @@ load_default_session = FALSE; }
- if (!cl_options.load_session || cl_options.new_instance) + if (!cl_options.load_session) load_default_session = FALSE;
if (load_default_session) @@ -1005,7 +1005,9 @@ } #endif
- sm_init(argv[0], libsm_client_id); + /* --new-instance implies --no-session */ + if (cl_options.new_instance) + cl_options.load_session = FALSE;
geany_debug("Geany %s, GTK+ %u.%u.%u, GLib %u.%u.%u", main_get_version_string(), @@ -1139,6 +1141,8 @@ } #endif
+ sm_init(argv[0], libsm_client_id); + gtk_main(); return 0; }
Modified: branches/sm/src/sm.c =================================================================== --- branches/sm/src/sm.c 2010-02-15 09:41:12 UTC (rev 4670) +++ branches/sm/src/sm.c 2010-02-15 09:41:33 UTC (rev 4671) @@ -418,7 +418,7 @@ }
- if (cl_options.load_session && !cl_options.new_instance) + if (cl_options.load_session) { /* * Files will be restored by Geany session management facilities.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.