diff options
author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2013-09-19 01:52:11 +0100 |
---|---|---|
committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2013-09-19 01:52:11 +0100 |
commit | 83099328aea260f71cd0b14e23eac7844668a6f7 (patch) | |
tree | 4bda95e968e51546ae04109365aab11d80ca7d94 /native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkSelection.c | |
parent | 49cd8434d19c10e9128a8b19ddc7abfc909e760c (diff) | |
parent | 848e38a011eb5ae3e0c715253f37d0b4a412b032 (diff) | |
download | classpath-83099328aea260f71cd0b14e23eac7844668a6f7.tar.gz |
Merge branch 'gtk3' of git.sv.gnu.org:/srv/git/classpath into gtk3
Diffstat (limited to 'native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkSelection.c')
-rw-r--r-- | native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkSelection.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkSelection.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkSelection.c index b845aebdc..f244ac28f 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkSelection.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkSelection.c @@ -61,7 +61,6 @@ clipboard_targets_received (GtkClipboard *clipboard jobject selection_obj = (jobject) selection; JNIEnv *env = cp_gtk_gdk_env (); - //if (target_data != NULL && target_data->length > 0) if (target_data != NULL && gtk_selection_data_get_length(target_data) > 0) { include_text = gtk_selection_data_targets_include_text (target_data); @@ -426,15 +425,11 @@ clipboard_bytes_received (GtkClipboard *clipboard jobject selection_obj = (jobject) selection; JNIEnv *env = cp_gtk_gdk_env (); - //if (selection_data != NULL && selection_data->length > 0) if (selection_data != NULL && gtk_selection_data_get_length(selection_data) > 0) { - //bytes = (*env)->NewByteArray (env, selection_data->length); bytes = (*env)->NewByteArray (env, gtk_selection_data_get_length(selection_data)); if (bytes != NULL) - /*(*env)->SetByteArrayRegion(env, bytes, 0, selection_data->length, - (jbyte *) selection_data->data);*/ - (*env)->SetByteArrayRegion(env, bytes, 0, gtk_selection_data_get_length(selection_data), + (*env)->SetByteArrayRegion(env, bytes, 0, gtk_selection_data_get_length(selection_data), (jbyte *) gtk_selection_data_get_data(selection_data)); } |