gnome-commander r2009 - in trunk: . doc/C src

[epiotr svn gnome org]

Author: epiotr
Date: Tue Aug 26 22:20:44 2008
New Revision: 2009
URL: http://svn.gnome.org/viewvc/gnome-commander?rev=2009&view=rev

Log:
Fixed problem #548948 (crash when home directory contains non-UTF8 characters)

Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/doc/C/gnome-commander.xml
   trunk/src/gnome-cmd-file.cc

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Tue Aug 26 22:20:44 2008
@@ -4,6 +4,7 @@
 
 Bug fixes:
  * Fixed problem #536446 (file name not focused for in-place renaming)
+ * Fixed problem #548948 (crash when home directory contains non-UTF8 characters)
  * Fixed problem #548961 (support for input method when rename or quicksearch)
 
 New features:

Modified: trunk/doc/C/gnome-commander.xml
==============================================================================
--- trunk/doc/C/gnome-commander.xml	(original)
+++ trunk/doc/C/gnome-commander.xml	Tue Aug 26 22:20:44 2008
@@ -5933,6 +5933,9 @@
                         <listitem>
                             <para>Fixed problem #548961 (support for input method when rename or quicksearch)</para>
                         </listitem>
+                        <listitem>
+                            <para>Fixed problem #548948 (crash when home directory contains non-UTF8 characters)</para>
+                        </listitem>
                     </itemizedlist>
                 </para>
                 <para>New features:</para>

Modified: trunk/src/gnome-cmd-file.cc
==============================================================================
--- trunk/src/gnome-cmd-file.cc	(original)
+++ trunk/src/gnome-cmd-file.cc	Tue Aug 26 22:20:44 2008
@@ -187,7 +187,10 @@
 
     f->info = info;
     GNOME_CMD_FILE_INFO (f)->info = info;
-    f->collate_key = g_utf8_collate_key_for_filename (info->name, -1);
+
+    gchar *utf8_name = get_utf8 (info->name);
+    f->collate_key = g_utf8_collate_key_for_filename (utf8_name, -1);
+    g_free (utf8_name);
 
     if (dir)
     {
@@ -800,7 +803,10 @@
     gnome_vfs_file_info_unref (f->info);
     gnome_vfs_file_info_ref (info);
     f->info = info;
-    f->collate_key = g_utf8_collate_key_for_filename (info->name, -1);
+
+    gchar *utf8_name = get_utf8 (info->name);
+    f->collate_key = g_utf8_collate_key_for_filename (utf8_name, -1);
+    g_free (utf8_name);
 }