# HG changeset patch
# User masneyb
# Date 1097198529 0
# Node ID 46f4218c92ceb9f12d3d33354058b0d6c1a04a8c
# Parent  741fc54b48696106cf039885b12d370012a20a7f
2004-10-7 Brian Masney <masneyb@gftp.org>

        * src/gtk/bookmarks.c (entry_apply_changes) - convert all /'s
        in the entry description to spaces so that sub menus are not
        created

diff -r 741fc54b4869 -r 46f4218c92ce ChangeLog
--- a/ChangeLog	Fri Oct 08 00:53:31 2004 +0000
+++ b/ChangeLog	Fri Oct 08 01:22:09 2004 +0000
@@ -1,4 +1,8 @@
 2004-10-7 Brian Masney <masneyb@gftp.org>
+	* src/gtk/bookmarks.c (entry_apply_changes) - convert all /'s
+	in the entry description to spaces so that sub menus are not
+	created
+
 	* src/gtk/gftpuicallbacks.c (gftpui_common_run_ls) - if the ..
 	directory was not found and an entry is to be created, make sure
 	the attributes are set to drwx------ (previously it was d---------)
@@ -2950,7 +2954,7 @@
 
 	* cvsclean - added this script
 
-	* *.[ch] - added $Id: ChangeLog,v 1.345 2004/10/08 00:53:31 masneyb Exp $ tags
+	* *.[ch] - added $Id: ChangeLog,v 1.346 2004/10/08 01:22:09 masneyb Exp $ tags
 
 	* debian/* - updated files from Debian maintainer
 
diff -r 741fc54b4869 -r 46f4218c92ce src/gtk/bookmarks.c
--- a/src/gtk/bookmarks.c	Fri Oct 08 00:53:31 2004 +0000
+++ b/src/gtk/bookmarks.c	Fri Oct 08 01:22:09 2004 +0000
@@ -668,17 +668,21 @@
   size_t oldpathlen;
   const char *str;
 
+  tempstr = g_strdup (gtk_entry_get_text (GTK_ENTRY (bm_pathedit)));
+  while ((pos = strchr (tempstr, '/')) != NULL)
+    *pos = ' ';
+
   oldpathlen = strlen (entry->path);
-
   if ((pos = strrchr (entry->path, '/')) == NULL)
     pos = entry->path;
 
   tempchar = *pos;
   *pos = '\0';
-  origpath = newpath = gftp_build_path (NULL, entry->path,
-                                        gtk_entry_get_text (GTK_ENTRY (bm_pathedit)), NULL);
+  origpath = newpath = gftp_build_path (NULL, entry->path, tempstr, NULL);
   *pos = tempchar;
 
+  g_free (tempstr);
+
   str = gtk_entry_get_text (GTK_ENTRY (bm_hostedit));
   if (entry->hostname != NULL)
     g_free (entry->hostname);