[git] GPA - branch, master, updated. gpa-0.9.9-6-g774dbff

[by Justus Winter]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Assistant".

The branch, master has been updated
       via  774dbffef812c23caa6d76001f10ae184b0e36b1 (commit)
      from  b9efe75ab7addb2eecd8e2274ed8907b9f6a3712 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 774dbffef812c23caa6d76001f10ae184b0e36b1
Author: Justus Winter <justus at g10code.com>
Date:   Mon Jul 18 17:26:16 2016 +0200

    Fix drag-and-drop.
    
    * src/fileman.c (dnd_drop_handler): Instead of hard-coding the
    position of the expected target (which may crash if the list is
    shorter), look for the expected target in the list supplied by the
    source window.
    
    GnuPG-bug-id: 2413
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/src/fileman.c b/src/fileman.c
index cd00d0c..10824d4 100644
--- a/src/fileman.c
+++ b/src/fileman.c
@@ -656,13 +656,12 @@ static gboolean
 dnd_drop_handler (GtkWidget *widget, GdkDragContext *context,
                   gint x, gint y, guint tim, gpointer user_data)
 {
-  GdkAtom  target_type;
+  GdkAtom target_type = gdk_atom_intern ("text/uri-list", FALSE);
 
   /* If the source offers a target we request the data from her. */
-  if (context->targets)
+  if (context->targets && g_list_find (context->targets,
+                                       GDK_ATOM_TO_POINTER (target_type)))
     {
-      target_type = GDK_POINTER_TO_ATOM
-        (g_list_nth_data (context->targets, DND_TARGET_URI_LIST));
       gtk_drag_get_data (widget, context, target_type, tim);
 
       return TRUE;

-----------------------------------------------------------------------

Summary of changes:
 src/fileman.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Assistant
http://git.gnupg.org