SF.net SVN: geany: [2190] trunk

[ntrel at users.sourceforge.net]

Revision: 2190
          http://geany.svn.sourceforge.net/geany/?rev=2190&view=rev
Author:   ntrel
Date:     2008-01-25 05:14:38 -0800 (Fri, 25 Jan 2008)

Log Message:
-----------
Close any project before closing all documents so the project
session files are saved.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/callbacks.c
    trunk/src/main.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-01-25 13:09:14 UTC (rev 2189)
+++ trunk/ChangeLog	2008-01-25 13:14:38 UTC (rev 2190)
@@ -2,6 +2,9 @@
 
  * src/project.c:
    Remove unnecessary save of project keyfile.
+ * src/callbacks.c, src/main.c:
+   Close any project before closing all documents so the project
+   session files are saved.
 
 
 2008-01-23  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>

Modified: trunk/src/callbacks.c
===================================================================
--- trunk/src/callbacks.c	2008-01-25 13:09:14 UTC (rev 2189)
+++ trunk/src/callbacks.c	2008-01-25 13:14:38 UTC (rev 2190)
@@ -145,14 +145,17 @@
 
 	configuration_save();
 
-	// force close all tabs
+	// ignore changes for all tabs (already asked user in on_exit_clicked)
 	for (i = 0; i < doc_array->len; i++)
 	{
 		if (doc_list[i].is_valid && doc_list[i].changed)
 		{
-			doc_list[i].changed = FALSE;	// ignore changes (already asked user in on_exit_clicked)
+			doc_list[i].changed = FALSE;
 		}
 	}
+	if (app->project != NULL)
+		project_close(FALSE);	// save project session files
+
 	on_close_all1_activate(NULL, NULL);
 
 	main_quit();

Modified: trunk/src/main.c
===================================================================
--- trunk/src/main.c	2008-01-25 13:09:14 UTC (rev 2189)
+++ trunk/src/main.c	2008-01-25 13:14:38 UTC (rev 2190)
@@ -839,9 +839,6 @@
 	socket_finalize();
 #endif
 
-	if (app->project != NULL)
-		project_close(FALSE);
-
 #ifdef HAVE_PLUGINS
 	if (want_plugins)
 		plugins_free();


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