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_GtkClipboard.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_GtkClipboard.c')
-rw-r--r-- | native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.c index 0c09aa5dc..3b54e839d 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.c @@ -92,7 +92,6 @@ Java_gnu_java_awt_peer_gtk_GtkClipboard_initNativeState (JNIEnv *env, jstring image, jstring files) { - //GdkDisplay* display; jboolean can_cache; gtk_clipboard_class = clz; @@ -137,7 +136,7 @@ Java_gnu_java_awt_peer_gtk_GtkClipboard_initNativeState (JNIEnv *env, cp_gtk_clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD); cp_gtk_selection = gtk_clipboard_get (GDK_SELECTION_PRIMARY); - //display = gtk_clipboard_get_display (cp_gtk_clipboard); + /* Check for support for clipboard owner changes. */ #if GTK_MINOR_VERSION > 4 GdkDisplay* display; @@ -185,7 +184,6 @@ clipboard_get_func (GtkClipboard *clipboard, jint len; jbyte *barray; - //target_name = gdk_atom_name (selection->target); target_name = gdk_atom_name (gtk_selection_data_get_target(selection)); if (target_name == NULL) return; @@ -205,8 +203,7 @@ clipboard_get_func (GtkClipboard *clipboard, barray = (*env)->GetByteArrayElements(env, bytes, NULL); if (barray == NULL) return; - //gtk_selection_data_set (selection, selection->target, 8, - gtk_selection_data_set (selection, gtk_selection_data_get_target(selection), 8, + gtk_selection_data_set (selection, gtk_selection_data_get_target(selection), 8, (guchar *) barray, len); (*env)->ReleaseByteArrayElements(env, bytes, barray, 0); |