SF.net SVN: geany: [1268] trunk

[eht16 at users.sourceforge.net]

Revision: 1268
          http://svn.sourceforge.net/geany/?rev=1268&view=rev
Author:   eht16
Date:     2007-02-12 08:32:56 -0800 (Mon, 12 Feb 2007)

Log Message:
-----------
Convert config, application and documentation dir paths to locale encoding before using it.

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-02-10 11:47:47 UTC (rev 1267)
+++ trunk/ChangeLog	2007-02-12 16:32:56 UTC (rev 1268)
@@ -1,3 +1,9 @@
+2007-02-12  Enrico Tröger  <enrico.troeger at uvena.de>
+
+ * src/main.c: Convert config, application and documentation dir paths
+               to locale encoding before using it.
+
+
 2007-02-08  Nick Treleaven  <nick.treleaven at btinternet.com>
 
  * src/utils.c, src/utils.h, src/filetypes.c,

Modified: trunk/src/main.c
===================================================================
--- trunk/src/main.c	2007-02-10 11:47:47 UTC (rev 1267)
+++ trunk/src/main.c	2007-02-12 16:32:56 UTC (rev 1268)
@@ -370,8 +370,12 @@
 	doc_dir = g_strdup(PACKAGE_DATA_DIR "/doc/" PACKAGE "/html/");
 #endif
 
-	app->datadir = data_dir;
-	app->docdir = doc_dir;
+	// convert path names to locale encoding
+	app->datadir = utils_get_locale_from_utf8(data_dir);
+	app->docdir = utils_get_locale_from_utf8(doc_dir);
+
+	g_free(data_dir);
+	g_free(doc_dir);
 }
 
 
@@ -449,7 +453,12 @@
 static gint setup_config_dir()
 {
 	gint mkdir_result = 0;
+	gchar *tmp = app->configdir;
 
+	// convert configdir to locale encoding to avoid troubles
+	app->configdir = utils_get_locale_from_utf8(app->configdir);
+	g_free(tmp);
+
 	mkdir_result = utils_make_settings_dir(app->configdir, app->datadir, app->docdir);
 	if (mkdir_result != 0)
 	{


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