This is the mail archive of the java-patches@gcc.gnu.org mailing list for the Java project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

FYI [gui] GtkComponentPeer compile fixlet from GNU Classpath


Hi,

This imports a small compile fixlet from GNU Classpath.

2004-07-31  Mark Wielaard  <mark@klomp.org>
 
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
	(Java_gnu_java_awt_peer_gtk_GtkComponentPeer_addExposeFilter):
	Define hid at start of function.
	(Java_gnu_java_awt_peer_gtk_GtkComponentPeer_removeExposeFilter):
	Likewise.

Committed to the gui branch.

Mark

Index: jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
===================================================================
RCS file:
/cvs/gcc/gcc/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c,v
retrieving revision 1.15.2.21
diff -u -r1.15.2.21 gnu_java_awt_peer_gtk_GtkComponentPeer.c
--- jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c	30 Jul 2004
19:48:34 -0000	1.15.2.21
+++ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c	31 Jul 2004
21:31:05 -0000
@@ -1044,6 +1044,7 @@
   GList *children;
   void *ptr = NSA_GET_PTR (env, obj);
   jobject *gref = NSA_GET_GLOBAL_REF (env, obj);
+  gulong hid;
 
   g_assert (gref);
 
@@ -1077,10 +1078,9 @@
     {
       filterobj = GTK_OBJECT(ptr);
     }
-
-  gulong hid = g_signal_handler_find(filterobj,
-                                     G_SIGNAL_MATCH_FUNC,
-                                     0, 0, NULL, *pre_event_handler,
NULL);
+  hid = g_signal_handler_find(filterobj,
+                              G_SIGNAL_MATCH_FUNC,
+                              0, 0, NULL, *pre_event_handler, NULL);
   if (hid > 0)
   {
     g_signal_handler_block(filterobj, hid);
@@ -1099,6 +1099,7 @@
   GList *children;
   void *ptr = NSA_GET_PTR (env, obj);
   jobject *gref = NSA_GET_GLOBAL_REF (env, obj);
+  gulong hid;
 
   g_assert (gref);
 
@@ -1135,9 +1136,9 @@
 
   g_signal_handlers_disconnect_by_func (filterobj,
                                         *filter_expose_event_handler,
*gref);
-  gulong hid = g_signal_handler_find(filterobj,
-                                     G_SIGNAL_MATCH_FUNC,
-                                     0, 0, NULL, *pre_event_handler,
NULL);
+  hid = g_signal_handler_find(filterobj,
+                              G_SIGNAL_MATCH_FUNC,
+                              0, 0, NULL, *pre_event_handler, NULL);
   if (hid > 0)
   {
     g_signal_handler_unblock(filterobj, hid);

Attachment: signature.asc
Description: This is a digitally signed message part


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]