gtk+ r22141 - in trunk: . gtk

[matthiasc svn gnome org]

Author: matthiasc
Date: Mon Jan 19 05:15:57 2009
New Revision: 22141
URL: http://svn.gnome.org/viewvc/gtk+?rev=22141&view=rev

Log:
        * gtk/gtkselection.c (gtk_selection_data_get_targets): Accept
        a type of TARGETS instead of ATOM, too. Based on a patch by
        Peng Wu.



Modified:
   trunk/ChangeLog
   trunk/gtk/gtkselection.c

Modified: trunk/gtk/gtkselection.c
==============================================================================
--- trunk/gtk/gtkselection.c	(original)
+++ trunk/gtk/gtkselection.c	Mon Jan 19 05:15:57 2009
@@ -1814,9 +1814,12 @@
 {
   g_return_val_if_fail (selection_data != NULL, FALSE);
 
+  /* As usual, java gets it wrong and sets the type to TARGETS, not ATOM 
+   */
   if (selection_data->length >= 0 &&
       selection_data->format == 32 &&
-      selection_data->type == GDK_SELECTION_TYPE_ATOM)
+      (selection_data->type == GDK_SELECTION_TYPE_ATOM ||
+       selection_data->type == gtk_selection_atoms[TARGETS]))
     {
       if (targets)
 	*targets = g_memdup (selection_data->data, selection_data->length);