Fix issues with building with -Werror and gcc 4.6.

2011-06-27  Andrew John Hughes  <ahughes@redhat.com>

	Fix issues with building with -Werror and gcc 4.6.
	* native/jni/gtk-peer/GtkDragSourceContextPeer.c:
	(Java_gnu_java_awt_dnd_peer_gtk_GtkDragSourceContextPeer_nativeSetCursor):
	Remove unused ptr variable and mark env as unused.
	(connect_signals_for_widget(GtkWidget*)): Mark w unused and don't set it.
	(Java_gnu_java_awt_dnd_peer_gtk_GtkDragSourceContextPeer_nativeStartDrag):
	Remove unused ptr variable.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c:
	(Java_gnu_java_awt_peer_gtk_ComponentGraphics_initState):
	Remove unused width and height variables.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkRobotPeer.c:
	(Java_gnu_java_awt_peer_gtk_GdkRobotPeer_mouseMove):
	Check result of XTestFakeMotionEvent call.
	(Java_gnu_java_awt_peer_gtk_GdkRobotPeer_mousePress): Likewise for
	XTestFakeButtonEvent call.
	(Java_gnu_java_awt_peer_gtk_GdkRobotPeer_mouseRelease): Likewise.
	(Java_gnu_java_awt_peer_gtk_GdkRobotPeer_keyPress): Use g_message
	instead of deprecated g_printerr.  Check result of XTestFakeKeyEvent.
	(Java_gnu_java_awt_peer_gtk_GdkRobotPeer_keyRelease): Likewise.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c:
	(Java_gnu_java_awt_peer_gtk_GtkPopupMenuPeer_setupAccelGroup):
	Completely disable code to attach parent, including use of ptr2
	and parent argument, and reinstate original FIXME to explain why.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c:
	(Java_gnu_java_awt_peer_gtk_GtkVolatileImage_nativeGetPixels):
	Remove unused depth variable.
	* native/jni/midi-alsa/gnu_javax_sound_midi_alsa_AlsaPortDevice.c,
	(Java_gnu_javax_sound_midi_alsa_AlsaPortDevice_run_1receiver_1thread_1):
	Check return values and throw an InternalError if a problem occurs.

7 files changed, 62 insertions, 19 deletions

diff --git a/ChangeLog b/ChangeLog
index 36ef6c6b9..d2e5ccc82 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,35 @@
+2011-06-27  Andrew John Hughes  <ahughes@redhat.com>
+
+	Fix issues with building with -Werror and gcc 4.6.
+	* native/jni/gtk-peer/GtkDragSourceContextPeer.c:
+	(Java_gnu_java_awt_dnd_peer_gtk_GtkDragSourceContextPeer_nativeSetCursor):
+	Remove unused ptr variable and mark env as unused.
+	(connect_signals_for_widget(GtkWidget*)): Mark w unused and don't set it.
+	(Java_gnu_java_awt_dnd_peer_gtk_GtkDragSourceContextPeer_nativeStartDrag):
+	Remove unused ptr variable.
+	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c:
+	(Java_gnu_java_awt_peer_gtk_ComponentGraphics_initState):
+	Remove unused width and height variables.
+	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkRobotPeer.c:
+	(Java_gnu_java_awt_peer_gtk_GdkRobotPeer_mouseMove):
+	Check result of XTestFakeMotionEvent call.
+	(Java_gnu_java_awt_peer_gtk_GdkRobotPeer_mousePress): Likewise for
+	XTestFakeButtonEvent call.
+	(Java_gnu_java_awt_peer_gtk_GdkRobotPeer_mouseRelease): Likewise.
+	(Java_gnu_java_awt_peer_gtk_GdkRobotPeer_keyPress): Use g_message
+	instead of deprecated g_printerr.  Check result of XTestFakeKeyEvent.
+	(Java_gnu_java_awt_peer_gtk_GdkRobotPeer_keyRelease): Likewise.
+	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c:
+	(Java_gnu_java_awt_peer_gtk_GtkPopupMenuPeer_setupAccelGroup):
+	Completely disable code to attach parent, including use of ptr2
+	and parent argument, and reinstate original FIXME to explain why.
+	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c:
+	(Java_gnu_java_awt_peer_gtk_GtkVolatileImage_nativeGetPixels):
+	Remove unused depth variable.
+	* native/jni/midi-alsa/gnu_javax_sound_midi_alsa_AlsaPortDevice.c,
+	(Java_gnu_javax_sound_midi_alsa_AlsaPortDevice_run_1receiver_1thread_1):
+	Check return values and throw an InternalError if a problem occurs.
+
 2011-05-29  Pekka Enberg  <penberg@kernel.org>
 
 	* lib/Makefile.am:
diff --git a/native/jni/gtk-peer/GtkDragSourceContextPeer.c b/native/jni/gtk-peer/GtkDragSourceContextPeer.c
index aee61bd08..b8f1ba5b2 100644
--- a/native/jni/gtk-peer/GtkDragSourceContextPeer.c
+++ b/native/jni/gtk-peer/GtkDragSourceContextPeer.c
@@ -99,9 +99,8 @@ Java_gnu_java_awt_dnd_peer_gtk_GtkDragSourceContextPeer_create
 
 JNIEXPORT void JNICALL 
 Java_gnu_java_awt_dnd_peer_gtk_GtkDragSourceContextPeer_nativeSetCursor
-  (JNIEnv *env, jobject obj, jint type)
+  (JNIEnv *env __attribute__((unused)), jobject obj, jint type)
 {
-  void *ptr;
   GdkWindow *win;
   GdkCursorType gdk_cursor_type;
   GdkCursor *gdk_cursor;
@@ -109,7 +108,6 @@ Java_gnu_java_awt_dnd_peer_gtk_GtkDragSourceContextPeer_nativeSetCursor
   gdk_threads_enter ();
 
   javaObj = obj;
-  ptr = gtkpeer_get_global_ref (env, obj);
   
   switch (type)
     {
@@ -230,10 +228,9 @@ Java_gnu_java_awt_dnd_peer_gtk_GtkDragSourceContextPeer_connectSignals
 }
 
 static void
-connect_signals_for_widget (GtkWidget *w)
+connect_signals_for_widget (GtkWidget *w __attribute__((unused)))
 {
   /* FIXME: Not implemented. */
-  w = NULL;
 }
 
 JNIEXPORT void JNICALL 
@@ -257,7 +254,6 @@ Java_gnu_java_awt_dnd_peer_gtk_GtkDragSourceContextPeer_nativeStartDrag
   (JNIEnv *env, jobject obj, jobject img, jint x, jint y, jint act,
    jstring target)
 {
-  void *ptr;
   const gchar *data;
   GtkTargetEntry tar[1];
   GdkEvent *event;
@@ -268,7 +264,6 @@ Java_gnu_java_awt_dnd_peer_gtk_GtkDragSourceContextPeer_nativeStartDrag
   gdk_threads_enter ();
   
   javaObj = obj;
-  ptr = gtkpeer_get_global_ref (env, obj);
 
   data = (*env)->GetStringUTFChars (env, target, NULL);
   tar[0].target = (gchar *) data;  
diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c
index 3364640a0..31bab77d4 100644
--- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c
+++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c
@@ -121,7 +121,6 @@ Java_gnu_java_awt_peer_gtk_ComponentGraphics_initState
 {
   GdkDrawable *drawable;
   GtkWidget *widget;
-  int width, height;
   cairo_t *cr;
   void *ptr;
 
@@ -136,9 +135,6 @@ Java_gnu_java_awt_peer_gtk_ComponentGraphics_initState
   drawable = widget->window;
   g_assert (drawable != NULL);
 
-  width = widget->allocation.width;
-  height = widget->allocation.height;
-
   cr = gdk_cairo_create(drawable);
 
   g_assert(cr != NULL);
diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkRobotPeer.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkRobotPeer.c
index 4240f112e..ea9c1d6e8 100644
--- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkRobotPeer.c
+++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkRobotPeer.c
@@ -120,6 +120,8 @@ Java_gnu_java_awt_peer_gtk_GdkRobotPeer_mouseMove
   result = XTestFakeMotionEvent (xdisplay,
 				 -1,
 				 x, y, CurrentTime);
+  if (result)
+    g_warning("XTestFakeMotionEvent returned %d\n", result);
 
   XFlush (xdisplay);
 
@@ -153,6 +155,8 @@ Java_gnu_java_awt_peer_gtk_GdkRobotPeer_mousePress
   result = XTestFakeButtonEvent (xdisplay,
 				 awt_button_mask_to_num (buttons),
 				 True, CurrentTime);
+  if (result)
+    g_warning("XTestFakeButtonEvent returned %d\n", result);
 
   XFlush (xdisplay);
 
@@ -185,6 +189,8 @@ Java_gnu_java_awt_peer_gtk_GdkRobotPeer_mouseRelease
   result = XTestFakeButtonEvent (xdisplay,
 				 awt_button_mask_to_num (buttons),
 				 False, CurrentTime);
+  if (result)
+    g_warning("XTestFakeButtonEvent returned %d\n", result);
 
   XFlush (xdisplay);
 
@@ -275,7 +281,7 @@ Java_gnu_java_awt_peer_gtk_GdkRobotPeer_keyPress
                                           &n_keys))
     {
       /* No matching keymap entry was found. */
-      g_printerr ("No matching keymap entries were found\n");
+      g_message ("No matching keymap entries were found\n");
       gdk_threads_leave ();
       return;
     }
@@ -287,6 +293,8 @@ Java_gnu_java_awt_peer_gtk_GdkRobotPeer_keyPress
   result = XTestFakeKeyEvent (xdisplay,
 			      keymap_keys[0].keycode,
 			      True, CurrentTime);
+  if (result)
+    g_warning("XTestFakeKeyEvent returned %d\n", result);
 
   g_free (keymap_keys);
 
@@ -330,7 +338,7 @@ Java_gnu_java_awt_peer_gtk_GdkRobotPeer_keyRelease
                                           &n_keys))
     {
       /* No matching keymap entry was found. */
-      g_printerr ("No matching keymap entries were found\n");
+      g_message ("No matching keymap entries were found\n");
       gdk_threads_leave ();
       return;
     }
@@ -342,6 +350,8 @@ Java_gnu_java_awt_peer_gtk_GdkRobotPeer_keyRelease
   result = XTestFakeKeyEvent (xdisplay,
 			      keymap_keys[0].keycode,
 			      False, CurrentTime);
+  if (result)
+    g_warning("XTestFakeKeyEvent returned %d\n", result);
 
   g_free (keymap_keys);
 
diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c
index b7b1c3322..0511c051a 100644
--- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c
+++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c
@@ -83,20 +83,25 @@ Java_gnu_java_awt_peer_gtk_GtkPopupMenuPeer_show
 
 JNIEXPORT void JNICALL 
 Java_gnu_java_awt_peer_gtk_GtkPopupMenuPeer_setupAccelGroup
-  (JNIEnv *env, jobject obj, jobject parent)
+  (JNIEnv *env, jobject obj, jobject parent __attribute__((unused)))
 {
-  void *ptr1, *ptr2;
+  void *ptr1;
   GtkMenu *menu;
+#if 0
+  void *ptr2;
+#endif
 
   gdk_threads_enter ();
 
   ptr1 = gtkpeer_get_widget (env, obj);
-  ptr2 = gtkpeer_get_widget (env, parent);
 
   menu = GTK_MENU (GTK_MENU_ITEM (ptr1)->submenu);
   gtk_menu_set_accel_group (menu, gtk_accel_group_new ());
   /* FIXME: update this to use GTK-2.4 GtkActions. */
+  // FIXME: _gtk_accel_group_attach is a GTK-private function, so
+  // we'll need a different approach here
 #if 0
+  ptr2 = gtkpeer_get_widget (env, parent);
   _gtk_accel_group_attach (gtk_menu_get_accel_group (menu),
 			   G_OBJECT (gtk_widget_get_toplevel (ptr2)));
 #endif
diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c
index 50197cab0..af0868cc2 100644
--- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c
+++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c
@@ -110,7 +110,7 @@ Java_gnu_java_awt_peer_gtk_GtkVolatileImage_nativeGetPixels
   GdkPixmap *pixmap;
   GdkPixbuf *pixbuf;
   jintArray jpixels;
-  int width, height, depth, size;
+  int width, height, size;
   jclass cls;
   jfieldID field;
   guchar *pixels;
@@ -129,8 +129,6 @@ Java_gnu_java_awt_peer_gtk_GtkVolatileImage_nativeGetPixels
 
   gdk_threads_enter();
 
-  /* get depth in bytes */
-  depth = gdk_drawable_get_depth( pixmap ) >> 3;
   size = width * height;
   jpixels = (*env)->NewIntArray ( env, size );
   jpixdata = (*env)->GetIntArrayElements (env, jpixels, NULL);
diff --git a/native/jni/midi-alsa/gnu_javax_sound_midi_alsa_AlsaPortDevice.c b/native/jni/midi-alsa/gnu_javax_sound_midi_alsa_AlsaPortDevice.c
index f4f8dd84a..a3c39e455 100644
--- a/native/jni/midi-alsa/gnu_javax_sound_midi_alsa_AlsaPortDevice.c
+++ b/native/jni/midi-alsa/gnu_javax_sound_midi_alsa_AlsaPortDevice.c
@@ -41,6 +41,7 @@ exception statement from your version. */
 #include <gnu_javax_sound_midi_alsa_AlsaPortDevice.h>
 #include <unistd.h>
 
+#include <jcl.h>
 #include <alsa/asoundlib.h>
 
 JNIEXPORT void JNICALL
@@ -59,11 +60,15 @@ Java_gnu_javax_sound_midi_alsa_AlsaPortDevice_run_1receiver_1thread_1
   snd_seq_port_subscribe_alloca (&subs);
 
   rc = snd_seq_open (&seq, "default", SND_SEQ_OPEN_DUPLEX, SND_SEQ_NONBLOCK);
+  if (rc < 0)
+    JCL_ThrowException (env, "java/lang/InternalError", snd_strerror (rc));
 
   snd_seq_port_info_set_capability (pinfo, SND_SEQ_PORT_CAP_WRITE);
   snd_seq_port_info_set_type (pinfo, SND_SEQ_PORT_TYPE_MIDI_GENERIC);
 
   rc = snd_seq_create_port (seq, pinfo);
+  if (rc < 0)
+    JCL_ThrowException (env, "java/lang/InternalError", snd_strerror (rc));
 
   sender.client = (int) client;
   sender.port = (int) port;
@@ -73,6 +78,8 @@ Java_gnu_javax_sound_midi_alsa_AlsaPortDevice_run_1receiver_1thread_1
   snd_seq_port_subscribe_set_sender (subs, &sender);
   snd_seq_port_subscribe_set_dest (subs, &dest);
   rc = snd_seq_subscribe_port(seq, subs);
+  if (rc < 0)
+    JCL_ThrowException (env, "java/lang/InternalError", snd_strerror (rc));
 
   {
     int npfd;