diff --git a/ChangeLog b/ChangeLog
index f389d0b9a..4cf7356ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-09-29  Martin Willemoes Hansen  <mwh@sysrq.dk>
+
+	* sources/Gnome.metadata: Use const-gchar* instead of const-guchar*, 
+	  when the value is realy a string
+	* api/gnome-api.xml: Ditto
+
 2003-09-28  Martin Willemoes Hansen  <mwh@sysrq.dk>
 
 	* sources/gtk-sharp.sources: Fixed, wrong library used for libgnomeprintui
diff --git a/api/gnome-api.xml b/api/gnome-api.xml
index 97b176e9c..c5984e83b 100644
--- a/api/gnome-api.xml
+++ b/api/gnome-api.xml
@@ -4549,27 +4549,27 @@
       <method name="Find" cname="gnome_font_find" shared="true">
         <return-type type="GnomeFont*"/>
         <parameters>
-          <parameter type="const-guchar*" name="name"/>
+          <parameter type="const-gchar*" name="name"/>
           <parameter type="gdouble" name="size"/>
         </parameters>
       </method>
       <method name="FindClosest" cname="gnome_font_find_closest" shared="true">
         <return-type type="GnomeFont*"/>
         <parameters>
-          <parameter type="const-guchar*" name="name"/>
+          <parameter type="const-gchar*" name="name"/>
           <parameter type="gdouble" name="size"/>
         </parameters>
       </method>
       <method name="FindClosestFromFullName" cname="gnome_font_find_closest_from_full_name" shared="true">
         <return-type type="GnomeFont*"/>
         <parameters>
-          <parameter type="const-guchar*" name="string"/>
+          <parameter type="const-gchar*" name="string"/>
         </parameters>
       </method>
       <method name="FindClosestFromWeightSlant" cname="gnome_font_find_closest_from_weight_slant" shared="true">
         <return-type type="GnomeFont*"/>
         <parameters>
-          <parameter type="const-guchar*" name="family"/>
+          <parameter type="const-gchar*" name="family"/>
           <parameter type="GnomeFontWeight" name="weight"/>
           <parameter type="gboolean" name="italic"/>
           <parameter type="gdouble" name="size"/>
@@ -4578,7 +4578,7 @@
       <method name="FindFromFullName" cname="gnome_font_find_from_full_name" shared="true">
         <return-type type="GnomeFont*"/>
         <parameters>
-          <parameter type="const-guchar*" name="string"/>
+          <parameter type="const-gchar*" name="string"/>
         </parameters>
       </method>
       <method name="GetAscender" cname="gnome_font_get_ascender">
@@ -4598,7 +4598,7 @@
         <return-type type="GnomeFontFace*"/>
       </method>
       <method name="GetFamilyName" cname="gnome_font_get_family_name">
-        <return-type type="const-guchar*"/>
+        <return-type type="const-gchar*"/>
       </method>
       <method name="GetFullName" cname="gnome_font_get_full_name">
         <return-type type="guchar*"/>
@@ -4645,7 +4645,7 @@
         </parameters>
       </method>
       <method name="GetName" cname="gnome_font_get_name">
-        <return-type type="const-guchar*"/>
+        <return-type type="const-gchar*"/>
       </method>
       <method name="GetPangoDescription" cname="gnome_font_get_pango_description">
         <return-type type="PangoFontDescription*"/>
@@ -4654,7 +4654,7 @@
         </parameters>
       </method>
       <method name="GetPsName" cname="gnome_font_get_ps_name">
-        <return-type type="const-guchar*"/>
+        <return-type type="const-gchar*"/>
       </method>
       <method name="GetRfont" cname="gnome_font_get_rfont">
         <return-type type="GnomeRFont*"/>
@@ -4666,7 +4666,7 @@
         <return-type type="gdouble"/>
       </method>
       <method name="GetSpeciesName" cname="gnome_font_get_species_name">
-        <return-type type="const-guchar*"/>
+        <return-type type="const-gchar*"/>
       </method>
       <method name="GetType" cname="gnome_font_get_type" shared="true">
         <return-type type="GType"/>
@@ -4708,7 +4708,7 @@
       <method name="StyleList" cname="gnome_font_style_list" shared="true">
         <return-type type="GList*"/>
         <parameters>
-          <parameter type="const-guchar*" name="family"/>
+          <parameter type="const-gchar*" name="family"/>
         </parameters>
       </method>
       <method name="StyleListFree" cname="gnome_font_style_list_free" shared="true">
@@ -4736,13 +4736,13 @@
       <method name="Find" cname="gnome_font_face_find" shared="true">
         <return-type type="GnomeFontFace*"/>
         <parameters>
-          <parameter type="const-guchar*" name="name"/>
+          <parameter type="const-gchar*" name="name"/>
         </parameters>
       </method>
       <method name="FindClosest" cname="gnome_font_face_find_closest" shared="true">
         <return-type type="GnomeFontFace*"/>
         <parameters>
-          <parameter type="const-guchar*" name="name"/>
+          <parameter type="const-gchar*" name="name"/>
         </parameters>
       </method>
       <method name="FindClosestFromPangoDescription" cname="gnome_font_face_find_closest_from_pango_description" shared="true">
@@ -4760,7 +4760,7 @@
       <method name="FindClosestFromWeightSlant" cname="gnome_font_face_find_closest_from_weight_slant" shared="true">
         <return-type type="GnomeFontFace*"/>
         <parameters>
-          <parameter type="const-guchar*" name="family"/>
+          <parameter type="const-gchar*" name="family"/>
           <parameter type="GnomeFontWeight" name="weight"/>
           <parameter type="gboolean" name="italic"/>
         </parameters>
@@ -4768,8 +4768,8 @@
       <method name="FindFromFamilyAndStyle" cname="gnome_font_face_find_from_family_and_style" shared="true">
         <return-type type="GnomeFontFace*"/>
         <parameters>
-          <parameter type="const-guchar*" name="family"/>
-          <parameter type="const-guchar*" name="style"/>
+          <parameter type="const-gchar*" name="family"/>
+          <parameter type="const-gchar*" name="style"/>
         </parameters>
       </method>
       <method name="GetAscender" cname="gnome_font_face_get_ascender">
@@ -4779,7 +4779,7 @@
         <return-type type="gdouble"/>
       </method>
       <method name="GetFamilyName" cname="gnome_font_face_get_family_name">
-        <return-type type="const-guchar*"/>
+        <return-type type="const-gchar*"/>
       </method>
       <method name="GetFont" cname="gnome_font_face_get_font">
         <return-type type="GnomeFont*"/>
@@ -4803,7 +4803,7 @@
         </parameters>
       </method>
       <method name="GetGlyphPsName" cname="gnome_font_face_get_glyph_ps_name">
-        <return-type type="const-guchar*"/>
+        <return-type type="const-gchar*"/>
         <parameters>
           <parameter type="gint" name="glyph"/>
         </parameters>
@@ -4843,19 +4843,19 @@
         </parameters>
       </method>
       <method name="GetName" cname="gnome_font_face_get_name">
-        <return-type type="const-guchar*"/>
+        <return-type type="const-gchar*"/>
       </method>
       <method name="GetNumGlyphs" cname="gnome_font_face_get_num_glyphs">
         <return-type type="gint"/>
       </method>
       <method name="GetPsName" cname="gnome_font_face_get_ps_name">
-        <return-type type="const-guchar*"/>
+        <return-type type="const-gchar*"/>
       </method>
       <method name="GetSample" cname="gnome_font_face_get_sample">
-        <return-type type="const-guchar*"/>
+        <return-type type="const-gchar*"/>
       </method>
       <method name="GetSpeciesName" cname="gnome_font_face_get_species_name">
-        <return-type type="const-guchar*"/>
+        <return-type type="const-gchar*"/>
       </method>
       <method name="GetStdbbox" cname="gnome_font_face_get_stdbbox">
         <return-type type="const-ArtDRect*"/>
@@ -4939,34 +4939,34 @@
       <method name="Get" cname="gnome_print_config_get">
         <return-type type="guchar*"/>
         <parameters>
-          <parameter type="const-guchar*" name="key"/>
+          <parameter type="const-gchar*" name="key"/>
         </parameters>
       </method>
       <method name="GetBoolean" cname="gnome_print_config_get_boolean">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter type="const-guchar*" name="key"/>
+          <parameter type="const-gchar*" name="key"/>
           <parameter type="gboolean*" name="val"/>
         </parameters>
       </method>
       <method name="GetDouble" cname="gnome_print_config_get_double">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter type="const-guchar*" name="key"/>
+          <parameter type="const-gchar*" name="key"/>
           <parameter type="gdouble*" name="val"/>
         </parameters>
       </method>
       <method name="GetInt" cname="gnome_print_config_get_int">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter type="const-guchar*" name="key"/>
+          <parameter type="const-gchar*" name="key"/>
           <parameter type="gint*" name="val"/>
         </parameters>
       </method>
       <method name="GetLength" cname="gnome_print_config_get_length">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter type="const-guchar*" name="key"/>
+          <parameter type="const-gchar*" name="key"/>
           <parameter type="gdouble*" name="val"/>
           <parameter type="const-GnomePrintUnit**" name="unit"/>
         </parameters>
@@ -4987,35 +4987,35 @@
       <method name="Set" cname="gnome_print_config_set">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter type="const-guchar*" name="key"/>
-          <parameter type="const-guchar*" name="value"/>
+          <parameter type="const-gchar*" name="key"/>
+          <parameter type="const-gchar*" name="value"/>
         </parameters>
       </method>
       <method name="SetBoolean" cname="gnome_print_config_set_boolean">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter type="const-guchar*" name="key"/>
+          <parameter type="const-gchar*" name="key"/>
           <parameter type="gboolean" name="val"/>
         </parameters>
       </method>
       <method name="SetDouble" cname="gnome_print_config_set_double">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter type="const-guchar*" name="key"/>
+          <parameter type="const-gchar*" name="key"/>
           <parameter type="gdouble" name="val"/>
         </parameters>
       </method>
       <method name="SetInt" cname="gnome_print_config_set_int">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter type="const-guchar*" name="key"/>
+          <parameter type="const-gchar*" name="key"/>
           <parameter type="gint" name="val"/>
         </parameters>
       </method>
       <method name="SetLength" cname="gnome_print_config_set_length">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter type="const-guchar*" name="key"/>
+          <parameter type="const-gchar*" name="key"/>
           <parameter type="gdouble" name="val"/>
           <parameter type="const-GnomePrintUnit*" name="unit"/>
         </parameters>
@@ -5152,14 +5152,14 @@
         <return-type type="gint"/>
         <parameters>
           <parameter type="GnomePrintContext*" name="ctx"/>
-          <parameter type="const-guchar*" name="filename"/>
+          <parameter type="const-gchar*" name="filename"/>
         </parameters>
       </method>
       <method name="RenderFilePage" cname="gnome_print_meta_render_file_page" shared="true">
         <return-type type="gint"/>
         <parameters>
           <parameter type="GnomePrintContext*" name="ctx"/>
-          <parameter type="const-guchar*" name="filename"/>
+          <parameter type="const-gchar*" name="filename"/>
           <parameter type="gint" name="page"/>
           <parameter type="gboolean" name="pageops"/>
         </parameters>
@@ -5574,7 +5574,7 @@
           <parameter type="guint32" name="color"/>
           <parameter type="gdouble" name="kerning"/>
           <parameter type="gdouble" name="letterspace"/>
-          <parameter type="const-guchar*" name="text"/>
+          <parameter type="const-gchar*" name="text"/>
         </parameters>
       </method>
       <method name="FromTextSizedDumb" cname="gnome_glyphlist_from_text_sized_dumb" shared="true">
@@ -5584,7 +5584,7 @@
           <parameter type="guint32" name="color"/>
           <parameter type="gdouble" name="kerning"/>
           <parameter type="gdouble" name="letterspace"/>
-          <parameter type="const-guchar*" name="text"/>
+          <parameter type="const-gchar*" name="text"/>
           <parameter type="gint" name="length"/>
         </parameters>
       </method>
@@ -5637,13 +5637,13 @@
       <method name="TextDumb" cname="gnome_glyphlist_text_dumb">
         <return-type type="void"/>
         <parameters>
-          <parameter type="const-guchar*" name="text"/>
+          <parameter type="const-gchar*" name="text"/>
         </parameters>
       </method>
       <method name="TextSizedDumb" cname="gnome_glyphlist_text_sized_dumb">
         <return-type type="void"/>
         <parameters>
-          <parameter type="const-guchar*" name="text"/>
+          <parameter type="const-gchar*" name="text"/>
           <parameter type="gint" name="length"/>
         </parameters>
       </method>
@@ -5672,7 +5672,7 @@
       <method name="GetByName" cname="gnome_print_paper_get_by_name" shared="true">
         <return-type type="const-GnomePrintPaper*"/>
         <parameters>
-          <parameter type="const-guchar*" name="name"/>
+          <parameter type="const-gchar*" name="name"/>
         </parameters>
       </method>
       <method name="GetBySize" cname="gnome_print_paper_get_by_size" shared="true">
@@ -5714,13 +5714,13 @@
       <method name="GetByAbbreviation" cname="gnome_print_unit_get_by_abbreviation" shared="true">
         <return-type type="const-GnomePrintUnit*"/>
         <parameters>
-          <parameter type="const-guchar*" name="abbreviation"/>
+          <parameter type="const-gchar*" name="abbreviation"/>
         </parameters>
       </method>
       <method name="GetByName" cname="gnome_print_unit_get_by_name" shared="true">
         <return-type type="const-GnomePrintUnit*"/>
         <parameters>
-          <parameter type="const-guchar*" name="name"/>
+          <parameter type="const-gchar*" name="name"/>
         </parameters>
       </method>
       <method name="GetDefault" cname="gnome_print_unit_get_default" shared="true">
@@ -5832,7 +5832,7 @@
         <return-type type="gint"/>
         <parameters>
           <parameter type="GnomePrintContext*" name="pc"/>
-          <parameter type="const-guchar*" name="name"/>
+          <parameter type="const-gchar*" name="name"/>
         </parameters>
       </method>
       <method name="Bpath" cname="gnome_print_bpath" shared="true">
@@ -5895,7 +5895,7 @@
       <method name="DecodeAscii85" cname="gnome_print_decode_ascii85" shared="true">
         <return-type type="int"/>
         <parameters>
-          <parameter type="const-guchar*" name="in"/>
+          <parameter type="const-gchar*" name="in"/>
           <parameter type="guchar*" name="out"/>
           <parameter type="gint" name="in_size"/>
         </parameters>
@@ -5909,7 +5909,7 @@
       <method name="DecodeHex" cname="gnome_print_decode_hex" shared="true">
         <return-type type="int"/>
         <parameters>
-          <parameter type="const-guchar*" name="in"/>
+          <parameter type="const-gchar*" name="in"/>
           <parameter type="guchar*" name="out"/>
           <parameter type="gint*" name="in_size"/>
         </parameters>
@@ -5923,7 +5923,7 @@
       <method name="EncodeAscii85" cname="gnome_print_encode_ascii85" shared="true">
         <return-type type="int"/>
         <parameters>
-          <parameter type="const-guchar*" name="in"/>
+          <parameter type="const-gchar*" name="in"/>
           <parameter type="guchar*" name="out"/>
           <parameter type="gint" name="in_size"/>
         </parameters>
@@ -5937,14 +5937,14 @@
       <method name="EncodeBlank" cname="gnome_print_encode_blank" shared="true">
         <return-type type="int"/>
         <parameters>
-          <parameter type="const-guchar*" name="in"/>
+          <parameter type="const-gchar*" name="in"/>
           <parameter type="gint" name="in_size"/>
         </parameters>
       </method>
       <method name="EncodeDeflate" cname="gnome_print_encode_deflate" shared="true">
         <return-type type="int"/>
         <parameters>
-          <parameter type="const-guchar*" name="in"/>
+          <parameter type="const-gchar*" name="in"/>
           <parameter type="guchar*" name="out"/>
           <parameter type="gint" name="in_size"/>
           <parameter type="gint" name="out_size"/>
@@ -5959,7 +5959,7 @@
       <method name="EncodeDrow" cname="gnome_print_encode_drow" shared="true">
         <return-type type="int"/>
         <parameters>
-          <parameter type="const-guchar*" name="in"/>
+          <parameter type="const-gchar*" name="in"/>
           <parameter type="guchar*" name="out"/>
           <parameter type="gint" name="in_size"/>
           <parameter type="guchar*" name="seed"/>
@@ -5974,7 +5974,7 @@
       <method name="EncodeHex" cname="gnome_print_encode_hex" shared="true">
         <return-type type="int"/>
         <parameters>
-          <parameter type="const-guchar*" name="in"/>
+          <parameter type="const-gchar*" name="in"/>
           <parameter type="guchar*" name="out"/>
           <parameter type="gint" name="in_size"/>
         </parameters>
@@ -5988,7 +5988,7 @@
       <method name="EncodeRlc" cname="gnome_print_encode_rlc" shared="true">
         <return-type type="int"/>
         <parameters>
-          <parameter type="const-guchar*" name="in"/>
+          <parameter type="const-gchar*" name="in"/>
           <parameter type="guchar*" name="out"/>
           <parameter type="gint" name="in_size"/>
         </parameters>
@@ -6002,7 +6002,7 @@
       <method name="EncodeTiff" cname="gnome_print_encode_tiff" shared="true">
         <return-type type="int"/>
         <parameters>
-          <parameter type="const-guchar*" name="in"/>
+          <parameter type="const-gchar*" name="in"/>
           <parameter type="guchar*" name="out"/>
           <parameter type="gint" name="in_size"/>
         </parameters>
@@ -6211,14 +6211,14 @@
         <return-type type="gint"/>
         <parameters>
           <parameter type="GnomePrintContext*" name="pc"/>
-          <parameter type="const-guchar*" name="text"/>
+          <parameter type="const-gchar*" name="text"/>
         </parameters>
       </method>
       <method name="ShowSized" cname="gnome_print_show_sized" shared="true">
         <return-type type="gint"/>
         <parameters>
           <parameter type="GnomePrintContext*" name="pc"/>
-          <parameter type="const-guchar*" name="text"/>
+          <parameter type="const-gchar*" name="text"/>
           <parameter type="gint" name="bytes"/>
         </parameters>
       </method>
@@ -6321,7 +6321,7 @@
       <method name="SetPhrase" cname="gnome_font_preview_set_phrase">
         <return-type type="void"/>
         <parameters>
-          <parameter type="const-guchar*" name="phrase"/>
+          <parameter type="const-gchar*" name="phrase"/>
         </parameters>
       </method>
     </object>
@@ -6436,7 +6436,7 @@
       <method name="Construct" cname="gnome_print_dialog_construct">
         <return-type type="void"/>
         <parameters>
-          <parameter type="const-guchar*" name="title"/>
+          <parameter type="const-gchar*" name="title"/>
           <parameter type="gint" name="flags"/>
         </parameters>
       </method>
@@ -6445,8 +6445,8 @@
         <parameters>
           <parameter type="gint" name="flags"/>
           <parameter type="GtkWidget*" name="range_widget"/>
-          <parameter type="const-guchar*" name="currentlabel"/>
-          <parameter type="const-guchar*" name="rangelabel"/>
+          <parameter type="const-gchar*" name="currentlabel"/>
+          <parameter type="const-gchar*" name="rangelabel"/>
         </parameters>
       </method>
       <method name="ConstructRangeCustom" cname="gnome_print_dialog_construct_range_custom">
@@ -6461,8 +6461,8 @@
           <parameter type="gint" name="flags"/>
           <parameter type="gint" name="start"/>
           <parameter type="gint" name="end"/>
-          <parameter type="const-guchar*" name="currentlabel"/>
-          <parameter type="const-guchar*" name="rangelabel"/>
+          <parameter type="const-gchar*" name="currentlabel"/>
+          <parameter type="const-gchar*" name="rangelabel"/>
         </parameters>
       </method>
       <method name="GetConfig" cname="gnome_print_dialog_get_config">
@@ -6491,7 +6491,7 @@
       <constructor cname="gnome_print_dialog_new">
         <parameters>
           <parameter type="GnomePrintJob*" name="gpj"/>
-          <parameter type="const-guchar*" name="title"/>
+          <parameter type="const-gchar*" name="title"/>
           <parameter type="gint" name="flags"/>
         </parameters>
       </constructor>
@@ -6510,7 +6510,7 @@
       <constructor cname="gnome_print_job_preview_new">
         <parameters>
           <parameter type="GnomePrintJob*" name="gpm"/>
-          <parameter type="const-guchar*" name="title"/>
+          <parameter type="const-gchar*" name="title"/>
         </parameters>
       </constructor>
     </object>
@@ -6593,7 +6593,7 @@
       <constructor cname="gpa_option_menu_new">
         <parameters>
           <parameter type="GnomePrintConfig*" name="config"/>
-          <parameter type="const-guchar*" name="key"/>
+          <parameter type="const-gchar*" name="key"/>
         </parameters>
       </constructor>
     </object>
diff --git a/sources/Gnome.metadata b/sources/Gnome.metadata
index e59915703..ec19c80c8 100644
--- a/sources/Gnome.metadata
+++ b/sources/Gnome.metadata
@@ -333,6 +333,176 @@
  </data>
 </rule>
 
+<!-- Use const-gchar* instead of const-guchar*, when the value is realy a string -->
+<rule>
+  <class name="GnomeFont">
+    <method>Find</method>
+    <method>FindClosest</method>
+    <method>FindClosestFromFullName</method>
+    <method>FindClosestFromWeightSlant</method>
+    <method>FindFromFullName</method>
+    <method>StyleList</method>
+  </class>
+  <class name="GnomeFontFace">
+    <method>Find</method>
+    <method>FindClosest</method>
+    <method>FindClosestFromWeightSlant</method>
+    <method>FindFromFamilyAndStyle</method>
+  </class>
+  <class name="GnomePrintConfig">
+    <method>Get</method>
+    <method>GetBoolean</method>
+    <method>GetDouble</method>
+    <method>GetInt</method>
+    <method>GetLength</method>
+    <method>Set</method>
+    <method>SetBoolean</method>
+    <method>SetDouble</method>
+    <method>SetInt</method>
+    <method>SetLength</method>
+  </class>
+  <class name="GnomePrintDialog">
+    <method>Construct</method>
+    <method>ConstructRangeAny</method>
+    <method>ConstructRangePage</method>
+    <method>gnome_print_dialog_new</method>
+  </class>
+  <class name="GnomePrintMeta">
+    <method>RenderFile</method>
+    <method>RenderFilePage</method>
+  </class>
+  <class name="GnomeGlyphList">
+    <method>FromTextDumb</method>
+    <method>FromTextSizedDumb</method>
+    <method>TextDumb</method>
+    <method>TextSizedDumb</method>
+  </class>
+  <class name="GnomePrintPaper">
+    <method>GetByName</method>
+  </class>
+  <class name="GnomePrintUnit">
+    <method>GetByAbbreviation</method>
+    <method>GetByName</method>
+  </class>
+  <class name="GnomePrint_">
+    <method>Beginpage</method>
+    <method>DecodeAscii85</method>
+    <method>DecodeHex</method>
+    <method>EncodeAscii85</method>
+    <method>EncodeBlank</method>
+    <method>EncodeDeflate</method>
+    <method>EncodeDrow</method>
+    <method>EncodeHex</method>
+    <method>EncodeRlc</method>
+    <method>EncodeTiff</method>
+    <method>Show</method>
+    <method>ShowSized</method>
+  </class>
+  <class name="GnomeFontPreview">
+    <method>SetPhrase</method>
+  </class>
+  <class name="GnomePrintJobPreview">
+    <method>gnome_print_job_preview_new</method>
+  </class>
+  <class name="GPAOptionMenu">
+    <method>gpa_option_menu_new</method>
+  </class>
+  <data>
+    <attribute target="params">
+      <filter level="name">name</filter>
+      <name>type</name>
+      <value>const-gchar*</value>
+    </attribute>
+    <attribute target="params">
+      <filter level="name">family</filter>
+      <name>type</name>
+      <value>const-gchar*</value>
+    </attribute>
+    <attribute target="params">
+      <filter level="name">string</filter>
+      <name>type</name>
+      <value>const-gchar*</value>
+    </attribute>
+    <attribute target="params">
+      <filter level="name">style</filter>
+      <name>type</name>
+      <value>const-gchar*</value>
+    </attribute>
+    <attribute target="params">
+      <filter level="name">key</filter>
+      <name>type</name>
+      <value>const-gchar*</value>
+    </attribute>
+    <attribute target="params">
+      <filter level="name">value</filter>
+      <name>type</name>
+      <value>const-gchar*</value>
+    </attribute>
+    <attribute target="params">
+      <filter level="name">filename</filter>
+      <name>type</name>
+      <value>const-gchar*</value>
+    </attribute>
+    <attribute target="params">
+      <filter level="name">text</filter>
+      <name>type</name>
+      <value>const-gchar*</value>
+    </attribute>
+    <attribute target="params">
+      <filter level="name">abbreviation</filter>
+      <name>type</name>
+      <value>const-gchar*</value>
+    </attribute>
+    <attribute target="params">
+      <filter level="name">in</filter>
+      <name>type</name>
+      <value>const-gchar*</value>
+    </attribute>
+    <attribute target="params">
+      <filter level="name">phrase</filter>
+      <name>type</name>
+      <value>const-gchar*</value>
+    </attribute>
+    <attribute target="params">
+      <filter level="name">title</filter>
+      <name>type</name>
+      <value>const-gchar*</value>
+    </attribute>
+    <attribute target="params">
+      <filter level="name">currentlabel</filter>
+      <name>type</name>
+      <value>const-gchar*</value>
+    </attribute>
+    <attribute target="params">
+      <filter level="name">rangelabel</filter>
+      <name>type</name>
+      <value>const-gchar*</value>
+    </attribute>
+  </data>
+</rule>
+<rule>
+  <class name="GnomeFont">
+    <method>GetFamilyName</method>
+    <method>GetName</method>
+    <method>GetPsName</method>
+    <method>GetSpeciesName</method>
+  </class>
+  <class name="GnomeFontFace">
+    <method>GetFamilyName</method>
+    <method>GetGlyphPsName</method>
+    <method>GetName</method>
+    <method>GetPsName</method>
+    <method>GetSample</method>
+    <method>GetSpeciesName</method>
+  </class>
+  <data>
+    <attribute target="return">
+      <name>type</name>
+      <value>const-gchar*</value>
+    </attribute>
+  </data>
+</rule>
+
 <!-- null args -->
 <rule>
   <class name="GnomeIconList">