[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: pango fixes for gdk font peer

[Kaffe CVS]

PatchSet 5453 
Date: 2004/11/13 23:58:05
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: pango fixes for gdk font peer

2004-11-13  Dalibor Topic  <robilad at kaffe.org>

        * libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c:
        Resynced with GNU Classpath.

        2004-11-11  Thomas Fitzsimmons  <fitzsim at redhat.com>

        * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c (setFont):
        Set pango context's description and language.

Members: 
	ChangeLog:1.2999->1.3000 
	libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c:1.3->1.4 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2999 kaffe/ChangeLog:1.3000
--- kaffe/ChangeLog:1.2999	Sat Nov 13 04:02:03 2004
+++ kaffe/ChangeLog	Sat Nov 13 23:58:05 2004
@@ -1,5 +1,15 @@
 2004-11-13  Dalibor Topic  <robilad at kaffe.org>
 
+	* libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c:
+	Resynced with GNU Classpath.
+
+	2004-11-11  Thomas Fitzsimmons  <fitzsim at redhat.com>
+
+        * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c (setFont):
+        Set pango context's description and language.
+
+2004-11-13  Dalibor Topic  <robilad at kaffe.org>
+
 	* libraries/javalib/javax/swing/plaf/basic/BasicTextPaneUI.java:
 	Added missing file form last commit.
 
Index: kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c
diff -u kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c:1.3 kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c:1.4
--- kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c:1.3	Fri Oct 29 00:39:25 2004
+++ kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c	Sat Nov 13 23:58:09 2004
@@ -172,6 +172,8 @@
       pfont->font = NULL;
     }
   
+  pango_context_set_font_description (pfont->ctx, pfont->desc);
+  pango_context_set_language (pfont->ctx, gtk_get_default_language());
   pfont->font = pango_context_load_font (pfont->ctx, pfont->desc);
   g_assert (pfont->font != NULL);