SF.net SVN: geany:[4762] trunk

[eht16 at users.sourceforge.net]

Revision: 4762
          http://geany.svn.sourceforge.net/geany/?rev=4762&view=rev
Author:   eht16
Date:     2010-03-15 14:05:42 +0000 (Mon, 15 Mar 2010)

Log Message:
-----------
For now revert the recent patch which set real_path of newly open non-existent configuration files as this seems hackish and causes 'file not found' warnings.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/ui_utils.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-03-15 13:12:54 UTC (rev 4761)
+++ trunk/ChangeLog	2010-03-15 14:05:42 UTC (rev 4762)
@@ -1,3 +1,11 @@
+2010-03-15  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
+
+ * src/ui_utils.c:
+   For now revert the recent patch which set real_path of newly
+   open non-existent configuration files as this seems hackish and
+   causes 'file not found' warnings.
+
+
 2010-03-15  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
 
  * src/utils.c, src/utils.h, src/sciwrappers.c, src/dialogs.c,

Modified: trunk/src/ui_utils.c
===================================================================
--- trunk/src/ui_utils.c	2010-03-15 13:12:54 UTC (rev 4761)
+++ trunk/src/ui_utils.c	2010-03-15 14:05:42 UTC (rev 4762)
@@ -1735,19 +1735,14 @@
 		gchar *base_name = g_path_get_basename(file_name);
 		gchar *global_file = g_build_filename(app->datadir, base_name, NULL);
 		gchar *global_content = NULL;
-		GeanyDocument *doc;
 
 		/* if the requested file doesn't exist in the user's config dir, try loading the file
 		 * from the global data directory and use its contents for the newly created file */
 		if (g_file_test(global_file, G_FILE_TEST_EXISTS))
 			g_file_get_contents(global_file, &global_content, NULL, NULL);
 
-		doc = document_new_file(utf8_filename, ft, global_content);
+		document_new_file(utf8_filename, ft, global_content);
 
-		/* Enforce config file override policy by populating doc->real_path, which in turn
-		 * allows document to be saved directly to file_name location. */
-		doc->real_path = g_strdup(utf8_filename);
-
 		utils_free_pointers(4, utf8_filename, base_name, global_file, global_content, NULL);
 	}
 }


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