[kaffe] CVS kaffe (robilad): resynced with gnu classpath: awt fix

Kaffe CVS cvs-commits at kaffe.org
Thu May 26 05:45:02 PDT 2005


PatchSet 6578 
Date: 2005/05/26 12:36:11
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with gnu classpath: awt fix

Members: 
	ChangeLog:1.4105->1.4106 
	libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c:1.4->1.5 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4105 kaffe/ChangeLog:1.4106
--- kaffe/ChangeLog:1.4105	Thu May 26 12:32:42 2005
+++ kaffe/ChangeLog	Thu May 26 12:36:11 2005
@@ -1,6 +1,15 @@
 2005-05-26  Dalibor Topic  <robilad at kaffe.org>
 
         Resynced with GNU Classpath.
+
+	2005-05-25  Michael Koch  <konqueror at gmx.de>
+
+	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c
+	(connetJObject): Removed.
+
+2005-05-26  Dalibor Topic  <robilad at kaffe.org>
+
+        Resynced with GNU Classpath.
 	
 	2005-05-25  Michael Koch  <konqueror at gmx.de>
 
Index: kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c
diff -u kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c:1.4 kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c:1.5
--- kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c:1.4	Thu May 26 12:20:23 2005
+++ kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c	Thu May 26 12:36:12 2005
@@ -83,21 +83,6 @@
 }
 
 JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_connectJObject
-  (JNIEnv *env, jobject obj)
-{
-  void *ptr;
-
-  ptr = NSA_GET_PTR (env, obj);
-
-  gdk_threads_enter ();
-
-  connect_awt_hook (env, obj, 1, GTK_WIDGET (ptr)->window);
-
-  gdk_threads_leave ();
-}
-
-JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_connectSignals
   (JNIEnv *env, jobject obj)
 {




More information about the kaffe mailing list