Fail to get text from the clipboard when text is Latin-1 encoded but transfer data type is UTF8_STRING

Author: josediazfer

bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/Clipboard.java

@@ -290,33 +290,47 @@ public Object getContents(Transfer transfer) {
  * @since 3.1
  */
 public Object getContents(Transfer transfer, int clipboards) {
+	Object result;
+
 	checkWidget();
 	if (transfer == null) DND.error(SWT.ERROR_NULL_ARGUMENT);
 
 	if(GTK.GTK4) {
-		Object result = getContents_gtk4(transfer, clipboards);
-		return result;
+		result = getContents_gtk4(transfer, clipboards);
+	} else {
+		result = getContents_gtk3(transfer, clipboards);
 	}
+	return result;
+}
 
-	long selection_data = 0;
+private Object getContents_gtk3(Transfer transfer, int clipboards) {
+	boolean textTransfer = transfer.getTypeNames()[0].equals("UTF8_STRING");
 	int[] typeIds = transfer.getTypeIds();
+	Object result = null;
+
 	for (int i = 0; i < typeIds.length; i++) {
+		long selection_data = 0;
+
 		if ((clipboards & DND.CLIPBOARD) != 0) {
 			selection_data = gtk_clipboard_wait_for_contents(GTKCLIPBOARD, typeIds[i]);
 		}
-		if (selection_data != 0) break;
-		if ((clipboards & DND.SELECTION_CLIPBOARD) != 0) {
+		if (selection_data == 0 && (clipboards & DND.SELECTION_CLIPBOARD) != 0) {
 			selection_data = gtk_clipboard_wait_for_contents(GTKPRIMARYCLIPBOARD, typeIds[i]);
 		}
+		if (selection_data != 0) {
+			TransferData tdata = new TransferData();
+
+			tdata.type = GTK3.gtk_selection_data_get_data_type(selection_data);
+			tdata.pValue = GTK3.gtk_selection_data_get_data(selection_data);
+			tdata.length = GTK3.gtk_selection_data_get_length(selection_data);
+			tdata.format = GTK3.gtk_selection_data_get_format(selection_data);
+			result = transfer.nativeToJava(tdata);
+			GTK3.gtk_selection_data_free(selection_data);
+		}
+		if (result != null || !textTransfer) {
+			break;
+		}
 	}
-	if (selection_data == 0) return null;
-	TransferData tdata = new TransferData();
-	tdata.type = GTK3.gtk_selection_data_get_data_type(selection_data);
-	tdata.pValue = GTK3.gtk_selection_data_get_data(selection_data);
-	tdata.length = GTK3.gtk_selection_data_get_length(selection_data);
-	tdata.format = GTK3.gtk_selection_data_get_format(selection_data);
-	Object result = transfer.nativeToJava(tdata);
-	GTK3.gtk_selection_data_free(selection_data);
 	return result;
 }