Re: [cp-patches] Some more gtk-peer compiler warning fixes

[Mark Wielaard]

Hi Michael,

On Wed, 2004-10-27 at 09:25, Michael Koch wrote:
> This one is interesting as this method is not too much but just badly 
> named. The following patch would have been better:
> 
> -JNIEXPORT void JNICALL 
> Java_gnu_java_awt_peer_gtk_GdkGlyphVector_setText
> +JNIEXPORT void JNICALL 
> Java_gnu_java_awt_peer_gtk_GdkTextLayout_setText
>
> What do you think ?

Yes, you are right. I shouldn't be hacking so late at night...
Fixed as follows:

2004-10-27  Mark Wielaard  <address@hidden>

        * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c
        (Java_gnu_java_awt_peer_gtk_GdkTextLayout_setText): Installed and
        renamed from Java_gnu_java_awt_peer_gtk_GdkGlyphVector_setText.

Thanks. Your script will help not making such mistakes in the future.

Cheers,

Mark

Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c
===================================================================
RCS file: 
/cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c,v
retrieving revision 1.3
diff -u -r1.3 gnu_java_awt_peer_gtk_GdkTextLayout.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c   27 Oct 2004 
00:03:10 -0000      1.3
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c   27 Oct 2004 
09:26:26 -0000
@@ -65,6 +65,31 @@
   gdk_threads_leave ();
 }
 
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkTextLayout_setText
+  (JNIEnv *env, jobject self, jstring text)
+{
+  struct textlayout *tl;
+  gchar *str = NULL;
+  gint len = 0;
+
+  gdk_threads_enter ();
+  g_assert(self != NULL);
+  g_assert(text != NULL);
+
+  tl = (struct textlayout *)NSA_GET_TEXT_LAYOUT_PTR (env, self);
+  g_assert(tl != NULL);
+  g_assert(tl->pango_layout != NULL);
+  
+  len = (*env)->GetStringUTFLength (env, text);
+  str = (gchar *)(*env)->GetStringUTFChars (env, text, NULL);
+  g_assert (str != NULL);
+
+  pango_layout_set_text (tl->pango_layout, text, len);
+
+  (*env)->ReleaseStringUTFChars (env, text, str);
+  gdk_threads_leave ();  
+}
+
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkTextLayout_indexToPos
   (JNIEnv *env, jobject self, jint idx, jdoubleArray javaPos)
 {

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