[cp-patches] Re: [patch] prefix CairoGraphics2D_getCairoT correctly

Andreas Tobler toa at pop.agri.ch
Wed May 31 22:18:04 UTC 2006


Thomas Fitzsimmons wrote:

>> -  cr = CairoGraphics2D_getCairoT(env, cairographics);
>> +  cr = Java_gnu_java_awt_peer_gtk_CairoGraphics2D_getCairoT(env, 
>> cairographics);
> 
> Shouldn't the prefix be cp_gtk_ since this is not a JNI method 
> implementation?

Gosh, I got disturbed by my youngest being hungry.
Sure.


Better ?

Andreas

2006-06-01  Andreas Tobler  <a.tobler at schweiz.ch>

	* native/jni/gtk-peer/cairographics2d.h: Rename/prefix function
	CairoGraphics2D_getCairoT to cp_gtk_getCairoT correctly.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c
	(Java_gnu_java_awt_peer_gtk_CairoSurface_drawSurface): Rename function
	CairoGraphics2D_getCairoT to cp_gtk_getCairoT.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c
	(Java_gnu_java_awt_peer_gtk_GdkTextLayout_cairoDrawGdkTextLayout):
	Likewise.
-------------- next part --------------
Index: native/jni/gtk-peer/cairographics2d.h
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/cairographics2d.h,v
retrieving revision 1.1
diff -u -r1.1 cairographics2d.h
--- native/jni/gtk-peer/cairographics2d.h	29 May 2006 16:14:59 -0000	1.1
+++ native/jni/gtk-peer/cairographics2d.h	31 May 2006 22:17:53 -0000
@@ -113,6 +113,7 @@
   char *pattern_pixels;
 };
 
-cairo_t *CairoGraphics2D_getCairoT(JNIEnv *env, jobject cairographics2dobj);
+cairo_t *cp_gtk_getCairoT(JNIEnv *env,
+							      jobject cairographics2dobj);
 
 #endif
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c,v
retrieving revision 1.3
diff -u -r1.3 gnu_java_awt_peer_gtk_CairoGraphics2D.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c	30 May 2006 11:30:02 -0000	1.3
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c	31 May 2006 22:17:53 -0000
@@ -71,7 +71,8 @@
  * Returns the cairo_t * associated with a CairoGraphics2D object,
  * This is used by GdkTextLayout.
  */
-cairo_t *CairoGraphics2D_getCairoT(JNIEnv *env, jobject cairographics2dobj)
+cairo_t *cp_gtk_getCairoT(JNIEnv *env,
+							      jobject cairographics2dobj)
 {
   struct cairographics2d *gr = getPointer(env, cairographics2dobj);
   g_assert(gr != NULL);
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.12
diff -u -r1.12 gnu_java_awt_peer_gtk_GdkTextLayout.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c	30 May 2006 11:30:02 -0000	1.12
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c	31 May 2006 22:17:53 -0000
@@ -232,7 +232,7 @@
 
   g_assert (cairographics != NULL);
 
-  cr = CairoGraphics2D_getCairoT(env, cairographics);
+  cr = cp_gtk_getCairoT(env, cairographics);
   tl = (struct textlayout *)NSA_GET_TEXT_LAYOUT_PTR (env, obj);
 
   g_assert (cr != NULL);


More information about the Classpath-patches mailing list