From a458622eb010721f6bc8be14659bd218571deabc Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Sat, 12 Jun 2004 18:31:49 +0000 Subject: [PATCH] add the file DND destination before all others so the DND code will 2004-06-12 Michael Natterer * app/display/gimpdisplayshell.c (gimp_display_shell_init): add the file DND destination before all others so the DND code will implicitly use its destination properties. Works around Konqueror offering only file MOVE, not COPY and fixes bug #144168. --- ChangeLog | 7 ++++++ app/display/gimpdisplayshell.c | 40 +++++++++++++++++----------------- 2 files changed, 27 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index f1a92b6e80..d53f7cc310 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2004-06-12 Michael Natterer + + * app/display/gimpdisplayshell.c (gimp_display_shell_init): add + the file DND destination before all others so the DND code will + implicitly use its destination properties. Works around Konqueror + offering only file MOVE, not COPY and fixes bug #144168. + 2004-06-12 Sven Neumann * plug-ins/common/sample_colorize.c: reindented, some minor cleanup. diff --git a/app/display/gimpdisplayshell.c b/app/display/gimpdisplayshell.c index c6ccaa64ea..d6cd9fb1b5 100644 --- a/app/display/gimpdisplayshell.c +++ b/app/display/gimpdisplayshell.c @@ -334,49 +334,49 @@ gimp_display_shell_init (GimpDisplayShell *shell) /* active display callback */ g_signal_connect (shell, "button_press_event", - G_CALLBACK (gimp_display_shell_events), - shell); + G_CALLBACK (gimp_display_shell_events), + shell); g_signal_connect (shell, "button_release_event", - G_CALLBACK (gimp_display_shell_events), - shell); + G_CALLBACK (gimp_display_shell_events), + shell); g_signal_connect (shell, "key_press_event", - G_CALLBACK (gimp_display_shell_events), - shell); + G_CALLBACK (gimp_display_shell_events), + shell); g_signal_connect (shell, "window_state_event", - G_CALLBACK (gimp_display_shell_events), - shell); + G_CALLBACK (gimp_display_shell_events), + shell); /* dnd stuff */ + gimp_dnd_file_dest_add (GTK_WIDGET (shell), + gimp_display_shell_drop_files, + shell); gimp_dnd_viewable_dest_add (GTK_WIDGET (shell), GIMP_TYPE_LAYER, - gimp_display_shell_drop_drawable, + gimp_display_shell_drop_drawable, shell); gimp_dnd_viewable_dest_add (GTK_WIDGET (shell), GIMP_TYPE_LAYER_MASK, - gimp_display_shell_drop_drawable, + gimp_display_shell_drop_drawable, shell); gimp_dnd_viewable_dest_add (GTK_WIDGET (shell), GIMP_TYPE_CHANNEL, - gimp_display_shell_drop_drawable, + gimp_display_shell_drop_drawable, shell); gimp_dnd_svg_dest_add (GTK_WIDGET (shell), - gimp_display_shell_drop_svg, + gimp_display_shell_drop_svg, shell); gimp_dnd_viewable_dest_add (GTK_WIDGET (shell), GIMP_TYPE_VECTORS, - gimp_display_shell_drop_vectors, + gimp_display_shell_drop_vectors, shell); gimp_dnd_viewable_dest_add (GTK_WIDGET (shell), GIMP_TYPE_PATTERN, - gimp_display_shell_drop_pattern, + gimp_display_shell_drop_pattern, shell); gimp_dnd_viewable_dest_add (GTK_WIDGET (shell), GIMP_TYPE_BUFFER, - gimp_display_shell_drop_buffer, + gimp_display_shell_drop_buffer, shell); gimp_dnd_color_dest_add (GTK_WIDGET (shell), - gimp_display_shell_drop_color, - shell); - gimp_dnd_file_dest_add (GTK_WIDGET (shell), - gimp_display_shell_drop_files, + gimp_display_shell_drop_color, shell); gimp_help_connect (GTK_WIDGET (shell), gimp_standard_help_func, - GIMP_HELP_IMAGE_WINDOW, NULL); + GIMP_HELP_IMAGE_WINDOW, NULL); } static void