changeset 844:1ece208d1357

2006-11-2 Brian Masney <masneyb@gftp.org> * src/gtk/bookmarks.c - removed UTF-8 check since the string is already in that format
author masneyb
date Fri, 03 Nov 2006 02:37:09 +0000
parents 32dbed7e0dc4
children 8263cc35c027
files ChangeLog src/gtk/bookmarks.c
diffstat 2 files changed, 6 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Nov 03 02:35:47 2006 +0000
+++ b/ChangeLog	Fri Nov 03 02:37:09 2006 +0000
@@ -1,4 +1,7 @@
 2006-11-2 Brian Masney <masneyb@gftp.org>
+	* src/gtk/bookmarks.c - removed UTF-8 check since the string is already
+	in that format
+
 	* lib/local.c lib/misc.c lib/sshv2.c - more improvements to make sure
 	that the filename is encoded in the proper character set.
 
@@ -3680,7 +3683,7 @@
 
 	* cvsclean - added this script
 
-	* *.[ch] - added $Id: ChangeLog,v 1.493 2006/11/03 02:35:46 masneyb Exp $ tags
+	* *.[ch] - added $Id: ChangeLog,v 1.494 2006/11/03 02:37:09 masneyb Exp $ tags
 
 	* debian/* - updated files from Debian maintainer
 
--- a/src/gtk/bookmarks.c	Fri Nov 03 02:35:47 2006 +0000
+++ b/src/gtk/bookmarks.c	Fri Nov 03 02:37:09 2006 +0000
@@ -425,12 +425,8 @@
   while ((pos = strchr (str, '/')) != NULL)
     *pos++ = ' ';
 #else
-  if (g_utf8_validate (str, -1, NULL))
-    newentry->path = g_strdup (str);
-  else
-    newentry->path = g_locale_to_utf8 (str, -1, &bread, &bwrite, NULL);
-
-  while ((pos = g_utf8_strchr (str, -1, '/')) != NULL)
+  newentry->path = g_strdup (str);
+  while ((pos = g_utf8_strchr (newentry->path, -1, '/')) != NULL)
     *pos++ = ' ';
 #endif