From: Matthias Clasen <mclasen@redhat.com>
Date: Sat, 28 Nov 2009 15:27:32 +0000 (-0500)
Subject: Rework a broken workaround for a Java bug
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=6dfb21e616bdf1e1db7ed86bff08fcb68210f17e;p=~andy%2Fgtk

Rework a broken workaround for a Java bug

This was committed to fix bug 568263, but it is not correct, as
pointed out in 601611.
---

diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c
index f6187b21c..541d5e5d9 100644
--- a/gtk/gtkselection.c
+++ b/gtk/gtkselection.c
@@ -1815,12 +1815,9 @@ gtk_selection_data_get_targets (GtkSelectionData  *selection_data,
 {
   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 == gtk_selection_atoms[TARGETS]))
+      selection_data->type == GDK_SELECTION_TYPE_ATOM)
     {
       if (targets)
 	*targets = g_memdup (selection_data->data, selection_data->length);