1999-01-26 Federico Mena Quintero <federico@nuclecu.unam.mx>

* gscreen.c (panel_clist_motion): Stop the emission of the
	motion_notify_event signal so that it does not reach the clist.
	We do not want it to select rows while dragging.
	Replaced copy_strings() with g_strconcat().

	* gdnd.c (gdnd_validate_action): Do not override GDK_ACTION_ASK.

	* gdesktop.c: Updated the TODO list at the top of the file.

gnome/ChangeLog

@@ -1,3 +1,14 @@
+1999-01-26  Federico Mena Quintero  <federico@nuclecu.unam.mx>
+
+	* gscreen.c (panel_clist_motion): Stop the emission of the
+	motion_notify_event signal so that it does not reach the clist.
+	We do not want it to select rows while dragging.
+	Replaced copy_strings() with g_strconcat().
+
+	* gdnd.c (gdnd_validate_action): Do not override GDK_ACTION_ASK.
+
+	* gdesktop.c: Updated the TODO list at the top of the file.
+
 Wed Jan 27 03:14:46 1999  Timur Bakeyev <mc@bat.ru>
 
 	* Converted memory managment to Glib - where it wasn't done. Now we 

gnome/gdesktop.c

@@ -11,19 +11,6 @@
  *
  * - Put an InputOnly window over icons to be able to select them even if the user clicks on
  *   the transparent area.
- *
- * - DnD from file windows to icons.
- *
- * - DnD from icons to desktop (move icon).
- *
- * - DnD from icons to windows.
- *
- * - DnD from icons to icons (file->directory or file->executable).
- *
- * - Popup menus for icons.
- *
- * - Select icons with rubberband on the root window.
- *
  */
 
 #include <config.h>

gnome/gdnd.c

@@ -375,7 +375,9 @@ gdnd_validate_action (GdkDragContext *context, int same_process, int same_source
 			return 0;
 
 		if (on_directory) {
-			if ((same_source || same_process) && (context->actions & GDK_ACTION_MOVE))
+			if ((same_source || same_process)
+			    && (context->actions & GDK_ACTION_MOVE)
+			    && context->suggested_action != GDK_ACTION_ASK)
 				return GDK_ACTION_MOVE;
 			else
 				return context->suggested_action;
@@ -384,14 +386,18 @@ gdnd_validate_action (GdkDragContext *context, int same_process, int same_source
 				return GDK_ACTION_COPY;
 		} else if (same_source)
 			return 0;
-		else if (same_process && (context->actions & GDK_ACTION_MOVE))
+		else if (same_process
+			 && (context->actions & GDK_ACTION_MOVE)
+			 && context->suggested_action != GDK_ACTION_ASK)
 			return GDK_ACTION_MOVE;
 		else
 			return context->suggested_action;
 	} else {
 		if (same_source)
 			return 0;
-		else if (same_process && (context->actions & GDK_ACTION_MOVE))
+		else if (same_process
+			 && (context->actions & GDK_ACTION_MOVE)
+			 && context->suggested_action != GDK_ACTION_ASK)
 			return GDK_ACTION_MOVE;
 		else
 			return context->suggested_action;

gnome/gscreen.c

@@ -691,7 +691,7 @@ panel_build_selected_file_list (WPanel *panel, int *file_list_len)
 
 		fullname = concat_dir_and_file (panel->cwd, panel->dir.list [panel->selected].fname);
 
-		uri = copy_strings ("file:", fullname, NULL);
+		uri = g_strconcat ("file:", fullname, NULL);
 		g_free (fullname);
 
 		*file_list_len = strlen (uri) + 1;
@@ -959,7 +959,15 @@ panel_clist_motion (GtkWidget *widget, GdkEventMotion *event, gpointer data)
 	if (event->window != GTK_CLIST (widget)->clist_window)
 		return FALSE;
 
-	return panel_widget_motion (widget, event, data);
+	panel_widget_motion (widget, event, data);
+
+	/* We have to stop the motion event from ever reaching the clist.
+	 * Otherwise it will begin dragging/selecting rows when we don't want
+	 * that.  Yes, the clist widget sucks.
+	 */
+
+	gtk_signal_emit_stop_by_name (GTK_OBJECT (widget), "motion_notify_event");
+	return TRUE;
 }
 
 /**
@@ -1717,7 +1725,7 @@ display_mini_info (WPanel *panel)
 		if (len > 0){
 			link_target [len] = 0;
 			/* FIXME: Links should be handled differently */
-			/* str = copy_strings ("-> ", link_target, NULL); */
+			/* str = g_strconcat ("-> ", link_target, NULL); */
 			gnome_appbar_pop (bar);
 			gnome_appbar_push (bar, " ");
 			/* g_free (str); */
@@ -2061,7 +2069,7 @@ panel_tree_drag_data_get (GtkWidget *widget, GdkDragContext *context,
 	switch (info){
 	case TARGET_URI_LIST:
 	case TARGET_TEXT_PLAIN:
-		data = copy_strings ("file:", dtree->drag_dir, NULL);
+		data = g_strconcat ("file:", dtree->drag_dir, NULL);
 		gtk_selection_data_set (
 			selection_data, selection_data->target, 8,
 			data, strlen (data)+1);

src/ChangeLog

@@ -1,3 +1,7 @@
+1999-01-26  Federico Mena Quintero  <federico@nuclecu.unam.mx>
+
+	* panel.h: Fixup #includes.
+
 1999-01-26  Miguel de Icaza  <miguel@nuclecu.unam.mx>
 
 	* cons.saver.c: Removed glib from the suid app

src/panel.h

@@ -1,8 +1,10 @@
 #ifndef __PANEL_H
 #define __PANEL_H
 
+#include "fs.h"
 #include "dir.h"     /* file_entry */
 #include "dlg.h"
+#include "util.h"
 #include "widget.h"	/* for history loading and saving */
 
 #define LIST_TYPES	5