summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>2006-08-09 17:38:38 +0000
committerTom Tromey <tromey@redhat.com>2006-08-09 17:38:38 +0000
commit32331082a0308dd5b0d291302fc2bfef138e3a07 (patch)
treebf88d5425396801687fc0f905967b423212c1c80
parent2c561b3523b5f3f5a44ebae6533d682613d309e8 (diff)
downloadclasspath-32331082a0308dd5b0d291302fc2bfef138e3a07.tar.gz
PR classpath/28666:
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.c (Java_gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice_nativeGetDisplayModes): Create a 'short' array.
-rw-r--r--ChangeLog7
-rw-r--r--native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.c4
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d1a7d33a1..4cfab2259 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2006-08-09 Tom Tromey <tromey@redhat.com>
+ PR classpath/28666:
+ * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.c
+ (Java_gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice_nativeGetDisplayModes):
+ Create a 'short' array.
+
+2006-08-09 Tom Tromey <tromey@redhat.com>
+
* tools/gnu/classpath/tools/javah/JniHelper.java (getName): Properly
handle arrays.
* tools/gnu/classpath/tools/javah/JniIncludePrinter.java
diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.c
index 965fb5a23..4053ad8b6 100644
--- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.c
+++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.c
@@ -248,8 +248,8 @@ Java_gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice_nativeGetDisplayModes
/* Retrieves refresh rate information. */
rates = XRRConfigRates(config, i, &nrates);
- /* Create a Java int array and put them in. */
- shortArray = (*env)->NewIntArray(env, nrates);
+ /* Create a Java short array and put them in. */
+ shortArray = (*env)->NewShortArray(env, nrates);
(*env)->SetShortArrayRegion(env, shortArray, 0, nrates, (jshort *) rates);
/* Create a GdkScreenGraphicsDevice.X11DisplayMode instance. */