changeset 366:2e408d9918d4

2003-1-18 Brian Masney <masneyb@gftp.org> * src/gtk/bookmarks.c - don't allow an item to be dropped onto the root node or items that are not a folder (from Aurelien Jarno <aurel32@debian.org>)
author masneyb
date Sun, 18 Jan 2004 19:56:01 +0000
parents 2a049e4dc551
children d5409bf03ff1
files ChangeLog src/gtk/bookmarks.c
diffstat 2 files changed, 26 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sun Jan 18 16:51:35 2004 +0000
+++ b/ChangeLog	Sun Jan 18 19:56:01 2004 +0000
@@ -1,18 +1,23 @@
+2003-1-18 Brian Masney <masneyb@gftp.org>
+	* src/gtk/bookmarks.c - don't allow an item to be dropped onto the root
+	node or items that are not a folder
+	(from Aurelien Jarno <aurel32@debian.org>)
+
 2003-1-7 Brian Masney <masneyb@gftp.org>
 	* lib/protocols.c (parse_time) - insert the right year for files that
 	are from last year and the year is not shown in the ls output.
 
-        * src/uicommon/gftpui.c (_gftpui_common_thread_callback)
-        src/uicommon/gftpui.h - added a retries variable to the cdata structure
-
-        * src/uicommon/gftpui.c (gftpui_common_cmd_open) src/uicommon/gftpui.c
-        - actually connect to the remote server
-
-        * src/uicommon/gftpuicallbacks.c src/uicommon/gftpui.c - in the
-        callback functions, don't change the return value
-
-        * src/text/textui.c (gftpui_generic_thread) - don't spawn a thread,
-        just call the function directly
+	* src/uicommon/gftpui.c (_gftpui_common_thread_callback)
+	src/uicommon/gftpui.h - added a retries variable to the cdata structure
+
+	* src/uicommon/gftpui.c (gftpui_common_cmd_open) src/uicommon/gftpui.c
+	- actually connect to the remote server
+
+	* src/uicommon/gftpuicallbacks.c src/uicommon/gftpui.c - in the
+	callback functions, don't change the return value
+
+	* src/text/textui.c (gftpui_generic_thread) - don't spawn a thread,
+	just call the function directly
 
 2003-1-6 Brian Masney <masneyb@gftp.org>
 	* lib/gftp.h lib/protocols.c lib/rfc959.c - added MVS directory parsing
@@ -1975,7 +1980,7 @@
 
 	* cvsclean - added this script
 
-	* *.[ch] - added $Id: ChangeLog,v 1.199 2004/01/07 12:11:34 masneyb Exp $ tags
+	* *.[ch] - added $Id: ChangeLog,v 1.200 2004/01/18 19:56:00 masneyb Exp $ tags
 
 	* debian/* - updated files from Debian maintainer
 
--- a/src/gtk/bookmarks.c	Sun Jan 18 16:51:35 2004 +0000
+++ b/src/gtk/bookmarks.c	Sun Jan 18 19:56:01 2004 +0000
@@ -1075,6 +1075,14 @@
 }
 
 
+static inline gboolean 
+move_possible (GtkCTree *ctree, GtkCTreeNode *child, GtkCTreeNode *parent,
+               GtkCTreeNode *sibling)
+{
+  return (parent != NULL && sibling != NULL);
+}
+
+
 static void
 after_move (GtkCTree * ctree, GtkCTreeNode * child, GtkCTreeNode * parent,
 	    GtkCTreeNode * sibling, gpointer data)
@@ -1248,6 +1256,7 @@
 			    GTK_SIGNAL_FUNC (after_move), NULL);
   gtk_signal_connect_after (GTK_OBJECT (tree), "button_press_event",
 			    GTK_SIGNAL_FUNC (bm_dblclick), (gpointer) tree);
+  gtk_ctree_set_drag_compare_func (GTK_CTREE(tree), &move_possible);
   gtk_widget_show (tree);
 
 #if GTK_MAJOR_VERSION == 1