From 793afd03debce04f96e11dac27995f137accf195 Mon Sep 17 00:00:00 2001 From: Miguel de Icaza Date: Thu, 11 Feb 1999 18:02:07 +0000 Subject: [PATCH] 1999-02-11 Federico Mena Quintero * gdnd.c (drop_on_directory): Do not ask for the action twice. This was a leftover from a bit of code reorganization. --- gnome/ChangeLog | 3 +++ gnome/gdnd.c | 15 +++------------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/gnome/ChangeLog b/gnome/ChangeLog index 1fcc11a55..a15f8461d 100644 --- a/gnome/ChangeLog +++ b/gnome/ChangeLog @@ -1,5 +1,8 @@ 1999-02-11 Federico Mena Quintero + * gdnd.c (drop_on_directory): Do not ask for the action twice. + This was a leftover from a bit of code reorganization. + * gscreen.c (panel_icon_list_button_press): Fixed "=" -> "!=" typo. diff --git a/gnome/gdnd.c b/gnome/gdnd.c index 0f3882153..392640cb0 100644 --- a/gnome/gdnd.c +++ b/gnome/gdnd.c @@ -289,18 +289,9 @@ drop_url_on_directory (GdkDragContext *context, GtkSelectionData *selection_data /* Drop stuff on a directory */ static int -drop_on_directory (GdkDragContext *context, GtkSelectionData *selection_data, char *destdir) +drop_on_directory (GdkDragContext *context, GtkSelectionData *selection_data, + GdkDragAction action, char *destdir) { - GdkDragAction action; - - if (context->action == GDK_ACTION_ASK) { - action = get_action (context); - - if (action == GDK_ACTION_ASK) - return FALSE; - } else - action = context->action; - if (gdnd_drag_context_has_target (context, TARGET_URI_LIST)) drop_uri_list_on_directory (context, selection_data, action, destdir); else if (gdnd_drag_context_has_target (context, TARGET_URL)) @@ -402,7 +393,7 @@ gdnd_perform_drop (GdkDragContext *context, GtkSelectionData *selection_data, action = context->action; if (S_ISDIR (dest_fe->buf.st_mode) || dest_fe->f.link_to_dir) - return drop_on_directory (context, selection_data, dest_name); + return drop_on_directory (context, selection_data, action, dest_name); else return drop_on_file (context, selection_data, dest_fe, dest_name); }