# HG changeset patch
# User masneyb
# Date 1096496700 0
# Node ID de0128b73daa8f28a4a7956109a5534181cd5c55
# Parent  447f40a61ee8d5296f6cb4eb936d7532ab5f5e44
2004-9-29 Brian Masney <masneyb@gftp.org>

        * lib/sshv2.c - log to the user which directory entries gftp could
        not parse

        * src/gtk/bookmarks.c - removed unused function clear_bookmarks_tree()

diff -r 447f40a61ee8 -r de0128b73daa ChangeLog
--- a/ChangeLog	Wed Sep 29 21:31:31 2004 +0000
+++ b/ChangeLog	Wed Sep 29 22:25:00 2004 +0000
@@ -1,4 +1,9 @@
 2004-9-29 Brian Masney <masneyb@gftp.org>
+	* lib/sshv2.c - log to the user which directory entries gftp could
+	not parse
+
+	* src/gtk/bookmarks.c - removed unused function clear_bookmarks_tree()
+
 	* src/gtk/bookmarks.c - make sure the items of type GtkItemFactoryEntry
 	are fully initialized (fixes compiler warnings). Fixed several
 	segfaults that could occur in the bookmarks editor
@@ -2879,7 +2884,7 @@
 
 	* cvsclean - added this script
 
-	* *.[ch] - added $Id: ChangeLog,v 1.332 2004/09/29 21:31:30 masneyb Exp $ tags
+	* *.[ch] - added $Id: ChangeLog,v 1.333 2004/09/29 22:25:00 masneyb Exp $ tags
 
 	* debian/* - updated files from Debian maintainer
 
diff -r 447f40a61ee8 -r de0128b73daa lib/sshv2.c
--- a/lib/sshv2.c	Wed Sep 29 21:31:31 2004 +0000
+++ b/lib/sshv2.c	Wed Sep 29 22:25:00 2004 +0000
@@ -1347,6 +1347,10 @@
 
       if ((ret = gftp_parse_ls (request, longname, fle, 0)) < 0)
         {
+          request->logging_function (gftp_logging_error, request,
+                                     _("Warning: Cannot parse listing %s\n"),
+                                     longname);
+
           gftp_file_destroy (fle);
           return (ret);
         }
diff -r 447f40a61ee8 -r de0128b73daa src/gtk/bookmarks.c
--- a/src/gtk/bookmarks.c	Wed Sep 29 21:31:31 2004 +0000
+++ b/src/gtk/bookmarks.c	Wed Sep 29 22:25:00 2004 +0000
@@ -660,36 +660,6 @@
 
 
 static void
-clear_bookmarks_tree (void)
-{
-  gftp_bookmarks_var * tempentry;
-
-  if (new_bookmarks != NULL)
-    tempentry = new_bookmarks->children;
-  else
-    tempentry = gftp_bookmarks->children;
-
-  while (tempentry != NULL)
-    {
-      if (tempentry->children != NULL)
-	{
-	  tempentry = tempentry->children;
-	  continue;
-	}
-      while (tempentry->next == NULL && tempentry->prev != NULL)
-	{
-	  gtk_ctree_remove_node (GTK_CTREE (tree), tempentry->cnode);
-	  tempentry->cnode = NULL;
-	  tempentry = tempentry->prev;
-	}
-      gtk_ctree_remove_node (GTK_CTREE (tree), tempentry->cnode);
-      tempentry->cnode = NULL;
-      tempentry = tempentry->next;
-    }
-}
-
-
-static void
 entry_apply_changes (GtkWidget * widget, gftp_bookmarks_var * entry)
 {
   char *pos, *newpath, tempchar, *tempstr, *origpath;