diff --git a/ChangeLog b/ChangeLog index 36bb8be611..d76f221fcd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-06-17 Tor Lillqvist + + * gdk/win32/gdkdnd-win32.c (gdk_dropfiles_filter): Set the actions + and suggested_action fields in the GdkDragContext to + GDK_ACTION_COPY. Otherwise apps that check the suggested_action + field, like eog, won't accept dropped files. + 2005-06-17 Matthias Clasen * gdk/gdkcursor.h: Define GDK_IS_CURSOR() and GDK_CURSOR(). diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 36bb8be611..d76f221fcd 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +2005-06-17 Tor Lillqvist + + * gdk/win32/gdkdnd-win32.c (gdk_dropfiles_filter): Set the actions + and suggested_action fields in the GdkDragContext to + GDK_ACTION_COPY. Otherwise apps that check the suggested_action + field, like eog, won't accept dropped files. + 2005-06-17 Matthias Clasen * gdk/gdkcursor.h: Define GDK_IS_CURSOR() and GDK_CURSOR(). diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 36bb8be611..d76f221fcd 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +2005-06-17 Tor Lillqvist + + * gdk/win32/gdkdnd-win32.c (gdk_dropfiles_filter): Set the actions + and suggested_action fields in the GdkDragContext to + GDK_ACTION_COPY. Otherwise apps that check the suggested_action + field, like eog, won't accept dropped files. + 2005-06-17 Matthias Clasen * gdk/gdkcursor.h: Define GDK_IS_CURSOR() and GDK_CURSOR(). diff --git a/gdk/win32/gdkdnd-win32.c b/gdk/win32/gdkdnd-win32.c index 1a02193567..346a894538 100644 --- a/gdk/win32/gdkdnd-win32.c +++ b/gdk/win32/gdkdnd-win32.c @@ -978,6 +978,8 @@ gdk_dropfiles_filter (GdkXEvent *xev, /* WM_DROPFILES drops are always file names */ context->targets = g_list_append (NULL, GUINT_TO_POINTER (_text_uri_list)); + context->actions = GDK_ACTION_COPY; + context->suggested_action = GDK_ACTION_COPY; current_dest_drag = context; event->dnd.type = GDK_DROP_START;