SF.net SVN: geany: [493] trunk

[ntrel at users.sourceforge.net]

Revision: 493
Author:   ntrel
Date:     2006-06-27 08:24:39 -0700 (Tue, 27 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/geany/?rev=493&view=rev

Log Message:
-----------
Add recent files items in the same order as they were saved. Remove app->recent_files and use g_strfreev in keyfile.c

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/geany.h
    trunk/src/keyfile.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-06-26 17:48:27 UTC (rev 492)
+++ trunk/ChangeLog	2006-06-27 15:24:39 UTC (rev 493)
@@ -1,3 +1,10 @@
+2006-06-27  Nick Treleaven  <nick.treleaven at btinternet.com>
+
+ * src/geany.h, src/keyfile.c:
+   Add recent files items in the same order as they were saved.
+   Remove app->recent_files and use g_strfreev in keyfile.c.
+
+
 2006-06-26  Enrico Troeger  <enrico.troeger at uvena.de>
 
  * src/sci_cb.c: Fixed broken auto completion for switch().

Modified: trunk/src/geany.h
===================================================================
--- trunk/src/geany.h	2006-06-26 17:48:27 UTC (rev 492)
+++ trunk/src/geany.h	2006-06-27 15:24:39 UTC (rev 493)
@@ -184,7 +184,6 @@
 	gchar				*build_browser_cmd;
 	gchar				*build_make_cmd;
 	gchar				*build_term_cmd;
-	gchar			   **recent_files;
 	GtkIconSize			 toolbar_icon_size;
 	GtkWidget			*toolbar;
 	GtkWidget			*run_button;

Modified: trunk/src/keyfile.c
===================================================================
--- trunk/src/keyfile.c	2006-06-26 17:48:27 UTC (rev 492)
+++ trunk/src/keyfile.c	2006-06-27 15:24:39 UTC (rev 493)
@@ -151,6 +151,7 @@
 	recent_files[app->mru_length] = NULL;
 	g_key_file_set_string_list(config, "files", "recent_files",
 				(const gchar**)recent_files, app->mru_length);
+	g_strfreev(recent_files);
 
 	// store the last 15(or what ever GEANY_SESSION_FILES is set to) filenames, to reopen the next time
 	max = gtk_notebook_get_n_pages(GTK_NOTEBOOK(app->notebook));
@@ -177,8 +178,6 @@
 	utils_write_file(configfile, data);
 	g_free(data);
 
-	utils_free_ptr_array(recent_files, app->mru_length);
-	g_free(recent_files);
 	g_key_file_free(config);
 	g_free(configfile);
 	g_free(entry);
@@ -198,6 +197,7 @@
 	gchar *tmp_string, *tmp_string2;
 	GKeyFile *config = g_key_file_new();
 	GError *error = NULL;
+	gchar **recent_files;
 
 	config_exists = g_key_file_load_from_file(config, configfile, G_KEY_FILE_KEEP_COMMENTS, NULL);
 
@@ -294,15 +294,16 @@
 	app->build_browser_cmd = utils_get_setting_string(config, "build", "build_browser_cmd", tmp_string);
 	g_free(tmp_string);
 
-	app->recent_files = g_key_file_get_string_list(config, "files", "recent_files", &len, NULL);
-	if (app->recent_files != NULL)
+	recent_files = g_key_file_get_string_list(config, "files", "recent_files", &len, NULL);
+	if (recent_files != NULL)
 	{
 		for (i = 0; (i < len) && (i < app->mru_length); i++)
 		{
-			g_queue_push_head(app->recent_queue, app->recent_files[i]);
-			app->recent_files[i] = NULL;
+			gchar *filename = g_strdup(recent_files[i]);
+			g_queue_push_tail(app->recent_queue, filename);
 		}
 	}
+	g_strfreev(recent_files);
 
 	for(i = 0; i < GEANY_SESSION_FILES; i++)
 	{
@@ -316,7 +317,6 @@
 		}
 	}
 
-	utils_free_ptr_array(app->recent_files, len);
 	g_key_file_free(config);
 	g_free(configfile);
 	g_free(entry);


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