diff --git a/ChangeLog b/ChangeLog
index 281ed7f48..7feb54f5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2003-10-13  Mike Kestner  <mkestner@ximian.com>
+
+	* gnome/Gnome.metadata : new xpath metadata rules
+	* gnome/Makefile.in : apply metadata before generation
+	* gnome/gnome-api.xml : regenerated
+	* parser/gapi-fixup.cs : use XmlDocument.Save (filename) 
+	instead of opening a stream manually.
+	* sources/Gnome.metadata : killed
+
 2003-10-12  Mike Kestner  <mkestner@ximian.com>
 
 	* art/Art.metadata : new xpath metadata rules
diff --git a/gnome/Gnome.metadata b/gnome/Gnome.metadata
new file mode 100644
index 000000000..f0f87aa22
--- /dev/null
+++ b/gnome/Gnome.metadata
@@ -0,0 +1,85 @@
+<?xml version="1.0"?>
+<metadata>
+  <attr path="//boxed[@cname='GnomeGlyphList']/method/*/*[@type='const-guchar*']" name="type">const-gchar*</attr>
+  <attr path="//boxed[@cname='GnomePrintUnit']/method/*/*[@type='const-guchar*']" name="type">const-gchar*</attr>
+  <attr path="//boxed[@cname='GnomePrintUnit']/method[@name='GetIdentity']/*/*[@name='base']" name="name">Base</attr>
+  <attr path="//class[@cname='GnomeConfig_']/method[@name='SetSetHandler']" name="hidden">1</attr>
+  <attr path="//class[@cname='GnomeConfig_']/method[@name='SetSyncHandler']" name="hidden">1</attr>
+  <attr path="//class[@cname='GnomeGdk_']" name="name">GdkHelper</attr>
+  <attr path="//class[@cname='GnomeGtk_']" name="name">GtkHelper</attr>
+  <attr path="//class[@cname='GnomePrint_']/method/*/*[@name='in']" name="type">const-gchar*</attr>
+  <attr path="//class[@cname='GnomePrint_']/method/*/*[@name='text']" name="type">const-gchar*</attr>
+  <attr path="//class[@cname='GnomePrint_']/method/*/*[@name='name']" name="type">const-gchar*</attr>
+  <attr path="//object[@cname='GnomeAbout']/constructor[@cname='gnome_about_new']/*/*[@type='const-gchar**']" name="array">1</attr>
+  <attr path="//object[@cname='GnomeAppBar']/signal[@name='ClearPrompt']" name="name">PromptCleared</attr>
+  <attr path="//object[@cname='GnomeCanvas']/method[@name='C2w']/*/*[@type='double*']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GnomeCanvas']/method[@name='GetButtPoints']/*/*[@type='double*']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GnomeCanvas']/method[@name='GetColor']/return-type" name="type">gboolean</attr>
+  <attr path="//object[@cname='GnomeCanvas']/method[@name='GetColor']/*/*[@type='GdkColor*']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GnomeCanvas']/method[@name='GetMiterPoints']/return-type" name="type">gboolean</attr>
+  <attr path="//object[@cname='GnomeCanvas']/method[@name='GetMiterPoints']/*/*[@type='double*']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GnomeCanvas']/method[@name='GetScrollOffsets']/*/*[@type='int*']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GnomeCanvas']/method[@name='GetScrollRegion']/*/*[@type='double*']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GnomeCanvas']/method[@name='W2c']/*/*[@type='int*']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GnomeCanvas']/method[@name='W2cD']/*/*[@type='double*']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GnomeCanvas']/method[@name='WindowToWorld']/*/*[@type='double*']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GnomeCanvas']/method[@name='WorldToWindow']/*/*[@type='double*']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GnomeCanvas']/method[@name='W2cAffine']" name="hidden">1</attr>
+  <attr path="//object[@cname='GnomeCanvasClipgroup']/property[@name='Wind']" name="type">ArtWindRule</attr>
+  <attr path="//object[@cname='GnomeCanvasItem']/constructor[@cname='gnome_canvas_item_new']" name="hidden">1</attr>
+  <attr path="//object[@cname='GnomeCanvasItem']/method[@name='AffineAbsolute']" name="hidden">1</attr>
+  <attr path="//object[@cname='GnomeCanvasItem']/method[@name='AffineRelative']" name="hidden">1</attr>
+  <attr path="//object[@cname='GnomeCanvasItem']/method[@name='Construct']" name="hidden">1</attr>
+  <attr path="//object[@cname='GnomeCanvasItem']/method[@name='GetBounds']/*/*[@type='double*']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GnomeCanvasItem']/method[@name='I2cAffine']" name="hidden">1</attr>
+  <attr path="//object[@cname='GnomeCanvasItem']/method[@name='I2w']/*/*[@type='double*']" name="pass_as">ref</attr>
+  <attr path="//object[@cname='GnomeCanvasItem']/method[@name='I2wAffine']" name="hidden">1</attr>
+  <attr path="//object[@cname='GnomeCanvasItem']/method[@name='SetValist']" name="hidden">1</attr>
+  <attr path="//object[@cname='GnomeCanvasItem']/method[@name='W2i']/*/*[@type='double*']" name="pass_as">ref</attr>
+  <attr path="//object[@cname='GnomeCanvasItem']/signal[@name='Event']" name="name">CanvasEvent</attr>
+  <attr path="//object[@cname='GnomeCanvasRichText']/method[@name='GetIterLocation']/*/*[@name='location']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GnomeCanvasRichText']/method[@name='GetIterAtLocation']/*/*[@name='iter']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GnomeCanvasShape']/property[@name='Dash']" name="type">ArtVpathDash</attr>
+  <attr path="//object[@cname='GnomeClient']/signal[@name='Connect']" name="name">Connected</attr>
+  <attr path="//object[@cname='GnomeClient']/signal[@name='Disconnect']" name="name">Disconnected</attr>
+  <attr path="//object[@cname='GnomeDruidPage']/signal[@name='Back']" name="name">BackClicked</attr>
+  <attr path="//object[@cname='GnomeDruidPage']/signal[@name='Cancel']" name="name">CancelClicked</attr>
+  <attr path="//object[@cname='GnomeDruidPage']/signal[@name='Finish']" name="name">FinishClicked</attr>
+  <attr path="//object[@cname='GnomeDruidPage']/signal[@name='Next']" name="name">NextClicked</attr>
+  <attr path="//object[@cname='GnomeDruidPage']/signal[@name='Prepare']" name="name">Prepared</attr>
+  <attr path="//object[@cname='GnomeEntry']/method[@name='GtkEntry']" name="name">GetGtkEntry</attr>
+  <attr path="//object[@cname='GnomeEntry']/signal[@name='Activate']" name="name">Activated</attr>
+  <attr path="//object[@cname='GnomeFileEntry']/method[@name='GnomeEntry']" name="hidden">1</attr>
+  <attr path="//object[@cname='GnomeFileEntry']/method[@name='GtkEntry']" name="hidden">1</attr>
+  <attr path="//object[@cname='GnomeFileEntry']/signal[@name='Activate']" name="name">Activated</attr>
+  <attr path="//object[@cname='GnomeFont']/method/return-type[@type='const-guchar*']" name="type">const-gchar*</attr>
+  <attr path="//object[@cname='GnomeFont']/method/*/*[@type='const-guchar*']" name="type">const-gchar*</attr>
+  <attr path="//object[@cname='GnomeFontPreview']/method/*/*[@type='const-guchar*']" name="type">const-gchar*</attr>
+  <attr path="//object[@cname='GnomeFontFace']/method/return-type[@type='const-guchar*']" name="type">const-gchar*</attr>
+  <attr path="//object[@cname='GnomeFontFace']/method/*/*[@type='const-guchar*']" name="type">const-gchar*</attr>
+  <attr path="//object[@cname='GnomeIconEntry']/method[@name='PickDialog']" name="hidden">1</attr>
+  <attr path="//object[@cname='GnomeIconList']/constructor[@cname='gnome_icon_list_new']/*/*[@type='GtkAdjustment*']" name="null_ok">1</attr>
+  <attr path="//object[@cname='GnomeIconList']/method[@name='GetSelection']/return-type" name="element_type">int</attr>
+  <attr path="//object[@cname='GnomeIconList']/method[@name='SetHadjustment']/*/*[@type='GtkAdjustment*']" name="null_ok">1</attr>
+  <attr path="//object[@cname='GnomeIconList']/method[@name='SetVadjustment']/*/*[@type='GtkAdjustment*']" name="null_ok">1</attr>
+  <attr path="//object[@cname='GnomeIconList']/signal[@name='FocusIcon']" name="name">IconFocused</attr>
+  <attr path="//object[@cname='GnomeIconList']/signal[@name='SelectIcon']" name="name">IconSelected</attr>
+  <attr path="//object[@cname='GnomeIconList']/signal[@name='UnselectIcon']" name="name">IconUnselected</attr>
+  <attr path="//object[@cname='GnomePrintConfig']/method/*/*[@type='const-guchar*']" name="type">const-gchar*</attr>
+  <attr path="//object[@cname='GnomePrintConfig']/method[@name='Get']/return-type" name="type">gchar*</attr>
+  <attr path="//object[@cname='GnomePrintDialog']/method/*/*[@type='const-guchar*']" name="type">const-gchar*</attr>
+  <attr path="//object[@cname='GnomePrintDialog']/constructor[@cname='gnome_print_dialog_new']/*/*[@type='const-guchar*']" name="type">const-gchar*</attr>
+  <attr path="//object[@cname='GnomePrintDialog']/constructor[@cname='gnome_print_dialog_new']/*/*[@name='flags']" name="type">GnomePrintDialogFlags</attr>
+  <attr path="//object[@cname='GnomePrintJob']" name="disabledefaultconstructor">1</attr>
+  <attr path="//object[@cname='GnomePrintJobPreview']/constructor/*/*[@type='const-guchar*']" name="type">const-gchar*</attr>
+  <attr path="//object[@cname='GnomePrintMeta']/method/*/*[@name='filename']" name="type">const-gchar*</attr>
+  <attr path="//object[@cname='GnomePrintPdf']" name="parent">GObject</attr>
+  <attr path="//object[@cname='GnomePrintTransport']" name="parent">GObject</attr>
+  <attr path="//object[@cname='GPAOptionMenu']/constructor/*/*[@type='const-guchar*']" name="type">const-gchar*</attr>
+  <attr path="//struct[@cname='GnomeCanvasPathDef']/method[@name='Curveto']" name="name">CurveTo</attr>
+  <attr path="//struct[@cname='GnomeCanvasPathDef']/method[@name='Lineto']" name="name">LineTo</attr>
+  <attr path="//struct[@cname='GnomeCanvasPathDef']/method[@name='LinetoMoving']" name="name">LineToMoving</attr>
+  <attr path="//struct[@cname='GnomeCanvasPathDef']/method[@name='Moveto']" name="name">MoveTo</attr>
+  <attr path="//struct[@cname='GnomeCanvasPathDef']/method[@name='Split']/return-type" name="element_type">Gnome.CanvasPathDef</attr>
+  <attr path="//struct[@cname='GnomePrintPaper']/method/*/*[@type='const-guchar*']" name="type">const-gchar*</attr>
+</metadata>
diff --git a/gnome/Makefile.in b/gnome/Makefile.in
index a98296c76..9b17d7b42 100755
--- a/gnome/Makefile.in
+++ b/gnome/Makefile.in
@@ -15,7 +15,8 @@ ASSEMBLY=gnome-sharp.dll
 @ENABLE_GNOME_TRUE@ all: $(ASSEMBLY)
 @ENABLE_GNOME_FALSE@ all: 
 
-generated-stamp: $(APIS) *.custom ../generator/gapi_codegen.exe
+generated-stamp: $(APIS) *.custom ../generator/gapi_codegen.exe Gnome.metadata
+	$(RUNTIME) ../parser/gapi-fixup.exe --api=gnome-api.xml --metadata=Gnome.metadata && \
 	$(RUNTIME) ../generator/gapi_codegen.exe --generate $(APIS) 	\
 	--include $(INCLUDE_APIS) --outdir=generated --customdir=.	\
 	--assembly-name=gnome-sharp && touch generated-stamp
diff --git a/gnome/gnome-api.xml b/gnome/gnome-api.xml
index 3c7012855..d83a42557 100644
--- a/gnome/gnome-api.xml
+++ b/gnome/gnome-api.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
-<api>
-<!--
+<api><!--
 
         This file was automatically generated.
         Please DO NOT MODIFY THIS FILE, modify .metadata files instead.
@@ -8,6701 +7,6701 @@
 -->
   <namespace name="Gnome" library="gnome-2">
     <enum name="FileDomain" cname="GnomeFileDomain" type="enum">
-      <member cname="GNOME_FILE_DOMAIN_UNKNOWN" name="Unknown"/>
-      <member cname="GNOME_FILE_DOMAIN_LIBDIR" name="Libdir"/>
-      <member cname="GNOME_FILE_DOMAIN_DATADIR" name="Datadir"/>
-      <member cname="GNOME_FILE_DOMAIN_SOUND" name="Sound"/>
-      <member cname="GNOME_FILE_DOMAIN_PIXMAP" name="Pixmap"/>
-      <member cname="GNOME_FILE_DOMAIN_CONFIG" name="Config"/>
-      <member cname="GNOME_FILE_DOMAIN_HELP" name="Help"/>
-      <member cname="GNOME_FILE_DOMAIN_APP_LIBDIR" name="AppLibdir"/>
-      <member cname="GNOME_FILE_DOMAIN_APP_DATADIR" name="AppDatadir"/>
-      <member cname="GNOME_FILE_DOMAIN_APP_SOUND" name="AppSound"/>
-      <member cname="GNOME_FILE_DOMAIN_APP_PIXMAP" name="AppPixmap"/>
-      <member cname="GNOME_FILE_DOMAIN_APP_CONFIG" name="AppConfig"/>
-      <member cname="GNOME_FILE_DOMAIN_APP_HELP" name="AppHelp"/>
+      <member cname="GNOME_FILE_DOMAIN_UNKNOWN" name="Unknown" />
+      <member cname="GNOME_FILE_DOMAIN_LIBDIR" name="Libdir" />
+      <member cname="GNOME_FILE_DOMAIN_DATADIR" name="Datadir" />
+      <member cname="GNOME_FILE_DOMAIN_SOUND" name="Sound" />
+      <member cname="GNOME_FILE_DOMAIN_PIXMAP" name="Pixmap" />
+      <member cname="GNOME_FILE_DOMAIN_CONFIG" name="Config" />
+      <member cname="GNOME_FILE_DOMAIN_HELP" name="Help" />
+      <member cname="GNOME_FILE_DOMAIN_APP_LIBDIR" name="AppLibdir" />
+      <member cname="GNOME_FILE_DOMAIN_APP_DATADIR" name="AppDatadir" />
+      <member cname="GNOME_FILE_DOMAIN_APP_SOUND" name="AppSound" />
+      <member cname="GNOME_FILE_DOMAIN_APP_PIXMAP" name="AppPixmap" />
+      <member cname="GNOME_FILE_DOMAIN_APP_CONFIG" name="AppConfig" />
+      <member cname="GNOME_FILE_DOMAIN_APP_HELP" name="AppHelp" />
     </enum>
     <enum name="HelpError" cname="GnomeHelpError" type="enum">
-      <member cname="GNOME_HELP_ERROR_INTERNAL" name="Internal"/>
-      <member cname="GNOME_HELP_ERROR_NOT_FOUND" name="NotFound"/>
+      <member cname="GNOME_HELP_ERROR_INTERNAL" name="Internal" />
+      <member cname="GNOME_HELP_ERROR_NOT_FOUND" name="NotFound" />
     </enum>
     <enum name="TriggerType" cname="GnomeTriggerType" type="enum">
-      <member cname="GTRIG_NONE" name="None"/>
-      <member cname="GTRIG_FUNCTION" name="Function"/>
-      <member cname="GTRIG_COMMAND" name="Command"/>
-      <member cname="GTRIG_MEDIAPLAY" name="Mediaplay"/>
+      <member cname="GTRIG_NONE" name="None" />
+      <member cname="GTRIG_FUNCTION" name="Function" />
+      <member cname="GTRIG_COMMAND" name="Command" />
+      <member cname="GTRIG_MEDIAPLAY" name="Mediaplay" />
     </enum>
     <enum name="URLError" cname="GnomeURLError" type="enum">
-      <member cname="GNOME_URL_ERROR_PARSE" name="Parse"/>
+      <member cname="GNOME_URL_ERROR_PARSE" name="Parse" />
     </enum>
     <callback name="ModuleClassInitHook" cname="GnomeModuleClassInitHook">
-      <return-type type="void"/>
+      <return-type type="void" />
       <parameters>
-        <parameter type="GnomeProgramClass*" name="klass"/>
-        <parameter type="const-GnomeModuleInfo*" name="mod_info"/>
+        <parameter type="GnomeProgramClass*" name="klass" />
+        <parameter type="const-GnomeModuleInfo*" name="mod_info" />
       </parameters>
     </callback>
     <callback name="ModuleHook" cname="GnomeModuleHook">
-      <return-type type="void"/>
+      <return-type type="void" />
       <parameters>
-        <parameter type="GnomeProgram*" name="program"/>
-        <parameter type="GnomeModuleInfo*" name="mod_info"/>
+        <parameter type="GnomeProgram*" name="program" />
+        <parameter type="GnomeModuleInfo*" name="mod_info" />
       </parameters>
     </callback>
     <callback name="ModuleInitHook" cname="GnomeModuleInitHook">
-      <return-type type="void"/>
+      <return-type type="void" />
       <parameters>
-        <parameter type="const-GnomeModuleInfo*" name="mod_info"/>
+        <parameter type="const-GnomeModuleInfo*" name="mod_info" />
       </parameters>
     </callback>
     <callback name="TriggerActionFunction" cname="GnomeTriggerActionFunction">
-      <return-type type="void"/>
+      <return-type type="void" />
       <parameters>
-        <parameter type="char*" name="msg"/>
-        <parameter type="char*" name="level"/>
-        <parameter type="char*" array="true" name="supinfo"/>
+        <parameter type="char*" name="msg" />
+        <parameter type="char*" name="level" />
+        <parameter type="char*" array="true" name="supinfo" />
       </parameters>
     </callback>
     <object name="Program" cname="GnomeProgram" parent="GObject">
-      <field cname="_priv" type="GnomeProgramPrivate*"/>
-      <property name="PoptTable" cname="popt-table" type="gpointer" writeable="true" construct-only="true"/>
-      <property name="PoptFlags" cname="popt-flags" type="gint" writeable="true" construct-only="true"/>
-      <property name="PoptContext" cname="popt-context" type="gpointer" readable="true"/>
-      <property name="HumanReadableName" cname="human-readable-name" type="gchar*" readable="true" writeable="true" construct-only="true"/>
-      <property name="GnomePath" cname="gnome-path" type="gchar*" readable="true" writeable="true" construct-only="true"/>
-      <property name="AppId" cname="app-id" type="gchar*" readable="true"/>
-      <property name="AppVersion" cname="app-version" type="gchar*" readable="true"/>
-      <property name="GnomePrefix" cname="gnome-prefix" type="gchar*" readable="true" writeable="true" construct-only="true"/>
-      <property name="GnomeLibdir" cname="gnome-libdir" type="gchar*" readable="true" writeable="true" construct-only="true"/>
-      <property name="GnomeDatadir" cname="gnome-datadir" type="gchar*" readable="true" writeable="true" construct-only="true"/>
-      <property name="GnomeSysconfdir" cname="gnome-sysconfdir" type="gchar*" readable="true" writeable="true" construct-only="true"/>
-      <property name="AppPrefix" cname="app-prefix" type="gchar*" readable="true" writeable="true"/>
-      <property name="AppLibdir" cname="app-libdir" type="gchar*" readable="true" writeable="true"/>
-      <property name="AppDatadir" cname="app-datadir" type="gchar*" readable="true" writeable="true"/>
-      <property name="AppSysconfdir" cname="app-sysconfdir" type="gchar*" readable="true" writeable="true"/>
-      <property name="CreateDirectories" cname="create-directories" type="gboolean" readable="true" writeable="true" construct-only="true"/>
-      <property name="EnableSound" cname="enable-sound" type="gboolean" readable="true" writeable="true" construct-only="true"/>
-      <property name="Espeaker" cname="espeaker" type="gchar*" readable="true" writeable="true" construct-only="true"/>
+      <field cname="_priv" type="GnomeProgramPrivate*" />
+      <property name="PoptTable" cname="popt-table" type="gpointer" writeable="true" construct-only="true" />
+      <property name="PoptFlags" cname="popt-flags" type="gint" writeable="true" construct-only="true" />
+      <property name="PoptContext" cname="popt-context" type="gpointer" readable="true" />
+      <property name="HumanReadableName" cname="human-readable-name" type="gchar*" readable="true" writeable="true" construct-only="true" />
+      <property name="GnomePath" cname="gnome-path" type="gchar*" readable="true" writeable="true" construct-only="true" />
+      <property name="AppId" cname="app-id" type="gchar*" readable="true" />
+      <property name="AppVersion" cname="app-version" type="gchar*" readable="true" />
+      <property name="GnomePrefix" cname="gnome-prefix" type="gchar*" readable="true" writeable="true" construct-only="true" />
+      <property name="GnomeLibdir" cname="gnome-libdir" type="gchar*" readable="true" writeable="true" construct-only="true" />
+      <property name="GnomeDatadir" cname="gnome-datadir" type="gchar*" readable="true" writeable="true" construct-only="true" />
+      <property name="GnomeSysconfdir" cname="gnome-sysconfdir" type="gchar*" readable="true" writeable="true" construct-only="true" />
+      <property name="AppPrefix" cname="app-prefix" type="gchar*" readable="true" writeable="true" />
+      <property name="AppLibdir" cname="app-libdir" type="gchar*" readable="true" writeable="true" />
+      <property name="AppDatadir" cname="app-datadir" type="gchar*" readable="true" writeable="true" />
+      <property name="AppSysconfdir" cname="app-sysconfdir" type="gchar*" readable="true" writeable="true" />
+      <property name="CreateDirectories" cname="create-directories" type="gboolean" readable="true" writeable="true" construct-only="true" />
+      <property name="EnableSound" cname="enable-sound" type="gboolean" readable="true" writeable="true" construct-only="true" />
+      <property name="Espeaker" cname="espeaker" type="gchar*" readable="true" writeable="true" construct-only="true" />
       <method name="Get" cname="gnome_program_get" shared="true">
-        <return-type type="GnomeProgram*"/>
+        <return-type type="GnomeProgram*" />
       </method>
       <method name="GetAppId" cname="gnome_program_get_app_id">
-        <return-type type="const-char*"/>
+        <return-type type="const-char*" />
       </method>
       <method name="GetAppVersion" cname="gnome_program_get_app_version">
-        <return-type type="const-char*"/>
+        <return-type type="const-char*" />
       </method>
       <method name="GetHumanReadableName" cname="gnome_program_get_human_readable_name">
-        <return-type type="const-char*"/>
+        <return-type type="const-char*" />
       </method>
       <method name="GetType" cname="gnome_program_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="Init" cname="gnome_program_init" shared="true">
-        <return-type type="GnomeProgram*"/>
+        <return-type type="GnomeProgram*" />
         <parameters>
-          <parameter type="const-char*" name="app_id"/>
-          <parameter type="const-char*" name="app_version"/>
-          <parameter type="const-GnomeModuleInfo*" name="module_info"/>
-          <parameter type="int" name="argc"/>
-          <parameter type="char**" name="argv"/>
-          <parameter type="const-char*" name="first_property_name"/>
-          <parameter ellipsis="true"/>
+          <parameter type="const-char*" name="app_id" />
+          <parameter type="const-char*" name="app_version" />
+          <parameter type="const-GnomeModuleInfo*" name="module_info" />
+          <parameter type="int" name="argc" />
+          <parameter type="char**" name="argv" />
+          <parameter type="const-char*" name="first_property_name" />
+          <parameter ellipsis="true" />
         </parameters>
       </method>
       <method name="Initv" cname="gnome_program_initv" shared="true">
-        <return-type type="GnomeProgram*"/>
+        <return-type type="GnomeProgram*" />
         <parameters>
-          <parameter type="GType" name="type"/>
-          <parameter type="const-char*" name="app_id"/>
-          <parameter type="const-char*" name="app_version"/>
-          <parameter type="const-GnomeModuleInfo*" name="module_info"/>
-          <parameter type="int" name="argc"/>
-          <parameter type="char**" name="argv"/>
-          <parameter type="const-char*" name="first_property_name"/>
-          <parameter type="va_list" name="args"/>
+          <parameter type="GType" name="type" />
+          <parameter type="const-char*" name="app_id" />
+          <parameter type="const-char*" name="app_version" />
+          <parameter type="const-GnomeModuleInfo*" name="module_info" />
+          <parameter type="int" name="argc" />
+          <parameter type="char**" name="argv" />
+          <parameter type="const-char*" name="first_property_name" />
+          <parameter type="va_list" name="args" />
         </parameters>
       </method>
       <method name="InstallProperty" cname="gnome_program_install_property" shared="true">
-        <return-type type="guint"/>
+        <return-type type="guint" />
         <parameters>
-          <parameter type="GnomeProgramClass*" name="pclass"/>
-          <parameter type="GObjectGetPropertyFunc" name="get_fn"/>
-          <parameter type="GObjectSetPropertyFunc" name="set_fn"/>
-          <parameter type="GParamSpec*" name="pspec"/>
+          <parameter type="GnomeProgramClass*" name="pclass" />
+          <parameter type="GObjectGetPropertyFunc" name="get_fn" />
+          <parameter type="GObjectSetPropertyFunc" name="set_fn" />
+          <parameter type="GParamSpec*" name="pspec" />
         </parameters>
       </method>
       <method name="LocateFile" cname="gnome_program_locate_file">
-        <return-type type="gchar*"/>
+        <return-type type="gchar*" />
         <parameters>
-          <parameter type="GnomeFileDomain" name="domain"/>
-          <parameter type="const-gchar*" name="file_name"/>
-          <parameter type="gboolean" name="only_if_exists"/>
-          <parameter type="GSList**" name="ret_locations"/>
+          <parameter type="GnomeFileDomain" name="domain" />
+          <parameter type="const-gchar*" name="file_name" />
+          <parameter type="gboolean" name="only_if_exists" />
+          <parameter type="GSList**" name="ret_locations" />
         </parameters>
       </method>
       <method name="ModuleLoad" cname="gnome_program_module_load" shared="true">
-        <return-type type="const-GnomeModuleInfo*"/>
+        <return-type type="const-GnomeModuleInfo*" />
         <parameters>
-          <parameter type="const-char*" name="mod_name"/>
+          <parameter type="const-char*" name="mod_name" />
         </parameters>
       </method>
       <method name="ModuleRegister" cname="gnome_program_module_register" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-GnomeModuleInfo*" name="module_info"/>
+          <parameter type="const-GnomeModuleInfo*" name="module_info" />
         </parameters>
       </method>
       <method name="ModuleRegistered" cname="gnome_program_module_registered" shared="true">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="const-GnomeModuleInfo*" name="module_info"/>
+          <parameter type="const-GnomeModuleInfo*" name="module_info" />
         </parameters>
       </method>
       <method name="ParseArgs" cname="gnome_program_parse_args">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="Postinit" cname="gnome_program_postinit">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="Preinit" cname="gnome_program_preinit">
-        <return-type type="poptContext"/>
+        <return-type type="poptContext" />
         <parameters>
-          <parameter type="const-char*" name="app_id"/>
-          <parameter type="const-char*" name="app_version"/>
-          <parameter type="int" name="argc"/>
-          <parameter type="char**" name="argv"/>
+          <parameter type="const-char*" name="app_id" />
+          <parameter type="const-char*" name="app_version" />
+          <parameter type="int" name="argc" />
+          <parameter type="char**" name="argv" />
         </parameters>
       </method>
     </object>
     <boxed name="ModuleInfo" cname="GnomeModuleInfo">
-      <field cname="name" type="const-char*"/>
-      <field cname="version" type="const-char*"/>
-      <field cname="description" type="const-char*"/>
-      <field cname="requirements" type="GnomeModuleRequirement*"/>
-      <field cname="instance_init" type="GnomeModuleHook"/>
-      <field cname="pre_args_parse" type="GnomeModuleHook"/>
-      <field cname="post_args_parse" type="GnomeModuleHook"/>
-      <field cname="options" type="struct-poptOption*"/>
-      <field cname="init_pass" type="GnomeModuleInitHook"/>
-      <field cname="class_init" type="GnomeModuleClassInitHook"/>
-      <field cname="opt_prefix" type="const-char*"/>
-      <field cname="expansion1" type="gpointer"/>
+      <field cname="name" type="const-char*" />
+      <field cname="version" type="const-char*" />
+      <field cname="description" type="const-char*" />
+      <field cname="requirements" type="GnomeModuleRequirement*" />
+      <field cname="instance_init" type="GnomeModuleHook" />
+      <field cname="pre_args_parse" type="GnomeModuleHook" />
+      <field cname="post_args_parse" type="GnomeModuleHook" />
+      <field cname="options" type="struct-poptOption*" />
+      <field cname="init_pass" type="GnomeModuleInitHook" />
+      <field cname="class_init" type="GnomeModuleClassInitHook" />
+      <field cname="opt_prefix" type="const-char*" />
+      <field cname="expansion1" type="gpointer" />
       <method name="GetType" cname="gnome_module_info_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
     </boxed>
     <struct name="ModuleRequirement" cname="GnomeModuleRequirement">
-      <field cname="required_version" type="const-char*"/>
-      <field cname="module_info" type="const-GnomeModuleInfo*"/>
+      <field cname="required_version" type="const-char*" />
+      <field cname="module_info" type="const-GnomeModuleInfo*" />
     </struct>
     <struct name="Trigger" cname="GnomeTrigger">
-      <field cname="type" type="GnomeTriggerType"/>
-      <field cname="function" type="GnomeTriggerActionFunction"/>
-      <field cname="level" type="gchar*"/>
+      <field cname="type" type="GnomeTriggerType" />
+      <field cname="function" type="GnomeTriggerActionFunction" />
+      <field cname="level" type="gchar*" />
     </struct>
     <struct name="TriggerList" cname="GnomeTriggerList">
-      <field cname="nodename" type="char*"/>
-      <field cname="subtrees" type="GnomeTriggerList**"/>
-      <field cname="actions" type="GnomeTrigger**"/>
-      <field cname="numsubtrees" type="gint"/>
-      <field cname="numactions" type="gint"/>
+      <field cname="nodename" type="char*" />
+      <field cname="subtrees" type="GnomeTriggerList**" />
+      <field cname="actions" type="GnomeTrigger**" />
+      <field cname="numsubtrees" type="gint" />
+      <field cname="numactions" type="gint" />
     </struct>
     <class name="Global" cname="GnomeGlobal">
       <method name="BonoboModuleInfoGet" cname="gnome_bonobo_module_info_get" shared="true">
-        <return-type type="const-GnomeModuleInfo*"/>
+        <return-type type="const-GnomeModuleInfo*" />
       </method>
       <method name="ExecuteAsync" cname="gnome_execute_async" shared="true">
-        <return-type type="int"/>
+        <return-type type="int" />
         <parameters>
-          <parameter type="const-char*" name="dir"/>
-          <parameter type="int" name="argc"/>
-          <parameter type="char*" array="true" name="argv"/>
+          <parameter type="const-char*" name="dir" />
+          <parameter type="int" name="argc" />
+          <parameter type="char*" array="true" name="argv" />
         </parameters>
       </method>
       <method name="ExecuteAsyncFds" cname="gnome_execute_async_fds" shared="true">
-        <return-type type="int"/>
+        <return-type type="int" />
         <parameters>
-          <parameter type="const-char*" name="dir"/>
-          <parameter type="int" name="argc"/>
-          <parameter type="char*" array="true" name="argv"/>
-          <parameter type="gboolean" name="close_fds"/>
+          <parameter type="const-char*" name="dir" />
+          <parameter type="int" name="argc" />
+          <parameter type="char*" array="true" name="argv" />
+          <parameter type="gboolean" name="close_fds" />
         </parameters>
       </method>
       <method name="ExecuteAsyncWithEnv" cname="gnome_execute_async_with_env" shared="true">
-        <return-type type="int"/>
+        <return-type type="int" />
         <parameters>
-          <parameter type="const-char*" name="dir"/>
-          <parameter type="int" name="argc"/>
-          <parameter type="char*" array="true" name="argv"/>
-          <parameter type="int" name="envc"/>
-          <parameter type="char*" array="true" name="envv"/>
+          <parameter type="const-char*" name="dir" />
+          <parameter type="int" name="argc" />
+          <parameter type="char*" array="true" name="argv" />
+          <parameter type="int" name="envc" />
+          <parameter type="char*" array="true" name="envv" />
         </parameters>
       </method>
       <method name="ExecuteAsyncWithEnvFds" cname="gnome_execute_async_with_env_fds" shared="true">
-        <return-type type="int"/>
+        <return-type type="int" />
         <parameters>
-          <parameter type="const-char*" name="dir"/>
-          <parameter type="int" name="argc"/>
-          <parameter type="char*" array="true" name="argv"/>
-          <parameter type="int" name="envc"/>
-          <parameter type="char*" array="true" name="envv"/>
-          <parameter type="gboolean" name="close_fds"/>
+          <parameter type="const-char*" name="dir" />
+          <parameter type="int" name="argc" />
+          <parameter type="char*" array="true" name="argv" />
+          <parameter type="int" name="envc" />
+          <parameter type="char*" array="true" name="envv" />
+          <parameter type="gboolean" name="close_fds" />
         </parameters>
       </method>
       <method name="ExecuteShell" cname="gnome_execute_shell" shared="true">
-        <return-type type="int"/>
+        <return-type type="int" />
         <parameters>
-          <parameter type="const-char*" name="dir"/>
-          <parameter type="const-char*" name="commandline"/>
+          <parameter type="const-char*" name="dir" />
+          <parameter type="const-char*" name="commandline" />
         </parameters>
       </method>
       <method name="ExecuteShellFds" cname="gnome_execute_shell_fds" shared="true">
-        <return-type type="int"/>
+        <return-type type="int" />
         <parameters>
-          <parameter type="const-char*" name="dir"/>
-          <parameter type="const-char*" name="commandline"/>
-          <parameter type="gboolean" name="close_fds"/>
+          <parameter type="const-char*" name="dir" />
+          <parameter type="const-char*" name="commandline" />
+          <parameter type="gboolean" name="close_fds" />
         </parameters>
       </method>
       <method name="ExecuteTerminalShell" cname="gnome_execute_terminal_shell" shared="true">
-        <return-type type="int"/>
+        <return-type type="int" />
         <parameters>
-          <parameter type="const-char*" name="dir"/>
-          <parameter type="const-char*" name="commandline"/>
+          <parameter type="const-char*" name="dir" />
+          <parameter type="const-char*" name="commandline" />
         </parameters>
       </method>
       <method name="ExecuteTerminalShellFds" cname="gnome_execute_terminal_shell_fds" shared="true">
-        <return-type type="int"/>
+        <return-type type="int" />
         <parameters>
-          <parameter type="const-char*" name="dir"/>
-          <parameter type="const-char*" name="commandline"/>
-          <parameter type="gboolean" name="close_fds"/>
+          <parameter type="const-char*" name="dir" />
+          <parameter type="const-char*" name="commandline" />
+          <parameter type="gboolean" name="close_fds" />
         </parameters>
       </method>
       <method name="PrependTerminalToVector" cname="gnome_prepend_terminal_to_vector" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="int*" name="argc"/>
-          <parameter type="char***" name="argv"/>
+          <parameter type="int*" name="argc" />
+          <parameter type="char***" name="argv" />
         </parameters>
       </method>
       <method name="UtilUserShell" cname="gnome_util_user_shell" shared="true">
-        <return-type type="char*"/>
+        <return-type type="char*" />
       </method>
     </class>
     <class name="Config" cname="GnomeConfig_">
       <method name="AssembleVector" cname="gnome_config_assemble_vector" shared="true">
-        <return-type type="char*"/>
+        <return-type type="char*" />
         <parameters>
-          <parameter type="int" name="argc"/>
-          <parameter type="const-char*" name="argv"/>
+          <parameter type="int" name="argc" />
+          <parameter type="const-char*" name="argv" />
         </parameters>
       </method>
       <method name="CleanFile_" cname="gnome_config_clean_file_" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-char*" name="path"/>
-          <parameter type="gboolean" name="priv"/>
+          <parameter type="const-char*" name="path" />
+          <parameter type="gboolean" name="priv" />
         </parameters>
       </method>
       <method name="CleanKey_" cname="gnome_config_clean_key_" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-char*" name="path"/>
-          <parameter type="gboolean" name="priv"/>
+          <parameter type="const-char*" name="path" />
+          <parameter type="gboolean" name="priv" />
         </parameters>
       </method>
       <method name="CleanSection_" cname="gnome_config_clean_section_" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-char*" name="path"/>
-          <parameter type="gboolean" name="priv"/>
+          <parameter type="const-char*" name="path" />
+          <parameter type="gboolean" name="priv" />
         </parameters>
       </method>
       <method name="DropAll" cname="gnome_config_drop_all" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="DropFile_" cname="gnome_config_drop_file_" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-char*" name="path"/>
-          <parameter type="gboolean" name="priv"/>
+          <parameter type="const-char*" name="path" />
+          <parameter type="gboolean" name="priv" />
         </parameters>
       </method>
       <method name="GetBoolWithDefault_" cname="gnome_config_get_bool_with_default_" shared="true">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="const-char*" name="path"/>
-          <parameter type="gboolean*" name="def"/>
-          <parameter type="gboolean" name="priv"/>
+          <parameter type="const-char*" name="path" />
+          <parameter type="gboolean*" name="def" />
+          <parameter type="gboolean" name="priv" />
         </parameters>
       </method>
       <method name="GetFloatWithDefault_" cname="gnome_config_get_float_with_default_" shared="true">
-        <return-type type="gdouble"/>
+        <return-type type="gdouble" />
         <parameters>
-          <parameter type="const-char*" name="path"/>
-          <parameter type="gboolean*" name="def"/>
-          <parameter type="gboolean" name="priv"/>
+          <parameter type="const-char*" name="path" />
+          <parameter type="gboolean*" name="def" />
+          <parameter type="gboolean" name="priv" />
         </parameters>
       </method>
       <method name="GetIntWithDefault_" cname="gnome_config_get_int_with_default_" shared="true">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="const-char*" name="path"/>
-          <parameter type="gboolean*" name="def"/>
-          <parameter type="gboolean" name="priv"/>
+          <parameter type="const-char*" name="path" />
+          <parameter type="gboolean*" name="def" />
+          <parameter type="gboolean" name="priv" />
         </parameters>
       </method>
       <method name="GetStringWithDefault_" cname="gnome_config_get_string_with_default_" shared="true">
-        <return-type type="char*"/>
+        <return-type type="char*" />
         <parameters>
-          <parameter type="const-char*" name="path"/>
-          <parameter type="gboolean*" name="def"/>
-          <parameter type="gboolean" name="priv"/>
+          <parameter type="const-char*" name="path" />
+          <parameter type="gboolean*" name="def" />
+          <parameter type="gboolean" name="priv" />
         </parameters>
       </method>
       <method name="GetTranslatedStringWithDefault_" cname="gnome_config_get_translated_string_with_default_" shared="true">
-        <return-type type="char*"/>
+        <return-type type="char*" />
         <parameters>
-          <parameter type="const-char*" name="path"/>
-          <parameter type="gboolean*" name="def"/>
-          <parameter type="gboolean" name="priv"/>
+          <parameter type="const-char*" name="path" />
+          <parameter type="gboolean*" name="def" />
+          <parameter type="gboolean" name="priv" />
         </parameters>
       </method>
       <method name="GetVectorWithDefault_" cname="gnome_config_get_vector_with_default_" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-char*" name="path"/>
-          <parameter type="gint*" name="argcp"/>
-          <parameter type="char***" name="argvp"/>
-          <parameter type="gboolean*" name="def"/>
-          <parameter type="gboolean" name="priv"/>
+          <parameter type="const-char*" name="path" />
+          <parameter type="gint*" name="argcp" />
+          <parameter type="char***" name="argvp" />
+          <parameter type="gboolean*" name="def" />
+          <parameter type="gboolean" name="priv" />
         </parameters>
       </method>
       <method name="HasSection_" cname="gnome_config_has_section_" shared="true">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="const-char*" name="path"/>
-          <parameter type="gboolean" name="priv"/>
+          <parameter type="const-char*" name="path" />
+          <parameter type="gboolean" name="priv" />
         </parameters>
       </method>
       <method name="InitIterator_" cname="gnome_config_init_iterator_" shared="true">
-        <return-type type="void*"/>
+        <return-type type="void*" />
         <parameters>
-          <parameter type="const-char*" name="path"/>
-          <parameter type="gboolean" name="priv"/>
+          <parameter type="const-char*" name="path" />
+          <parameter type="gboolean" name="priv" />
         </parameters>
       </method>
       <method name="InitIteratorSections_" cname="gnome_config_init_iterator_sections_" shared="true">
-        <return-type type="void*"/>
+        <return-type type="void*" />
         <parameters>
-          <parameter type="const-char*" name="path"/>
-          <parameter type="gboolean" name="priv"/>
+          <parameter type="const-char*" name="path" />
+          <parameter type="gboolean" name="priv" />
         </parameters>
       </method>
       <method name="IteratorNext" cname="gnome_config_iterator_next" shared="true">
-        <return-type type="void*"/>
+        <return-type type="void*" />
         <parameters>
-          <parameter type="void*" name="iterator_handle"/>
-          <parameter type="char**" name="key"/>
-          <parameter type="char**" name="value"/>
+          <parameter type="void*" name="iterator_handle" />
+          <parameter type="char**" name="key" />
+          <parameter type="char**" name="value" />
         </parameters>
       </method>
       <method name="MakeVector" cname="gnome_config_make_vector" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-char*" name="string"/>
-          <parameter type="int*" name="argcp"/>
-          <parameter type="char***" name="argvp"/>
+          <parameter type="const-char*" name="string" />
+          <parameter type="int*" name="argcp" />
+          <parameter type="char***" name="argvp" />
         </parameters>
       </method>
       <method name="PopPrefix" cname="gnome_config_pop_prefix" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="PushPrefix" cname="gnome_config_push_prefix" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-char*" name="path"/>
+          <parameter type="const-char*" name="path" />
         </parameters>
       </method>
       <method name="SetBool_" cname="gnome_config_set_bool_" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-char*" name="path"/>
-          <parameter type="gboolean" name="value"/>
-          <parameter type="gboolean" name="priv"/>
+          <parameter type="const-char*" name="path" />
+          <parameter type="gboolean" name="value" />
+          <parameter type="gboolean" name="priv" />
         </parameters>
       </method>
       <method name="SetFloat_" cname="gnome_config_set_float_" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-char*" name="path"/>
-          <parameter type="gdouble" name="value"/>
-          <parameter type="gboolean" name="priv"/>
+          <parameter type="const-char*" name="path" />
+          <parameter type="gdouble" name="value" />
+          <parameter type="gboolean" name="priv" />
         </parameters>
       </method>
       <method name="SetInt_" cname="gnome_config_set_int_" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-char*" name="path"/>
-          <parameter type="int" name="value"/>
-          <parameter type="gboolean" name="priv"/>
+          <parameter type="const-char*" name="path" />
+          <parameter type="int" name="value" />
+          <parameter type="gboolean" name="priv" />
         </parameters>
       </method>
       <method name="SetSetHandler" cname="gnome_config_set_set_handler" shared="true" hidden="1">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void" name="(*func)(void*"/>
-          <parameter type="void*" name="data"/>
+          <parameter type="void" name="(*func)(void*" />
+          <parameter type="void*" name="data" />
         </parameters>
       </method>
       <method name="SetString_" cname="gnome_config_set_string_" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-char*" name="path"/>
-          <parameter type="const-char*" name="value"/>
-          <parameter type="gboolean" name="priv"/>
+          <parameter type="const-char*" name="path" />
+          <parameter type="const-char*" name="value" />
+          <parameter type="gboolean" name="priv" />
         </parameters>
       </method>
       <method name="SetSyncHandler" cname="gnome_config_set_sync_handler" shared="true" hidden="1">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void" name="(*func)(void*"/>
-          <parameter type="void*" name="data"/>
+          <parameter type="void" name="(*func)(void*" />
+          <parameter type="void*" name="data" />
         </parameters>
       </method>
       <method name="SetTranslatedString_" cname="gnome_config_set_translated_string_" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-char*" name="path"/>
-          <parameter type="const-char*" name="value"/>
-          <parameter type="gboolean" name="priv"/>
+          <parameter type="const-char*" name="path" />
+          <parameter type="const-char*" name="value" />
+          <parameter type="gboolean" name="priv" />
         </parameters>
       </method>
       <method name="SetVector_" cname="gnome_config_set_vector_" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-char*" name="path"/>
-          <parameter type="int" name="argc"/>
-          <parameter type="const-char*" array="true" name="argv"/>
-          <parameter type="gboolean" name="priv"/>
+          <parameter type="const-char*" name="path" />
+          <parameter type="int" name="argc" />
+          <parameter type="const-char*" array="true" name="argv" />
+          <parameter type="gboolean" name="priv" />
         </parameters>
       </method>
       <method name="Sync" cname="gnome_config_sync" shared="true">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="SyncFile_" cname="gnome_config_sync_file_" shared="true">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="char*" name="path"/>
-          <parameter type="gboolean" name="priv"/>
+          <parameter type="char*" name="path" />
+          <parameter type="gboolean" name="priv" />
         </parameters>
       </method>
     </class>
     <class name="Gconf" cname="GnomeGconf_">
       <method name="GetAppSettingsRelative" cname="gnome_gconf_get_app_settings_relative" shared="true">
-        <return-type type="gchar*"/>
+        <return-type type="gchar*" />
         <parameters>
-          <parameter type="GnomeProgram*" name="program"/>
-          <parameter type="const-gchar*" name="subkey"/>
+          <parameter type="GnomeProgram*" name="program" />
+          <parameter type="const-gchar*" name="subkey" />
         </parameters>
       </method>
       <method name="GetGnomeLibsSettingsRelative" cname="gnome_gconf_get_gnome_libs_settings_relative" shared="true">
-        <return-type type="gchar*"/>
+        <return-type type="gchar*" />
         <parameters>
-          <parameter type="const-gchar*" name="subkey"/>
+          <parameter type="const-gchar*" name="subkey" />
         </parameters>
       </method>
     </class>
     <class name="Help" cname="GnomeHelp_">
       <method name="Display" cname="gnome_help_display" shared="true">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="const-char*" name="file_name"/>
-          <parameter type="const-char*" name="link_id"/>
-          <parameter type="GError**" name="error"/>
+          <parameter type="const-char*" name="file_name" />
+          <parameter type="const-char*" name="link_id" />
+          <parameter type="GError**" name="error" />
         </parameters>
       </method>
       <method name="DisplayDesktop" cname="gnome_help_display_desktop" shared="true">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GnomeProgram*" name="program"/>
-          <parameter type="const-char*" name="doc_id"/>
-          <parameter type="const-char*" name="file_name"/>
-          <parameter type="const-char*" name="link_id"/>
-          <parameter type="GError**" name="error"/>
+          <parameter type="GnomeProgram*" name="program" />
+          <parameter type="const-char*" name="doc_id" />
+          <parameter type="const-char*" name="file_name" />
+          <parameter type="const-char*" name="link_id" />
+          <parameter type="GError**" name="error" />
         </parameters>
       </method>
       <method name="DisplayDesktopWithEnv" cname="gnome_help_display_desktop_with_env" shared="true">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GnomeProgram*" name="program"/>
-          <parameter type="const-char*" name="doc_id"/>
-          <parameter type="const-char*" name="file_name"/>
-          <parameter type="const-char*" name="link_id"/>
-          <parameter type="char**" name="envp"/>
-          <parameter type="GError**" name="error"/>
+          <parameter type="GnomeProgram*" name="program" />
+          <parameter type="const-char*" name="doc_id" />
+          <parameter type="const-char*" name="file_name" />
+          <parameter type="const-char*" name="link_id" />
+          <parameter type="char**" name="envp" />
+          <parameter type="GError**" name="error" />
         </parameters>
       </method>
       <method name="DisplayUri" cname="gnome_help_display_uri" shared="true">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="const-char*" name="help_uri"/>
-          <parameter type="GError**" name="error"/>
+          <parameter type="const-char*" name="help_uri" />
+          <parameter type="GError**" name="error" />
         </parameters>
       </method>
       <method name="DisplayUriWithEnv" cname="gnome_help_display_uri_with_env" shared="true">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="const-char*" name="help_uri"/>
-          <parameter type="char**" name="envp"/>
-          <parameter type="GError**" name="error"/>
+          <parameter type="const-char*" name="help_uri" />
+          <parameter type="char**" name="envp" />
+          <parameter type="GError**" name="error" />
         </parameters>
       </method>
       <method name="DisplayWithDocId" cname="gnome_help_display_with_doc_id" shared="true">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GnomeProgram*" name="program"/>
-          <parameter type="const-char*" name="doc_id"/>
-          <parameter type="const-char*" name="file_name"/>
-          <parameter type="const-char*" name="link_id"/>
-          <parameter type="GError**" name="error"/>
+          <parameter type="GnomeProgram*" name="program" />
+          <parameter type="const-char*" name="doc_id" />
+          <parameter type="const-char*" name="file_name" />
+          <parameter type="const-char*" name="link_id" />
+          <parameter type="GError**" name="error" />
         </parameters>
       </method>
       <method name="DisplayWithDocIdAndEnv" cname="gnome_help_display_with_doc_id_and_env" shared="true">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GnomeProgram*" name="program"/>
-          <parameter type="const-char*" name="doc_id"/>
-          <parameter type="const-char*" name="file_name"/>
-          <parameter type="const-char*" name="link_id"/>
-          <parameter type="char**" name="envp"/>
-          <parameter type="GError**" name="error"/>
+          <parameter type="GnomeProgram*" name="program" />
+          <parameter type="const-char*" name="doc_id" />
+          <parameter type="const-char*" name="file_name" />
+          <parameter type="const-char*" name="link_id" />
+          <parameter type="char**" name="envp" />
+          <parameter type="GError**" name="error" />
         </parameters>
       </method>
       <method name="ErrorQuark" cname="gnome_help_error_quark" shared="true">
-        <return-type type="GQuark"/>
+        <return-type type="GQuark" />
       </method>
     </class>
     <class name="Score" cname="GnomeScore_">
       <method name="GetNotable" cname="gnome_score_get_notable" shared="true">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="const-gchar*" name="gamename"/>
-          <parameter type="const-gchar*" name="level"/>
-          <parameter type="gchar***" name="names"/>
-          <parameter type="gfloat**" name="scores"/>
-          <parameter type="time_t**" name="scoretimes"/>
+          <parameter type="const-gchar*" name="gamename" />
+          <parameter type="const-gchar*" name="level" />
+          <parameter type="gchar***" name="names" />
+          <parameter type="gfloat**" name="scores" />
+          <parameter type="time_t**" name="scoretimes" />
         </parameters>
       </method>
       <method name="Init" cname="gnome_score_init" shared="true">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="const-gchar*" name="gamename"/>
+          <parameter type="const-gchar*" name="gamename" />
         </parameters>
       </method>
       <method name="Log" cname="gnome_score_log" shared="true">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="gfloat" name="score"/>
-          <parameter type="const-gchar*" name="level"/>
-          <parameter type="/*" name="Pass"/>
+          <parameter type="gfloat" name="score" />
+          <parameter type="const-gchar*" name="level" />
+          <parameter type="/*" name="Pass" />
         </parameters>
       </method>
     </class>
     <class name="Sound" cname="GnomeSound_">
       <method name="ConnectionGet" cname="gnome_sound_connection_get" shared="true">
-        <return-type type="int"/>
+        <return-type type="int" />
       </method>
       <method name="Init" cname="gnome_sound_init" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-char*" name="hostname"/>
+          <parameter type="const-char*" name="hostname" />
         </parameters>
       </method>
       <method name="Play" cname="gnome_sound_play" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-char*" name="filename"/>
+          <parameter type="const-char*" name="filename" />
         </parameters>
       </method>
       <method name="SampleLoad" cname="gnome_sound_sample_load" shared="true">
-        <return-type type="int"/>
+        <return-type type="int" />
         <parameters>
-          <parameter type="const-char*" name="sample_name"/>
-          <parameter type="const-char*" name="filename"/>
+          <parameter type="const-char*" name="sample_name" />
+          <parameter type="const-char*" name="filename" />
         </parameters>
       </method>
       <method name="Shutdown" cname="gnome_sound_shutdown" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
     </class>
     <class name="Triggers" cname="GnomeTriggers_">
       <method name="AddTrigger" cname="gnome_triggers_add_trigger" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeTrigger*" name="nt"/>
-          <parameter ellipsis="true"/>
+          <parameter type="GnomeTrigger*" name="nt" />
+          <parameter ellipsis="true" />
         </parameters>
       </method>
       <method name="Do" cname="gnome_triggers_do" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-char*" name="msg"/>
-          <parameter type="const-char*" name="level"/>
-          <parameter ellipsis="true"/>
+          <parameter type="const-char*" name="msg" />
+          <parameter type="const-char*" name="level" />
+          <parameter ellipsis="true" />
         </parameters>
       </method>
       <method name="VaddTrigger" cname="gnome_triggers_vadd_trigger" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeTrigger*" name="nt"/>
-          <parameter type="char*" array="true" name="supinfo"/>
+          <parameter type="GnomeTrigger*" name="nt" />
+          <parameter type="char*" array="true" name="supinfo" />
         </parameters>
       </method>
       <method name="Vdo" cname="gnome_triggers_vdo" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-char*" name="msg"/>
-          <parameter type="const-char*" name="level"/>
-          <parameter type="const-char*" array="true" name="supinfo"/>
+          <parameter type="const-char*" name="msg" />
+          <parameter type="const-char*" name="level" />
+          <parameter type="const-char*" array="true" name="supinfo" />
         </parameters>
       </method>
     </class>
     <class name="Url" cname="GnomeUrl_">
       <method name="ErrorQuark" cname="gnome_url_error_quark" shared="true">
-        <return-type type="GQuark"/>
+        <return-type type="GQuark" />
       </method>
       <method name="Show" cname="gnome_url_show" shared="true">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="const-char*" name="url"/>
-          <parameter type="GError**" name="error"/>
+          <parameter type="const-char*" name="url" />
+          <parameter type="GError**" name="error" />
         </parameters>
       </method>
       <method name="ShowWithEnv" cname="gnome_url_show_with_env" shared="true">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="const-char*" name="url"/>
-          <parameter type="char**" name="envp"/>
-          <parameter type="GError**" name="error"/>
+          <parameter type="const-char*" name="url" />
+          <parameter type="char**" name="envp" />
+          <parameter type="GError**" name="error" />
         </parameters>
       </method>
     </class>
     <class name="User" cname="GnomeUser_">
       <method name="AccelsDirGet" cname="gnome_user_accels_dir_get" shared="true">
-        <return-type type="const-char*"/>
+        <return-type type="const-char*" />
       </method>
       <method name="DirGet" cname="gnome_user_dir_get" shared="true">
-        <return-type type="const-char*"/>
+        <return-type type="const-char*" />
       </method>
       <method name="PrivateDirGet" cname="gnome_user_private_dir_get" shared="true">
-        <return-type type="const-char*"/>
+        <return-type type="const-char*" />
       </method>
     </class>
   </namespace>
   <namespace name="Gnome" library="gnomecanvas-2">
     <object name="Canvas" cname="GnomeCanvas" parent="GtkLayout">
-      <field cname="root" type="GnomeCanvasItem*"/>
-      <field cname="redraw_area" type="ArtUta*"/>
-      <field cname="current_item" type="GnomeCanvasItem*"/>
-      <field cname="new_current_item" type="GnomeCanvasItem*"/>
-      <field cname="grabbed_item" type="GnomeCanvasItem*"/>
-      <field cname="focused_item" type="GnomeCanvasItem*"/>
-      <field cname="pixmap_gc" type="GdkGC*"/>
-      <field cname="pick_event" type="GdkEvent"/>
-      <field cname="scroll_x1" type="double"/>
-      <field cname="scroll_y1" type="double"/>
-      <field cname="scroll_x2" type="double"/>
-      <field cname="scroll_y2" type="double"/>
-      <field cname="pixels_per_unit" type="double"/>
-      <field cname="idle_id" type="guint"/>
-      <field cname="root_destroy_id" type="guint"/>
-      <field cname="redraw_x1" type="int"/>
-      <field cname="redraw_y1" type="int"/>
-      <field cname="redraw_x2" type="int"/>
-      <field cname="redraw_y2" type="int"/>
-      <field cname="draw_xofs" type="int"/>
-      <field cname="draw_yofs" type="int"/>
-      <field cname="zoom_xofs" type="int"/>
-      <field cname="zoom_yofs" type="int"/>
-      <field cname="state" type="int"/>
-      <field cname="grabbed_event_mask" type="guint"/>
-      <field cname="close_enough" type="int"/>
-      <field cname="center_scroll_region" bits="1" type="unsigned"/>
-      <field cname="need_update" bits="1" type="unsigned"/>
-      <field cname="need_redraw" bits="1" type="unsigned"/>
-      <field cname="need_repick" bits="1" type="unsigned"/>
-      <field cname="left_grabbed_item" bits="1" type="unsigned"/>
-      <field cname="in_repick" bits="1" type="unsigned"/>
-      <field cname="aa" bits="1" type="unsigned"/>
-      <field cname="dither" type="GdkRgbDither"/>
-      <property name="Aa" cname="aa" type="gboolean" readable="true" writeable="true" construct-only="true"/>
+      <field cname="root" type="GnomeCanvasItem*" />
+      <field cname="redraw_area" type="ArtUta*" />
+      <field cname="current_item" type="GnomeCanvasItem*" />
+      <field cname="new_current_item" type="GnomeCanvasItem*" />
+      <field cname="grabbed_item" type="GnomeCanvasItem*" />
+      <field cname="focused_item" type="GnomeCanvasItem*" />
+      <field cname="pixmap_gc" type="GdkGC*" />
+      <field cname="pick_event" type="GdkEvent" />
+      <field cname="scroll_x1" type="double" />
+      <field cname="scroll_y1" type="double" />
+      <field cname="scroll_x2" type="double" />
+      <field cname="scroll_y2" type="double" />
+      <field cname="pixels_per_unit" type="double" />
+      <field cname="idle_id" type="guint" />
+      <field cname="root_destroy_id" type="guint" />
+      <field cname="redraw_x1" type="int" />
+      <field cname="redraw_y1" type="int" />
+      <field cname="redraw_x2" type="int" />
+      <field cname="redraw_y2" type="int" />
+      <field cname="draw_xofs" type="int" />
+      <field cname="draw_yofs" type="int" />
+      <field cname="zoom_xofs" type="int" />
+      <field cname="zoom_yofs" type="int" />
+      <field cname="state" type="int" />
+      <field cname="grabbed_event_mask" type="guint" />
+      <field cname="close_enough" type="int" />
+      <field cname="center_scroll_region" bits="1" type="unsigned" />
+      <field cname="need_update" bits="1" type="unsigned" />
+      <field cname="need_redraw" bits="1" type="unsigned" />
+      <field cname="need_repick" bits="1" type="unsigned" />
+      <field cname="left_grabbed_item" bits="1" type="unsigned" />
+      <field cname="in_repick" bits="1" type="unsigned" />
+      <field cname="aa" bits="1" type="unsigned" />
+      <field cname="dither" type="GdkRgbDither" />
+      <property name="Aa" cname="aa" type="gboolean" readable="true" writeable="true" construct-only="true" />
       <signal name="DrawBackground" cname="draw_background" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeCanvas*" name="canvas"/>
-          <parameter type="GdkDrawable*" name="drawable"/>
-          <parameter type="int" name="x"/>
-          <parameter type="int" name="y"/>
-          <parameter type="int" name="width"/>
-          <parameter type="int" name="height"/>
+          <parameter type="GnomeCanvas*" name="canvas" />
+          <parameter type="GdkDrawable*" name="drawable" />
+          <parameter type="int" name="x" />
+          <parameter type="int" name="y" />
+          <parameter type="int" name="width" />
+          <parameter type="int" name="height" />
         </parameters>
       </signal>
       <signal name="RenderBackground" cname="render_background" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeCanvas*" name="canvas"/>
-          <parameter type="GnomeCanvasBuf*" name="buf"/>
+          <parameter type="GnomeCanvas*" name="canvas" />
+          <parameter type="GnomeCanvasBuf*" name="buf" />
         </parameters>
       </signal>
       <method name="C2w" cname="gnome_canvas_c2w">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="int" name="cx"/>
-          <parameter type="int" name="cy"/>
-          <parameter type="double*" name="wx" pass_as="out"/>
-          <parameter type="double*" name="wy" pass_as="out"/>
+          <parameter type="int" name="cx" />
+          <parameter type="int" name="cy" />
+          <parameter type="double*" name="wx" pass_as="out" />
+          <parameter type="double*" name="wy" pass_as="out" />
         </parameters>
       </method>
       <method name="CapGdkToArt" cname="gnome_canvas_cap_gdk_to_art" shared="true">
-        <return-type type="ArtPathStrokeCapType"/>
+        <return-type type="ArtPathStrokeCapType" />
         <parameters>
-          <parameter type="GdkCapStyle" name="gdk_cap"/>
+          <parameter type="GdkCapStyle" name="gdk_cap" />
         </parameters>
       </method>
       <method name="GetButtPoints" cname="gnome_canvas_get_butt_points" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="double" name="x1"/>
-          <parameter type="double" name="y1"/>
-          <parameter type="double" name="x2"/>
-          <parameter type="double" name="y2"/>
-          <parameter type="double" name="width"/>
-          <parameter type="int" name="project"/>
-          <parameter type="double*" name="bx1" pass_as="out"/>
-          <parameter type="double*" name="by1" pass_as="out"/>
-          <parameter type="double*" name="bx2" pass_as="out"/>
-          <parameter type="double*" name="by2" pass_as="out"/>
+          <parameter type="double" name="x1" />
+          <parameter type="double" name="y1" />
+          <parameter type="double" name="x2" />
+          <parameter type="double" name="y2" />
+          <parameter type="double" name="width" />
+          <parameter type="int" name="project" />
+          <parameter type="double*" name="bx1" pass_as="out" />
+          <parameter type="double*" name="by1" pass_as="out" />
+          <parameter type="double*" name="bx2" pass_as="out" />
+          <parameter type="double*" name="by2" pass_as="out" />
         </parameters>
       </method>
       <method name="GetCenterScrollRegion" cname="gnome_canvas_get_center_scroll_region">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetColor" cname="gnome_canvas_get_color">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="const-char*" name="spec"/>
-          <parameter type="GdkColor*" name="color" pass_as="out"/>
+          <parameter type="const-char*" name="spec" />
+          <parameter type="GdkColor*" name="color" pass_as="out" />
         </parameters>
       </method>
       <method name="GetColorPixel" cname="gnome_canvas_get_color_pixel">
-        <return-type type="gulong"/>
+        <return-type type="gulong" />
         <parameters>
-          <parameter type="guint" name="rgba"/>
+          <parameter type="guint" name="rgba" />
         </parameters>
       </method>
       <method name="GetDither" cname="gnome_canvas_get_dither">
-        <return-type type="GdkRgbDither"/>
+        <return-type type="GdkRgbDither" />
       </method>
       <method name="GetItemAt" cname="gnome_canvas_get_item_at">
-        <return-type type="GnomeCanvasItem*"/>
+        <return-type type="GnomeCanvasItem*" />
         <parameters>
-          <parameter type="double" name="x"/>
-          <parameter type="double" name="y"/>
+          <parameter type="double" name="x" />
+          <parameter type="double" name="y" />
         </parameters>
       </method>
       <method name="GetMiterPoints" cname="gnome_canvas_get_miter_points" shared="true">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="double" name="x1"/>
-          <parameter type="double" name="y1"/>
-          <parameter type="double" name="x2"/>
-          <parameter type="double" name="y2"/>
-          <parameter type="double" name="x3"/>
-          <parameter type="double" name="y3"/>
-          <parameter type="double" name="width"/>
-          <parameter type="double*" name="mx1" pass_as="out"/>
-          <parameter type="double*" name="my1" pass_as="out"/>
-          <parameter type="double*" name="mx2" pass_as="out"/>
-          <parameter type="double*" name="my2" pass_as="out"/>
+          <parameter type="double" name="x1" />
+          <parameter type="double" name="y1" />
+          <parameter type="double" name="x2" />
+          <parameter type="double" name="y2" />
+          <parameter type="double" name="x3" />
+          <parameter type="double" name="y3" />
+          <parameter type="double" name="width" />
+          <parameter type="double*" name="mx1" pass_as="out" />
+          <parameter type="double*" name="my1" pass_as="out" />
+          <parameter type="double*" name="mx2" pass_as="out" />
+          <parameter type="double*" name="my2" pass_as="out" />
         </parameters>
       </method>
       <method name="GetScrollOffsets" cname="gnome_canvas_get_scroll_offsets">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="int*" name="cx" pass_as="out"/>
-          <parameter type="int*" name="cy" pass_as="out"/>
+          <parameter type="int*" name="cx" pass_as="out" />
+          <parameter type="int*" name="cy" pass_as="out" />
         </parameters>
       </method>
       <method name="GetScrollRegion" cname="gnome_canvas_get_scroll_region">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="double*" name="x1" pass_as="out"/>
-          <parameter type="double*" name="y1" pass_as="out"/>
-          <parameter type="double*" name="x2" pass_as="out"/>
-          <parameter type="double*" name="y2" pass_as="out"/>
+          <parameter type="double*" name="x1" pass_as="out" />
+          <parameter type="double*" name="y1" pass_as="out" />
+          <parameter type="double*" name="x2" pass_as="out" />
+          <parameter type="double*" name="y2" pass_as="out" />
         </parameters>
       </method>
       <method name="GetType" cname="gnome_canvas_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="JoinGdkToArt" cname="gnome_canvas_join_gdk_to_art" shared="true">
-        <return-type type="ArtPathStrokeJoinType"/>
+        <return-type type="ArtPathStrokeJoinType" />
         <parameters>
-          <parameter type="GdkJoinStyle" name="gdk_join"/>
+          <parameter type="GdkJoinStyle" name="gdk_join" />
         </parameters>
       </method>
-      <constructor cname="gnome_canvas_new"/>
-      <constructor cname="gnome_canvas_new_aa"/>
+      <constructor cname="gnome_canvas_new" />
+      <constructor cname="gnome_canvas_new_aa" />
       <method name="RenderSvp" cname="gnome_canvas_render_svp" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeCanvasBuf*" name="buf"/>
-          <parameter type="ArtSVP*" name="svp"/>
-          <parameter type="guint32" name="rgba"/>
+          <parameter type="GnomeCanvasBuf*" name="buf" />
+          <parameter type="ArtSVP*" name="svp" />
+          <parameter type="guint32" name="rgba" />
         </parameters>
       </method>
       <method name="RequestRedraw" cname="gnome_canvas_request_redraw">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="int" name="x1"/>
-          <parameter type="int" name="y1"/>
-          <parameter type="int" name="x2"/>
-          <parameter type="int" name="y2"/>
+          <parameter type="int" name="x1" />
+          <parameter type="int" name="y1" />
+          <parameter type="int" name="x2" />
+          <parameter type="int" name="y2" />
         </parameters>
       </method>
       <method name="RequestRedrawUta" cname="gnome_canvas_request_redraw_uta">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="ArtUta*" name="uta"/>
+          <parameter type="ArtUta*" name="uta" />
         </parameters>
       </method>
       <method name="Root" cname="gnome_canvas_root">
-        <return-type type="GnomeCanvasGroup*"/>
+        <return-type type="GnomeCanvasGroup*" />
       </method>
       <method name="ScrollTo" cname="gnome_canvas_scroll_to">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="int" name="cx"/>
-          <parameter type="int" name="cy"/>
+          <parameter type="int" name="cx" />
+          <parameter type="int" name="cy" />
         </parameters>
       </method>
       <method name="SetCenterScrollRegion" cname="gnome_canvas_set_center_scroll_region">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="center_scroll_region"/>
+          <parameter type="gboolean" name="center_scroll_region" />
         </parameters>
       </method>
       <method name="SetDither" cname="gnome_canvas_set_dither">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkRgbDither" name="dither"/>
+          <parameter type="GdkRgbDither" name="dither" />
         </parameters>
       </method>
       <method name="SetPixelsPerUnit" cname="gnome_canvas_set_pixels_per_unit">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="double" name="n"/>
+          <parameter type="double" name="n" />
         </parameters>
       </method>
       <method name="SetScrollRegion" cname="gnome_canvas_set_scroll_region">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="double" name="x1"/>
-          <parameter type="double" name="y1"/>
-          <parameter type="double" name="x2"/>
-          <parameter type="double" name="y2"/>
+          <parameter type="double" name="x1" />
+          <parameter type="double" name="y1" />
+          <parameter type="double" name="x2" />
+          <parameter type="double" name="y2" />
         </parameters>
       </method>
       <method name="SetStippleOrigin" cname="gnome_canvas_set_stipple_origin">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkGC*" name="gc"/>
+          <parameter type="GdkGC*" name="gc" />
         </parameters>
       </method>
       <method name="UpdateBbox" cname="gnome_canvas_update_bbox" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeCanvasItem*" name="item"/>
-          <parameter type="int" name="x1"/>
-          <parameter type="int" name="y1"/>
-          <parameter type="int" name="x2"/>
-          <parameter type="int" name="y2"/>
+          <parameter type="GnomeCanvasItem*" name="item" />
+          <parameter type="int" name="x1" />
+          <parameter type="int" name="y1" />
+          <parameter type="int" name="x2" />
+          <parameter type="int" name="y2" />
         </parameters>
       </method>
       <method name="UpdateNow" cname="gnome_canvas_update_now">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="UpdateSvp" cname="gnome_canvas_update_svp">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="ArtSVP**" name="p_svp"/>
-          <parameter type="ArtSVP*" name="new_svp"/>
+          <parameter type="ArtSVP**" name="p_svp" />
+          <parameter type="ArtSVP*" name="new_svp" />
         </parameters>
       </method>
       <method name="UpdateSvpClip" cname="gnome_canvas_update_svp_clip">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="ArtSVP**" name="p_svp"/>
-          <parameter type="ArtSVP*" name="new_svp"/>
-          <parameter type="ArtSVP*" name="clip_svp"/>
+          <parameter type="ArtSVP**" name="p_svp" />
+          <parameter type="ArtSVP*" name="new_svp" />
+          <parameter type="ArtSVP*" name="clip_svp" />
         </parameters>
       </method>
       <method name="W2c" cname="gnome_canvas_w2c">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="double" name="wx"/>
-          <parameter type="double" name="wy"/>
-          <parameter type="int*" name="cx" pass_as="out"/>
-          <parameter type="int*" name="cy" pass_as="out"/>
+          <parameter type="double" name="wx" />
+          <parameter type="double" name="wy" />
+          <parameter type="int*" name="cx" pass_as="out" />
+          <parameter type="int*" name="cy" pass_as="out" />
         </parameters>
       </method>
       <method name="W2cAffine" cname="gnome_canvas_w2c_affine" hidden="1">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="double" array="true" name="affine"/>
+          <parameter type="double" array="true" name="affine" />
         </parameters>
       </method>
       <method name="W2cD" cname="gnome_canvas_w2c_d">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="double" name="wx"/>
-          <parameter type="double" name="wy"/>
-          <parameter type="double*" name="cx" pass_as="out"/>
-          <parameter type="double*" name="cy" pass_as="out"/>
+          <parameter type="double" name="wx" />
+          <parameter type="double" name="wy" />
+          <parameter type="double*" name="cx" pass_as="out" />
+          <parameter type="double*" name="cy" pass_as="out" />
         </parameters>
       </method>
       <method name="WindowToWorld" cname="gnome_canvas_window_to_world">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="double" name="winx"/>
-          <parameter type="double" name="winy"/>
-          <parameter type="double*" name="worldx" pass_as="out"/>
-          <parameter type="double*" name="worldy" pass_as="out"/>
+          <parameter type="double" name="winx" />
+          <parameter type="double" name="winy" />
+          <parameter type="double*" name="worldx" pass_as="out" />
+          <parameter type="double*" name="worldy" pass_as="out" />
         </parameters>
       </method>
       <method name="WorldToWindow" cname="gnome_canvas_world_to_window">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="double" name="worldx"/>
-          <parameter type="double" name="worldy"/>
-          <parameter type="double*" name="winx" pass_as="out"/>
-          <parameter type="double*" name="winy" pass_as="out"/>
+          <parameter type="double" name="worldx" />
+          <parameter type="double" name="worldy" />
+          <parameter type="double*" name="winx" pass_as="out" />
+          <parameter type="double*" name="winy" pass_as="out" />
         </parameters>
       </method>
     </object>
     <object name="CanvasBpath" cname="GnomeCanvasBpath" parent="GnomeCanvasShape">
-      <property name="Bpath" cname="bpath" type="gpointer" readable="true" writeable="true"/>
+      <property name="Bpath" cname="bpath" type="gpointer" readable="true" writeable="true" />
       <method name="GetType" cname="gnome_canvas_bpath_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
     </object>
     <object name="CanvasClipgroup" cname="GnomeCanvasClipgroup" parent="GnomeCanvasGroup">
-      <field cname="path" type="GnomeCanvasPathDef*"/>
-      <field cname="wind" type="ArtWindRule"/>
-      <field cname="svp" type="ArtSVP*"/>
-      <property name="Path" cname="path" type="gpointer" readable="true" writeable="true"/>
-      <property name="Wind" cname="wind" type="ArtWindRule" readable="true" writeable="true"/>
+      <field cname="path" type="GnomeCanvasPathDef*" />
+      <field cname="wind" type="ArtWindRule" />
+      <field cname="svp" type="ArtSVP*" />
+      <property name="Path" cname="path" type="gpointer" readable="true" writeable="true" />
+      <property name="Wind" cname="wind" readable="true" writeable="true" type="ArtWindRule" />
       <method name="GetType" cname="gnome_canvas_clipgroup_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
     </object>
     <object name="CanvasEllipse" cname="GnomeCanvasEllipse" parent="GnomeCanvasRE">
       <method name="GetType" cname="gnome_canvas_ellipse_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
     </object>
     <object name="CanvasGroup" cname="GnomeCanvasGroup" parent="GnomeCanvasItem">
-      <field cname="item_list" type="GList*"/>
-      <field cname="item_list_end" type="GList*"/>
-      <property name="X" cname="x" type="gdouble" readable="true" writeable="true"/>
-      <property name="Y" cname="y" type="gdouble" readable="true" writeable="true"/>
+      <field cname="item_list" type="GList*" />
+      <field cname="item_list_end" type="GList*" />
+      <property name="X" cname="x" type="gdouble" readable="true" writeable="true" />
+      <property name="Y" cname="y" type="gdouble" readable="true" writeable="true" />
       <method name="GetType" cname="gnome_canvas_group_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
     </object>
     <object name="CanvasItem" cname="GnomeCanvasItem" parent="GtkObject">
-      <field cname="canvas" type="GnomeCanvas*"/>
-      <field cname="parent" type="GnomeCanvasItem*"/>
-      <field cname="xform" type="double*"/>
-      <field cname="x1" type="double"/>
-      <field cname="y1" type="double"/>
-      <field cname="x2" type="double"/>
-      <field cname="y2" type="double"/>
-      <property name="Parent" cname="parent" type="GnomeCanvasItem" readable="true" writeable="true"/>
-      <signal name="CanvasEvent" cname="event" when="LAST">
-        <return-type type="gboolean"/>
+      <field cname="canvas" type="GnomeCanvas*" />
+      <field cname="parent" type="GnomeCanvasItem*" />
+      <field cname="xform" type="double*" />
+      <field cname="x1" type="double" />
+      <field cname="y1" type="double" />
+      <field cname="x2" type="double" />
+      <field cname="y2" type="double" />
+      <property name="Parent" cname="parent" type="GnomeCanvasItem" readable="true" writeable="true" />
+      <signal cname="event" when="LAST" name="CanvasEvent">
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GnomeCanvasItem*" name="item"/>
-          <parameter type="GdkEvent*" name="event"/>
+          <parameter type="GnomeCanvasItem*" name="item" />
+          <parameter type="GdkEvent*" name="event" />
         </parameters>
       </signal>
       <method name="AffineAbsolute" cname="gnome_canvas_item_affine_absolute" hidden="1">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-double" array="true" name="affine"/>
+          <parameter type="const-double" array="true" name="affine" />
         </parameters>
       </method>
       <method name="AffineRelative" cname="gnome_canvas_item_affine_relative" hidden="1">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-double" array="true" name="affine"/>
+          <parameter type="const-double" array="true" name="affine" />
         </parameters>
       </method>
       <method name="Construct" cname="gnome_canvas_item_construct" hidden="1">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeCanvasGroup*" name="parent"/>
-          <parameter type="const-gchar*" name="first_arg_name"/>
-          <parameter type="va_list" name="args"/>
+          <parameter type="GnomeCanvasGroup*" name="parent" />
+          <parameter type="const-gchar*" name="first_arg_name" />
+          <parameter type="va_list" name="args" />
         </parameters>
       </method>
       <method name="GetBounds" cname="gnome_canvas_item_get_bounds">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="double*" name="x1" pass_as="out"/>
-          <parameter type="double*" name="y1" pass_as="out"/>
-          <parameter type="double*" name="x2" pass_as="out"/>
-          <parameter type="double*" name="y2" pass_as="out"/>
+          <parameter type="double*" name="x1" pass_as="out" />
+          <parameter type="double*" name="y1" pass_as="out" />
+          <parameter type="double*" name="x2" pass_as="out" />
+          <parameter type="double*" name="y2" pass_as="out" />
         </parameters>
       </method>
       <method name="GetType" cname="gnome_canvas_item_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="Grab" cname="gnome_canvas_item_grab">
-        <return-type type="int"/>
+        <return-type type="int" />
         <parameters>
-          <parameter type="unsigned" name="int"/>
-          <parameter type="GdkCursor*" name="cursor"/>
-          <parameter type="guint32" name="etime"/>
+          <parameter type="unsigned" name="int" />
+          <parameter type="GdkCursor*" name="cursor" />
+          <parameter type="guint32" name="etime" />
         </parameters>
       </method>
       <method name="GrabFocus" cname="gnome_canvas_item_grab_focus">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="Hide" cname="gnome_canvas_item_hide">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="I2cAffine" cname="gnome_canvas_item_i2c_affine" hidden="1">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="double" array="true" name="affine"/>
+          <parameter type="double" array="true" name="affine" />
         </parameters>
       </method>
       <method name="I2w" cname="gnome_canvas_item_i2w">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="double*" name="x" pass_as="ref"/>
-          <parameter type="double*" name="y" pass_as="ref"/>
+          <parameter type="double*" name="x" pass_as="ref" />
+          <parameter type="double*" name="y" pass_as="ref" />
         </parameters>
       </method>
       <method name="I2wAffine" cname="gnome_canvas_item_i2w_affine" hidden="1">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="double" array="true" name="affine"/>
+          <parameter type="double" array="true" name="affine" />
         </parameters>
       </method>
       <method name="Lower" cname="gnome_canvas_item_lower">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="int" name="positions"/>
+          <parameter type="int" name="positions" />
         </parameters>
       </method>
       <method name="LowerToBottom" cname="gnome_canvas_item_lower_to_bottom">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="Move" cname="gnome_canvas_item_move">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="double" name="dx"/>
-          <parameter type="double" name="dy"/>
+          <parameter type="double" name="dx" />
+          <parameter type="double" name="dy" />
         </parameters>
       </method>
-      <constructor cname="gnome_canvas_item_new">
+      <constructor cname="gnome_canvas_item_new" hidden="1">
         <parameters>
-          <parameter type="GnomeCanvasGroup*" name="parent"/>
-          <parameter type="GType" name="type"/>
-          <parameter type="const-gchar*" name="first_arg_name"/>
-          <parameter ellipsis="true"/>
+          <parameter type="GnomeCanvasGroup*" name="parent" />
+          <parameter type="GType" name="type" />
+          <parameter type="const-gchar*" name="first_arg_name" />
+          <parameter ellipsis="true" />
         </parameters>
       </constructor>
       <method name="Raise" cname="gnome_canvas_item_raise">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="int" name="positions"/>
+          <parameter type="int" name="positions" />
         </parameters>
       </method>
       <method name="RaiseToTop" cname="gnome_canvas_item_raise_to_top">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="Reparent" cname="gnome_canvas_item_reparent">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeCanvasGroup*" name="new_group"/>
+          <parameter type="GnomeCanvasGroup*" name="new_group" />
         </parameters>
       </method>
       <method name="RequestRedrawSvp" cname="gnome_canvas_item_request_redraw_svp">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-ArtSVP*" name="svp"/>
+          <parameter type="const-ArtSVP*" name="svp" />
         </parameters>
       </method>
       <method name="RequestUpdate" cname="gnome_canvas_item_request_update">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="ResetBounds" cname="gnome_canvas_item_reset_bounds">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="Set" cname="gnome_canvas_item_set">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="first_arg_name"/>
-          <parameter ellipsis="true"/>
+          <parameter type="const-gchar*" name="first_arg_name" />
+          <parameter ellipsis="true" />
         </parameters>
       </method>
       <method name="SetValist" cname="gnome_canvas_item_set_valist" hidden="1">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="first_arg_name"/>
-          <parameter type="va_list" name="args"/>
+          <parameter type="const-gchar*" name="first_arg_name" />
+          <parameter type="va_list" name="args" />
         </parameters>
       </method>
       <method name="Show" cname="gnome_canvas_item_show">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="Ungrab" cname="gnome_canvas_item_ungrab">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="guint32" name="etime"/>
+          <parameter type="guint32" name="etime" />
         </parameters>
       </method>
       <method name="UpdateSvp" cname="gnome_canvas_item_update_svp">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="ArtSVP**" name="p_svp"/>
-          <parameter type="ArtSVP*" name="new_svp"/>
+          <parameter type="ArtSVP**" name="p_svp" />
+          <parameter type="ArtSVP*" name="new_svp" />
         </parameters>
       </method>
       <method name="UpdateSvpClip" cname="gnome_canvas_item_update_svp_clip">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="ArtSVP**" name="p_svp"/>
-          <parameter type="ArtSVP*" name="new_svp"/>
-          <parameter type="ArtSVP*" name="clip_svp"/>
+          <parameter type="ArtSVP**" name="p_svp" />
+          <parameter type="ArtSVP*" name="new_svp" />
+          <parameter type="ArtSVP*" name="clip_svp" />
         </parameters>
       </method>
       <method name="W2i" cname="gnome_canvas_item_w2i">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="double*" name="x" pass_as="ref"/>
-          <parameter type="double*" name="y" pass_as="ref"/>
+          <parameter type="double*" name="x" pass_as="ref" />
+          <parameter type="double*" name="y" pass_as="ref" />
         </parameters>
       </method>
     </object>
     <object name="CanvasLine" cname="GnomeCanvasLine" parent="GnomeCanvasItem">
-      <field cname="coords" type="double*"/>
-      <field cname="first_coords" type="double*"/>
-      <field cname="last_coords" type="double*"/>
-      <field cname="gc" type="GdkGC*"/>
-      <field cname="stipple" type="GdkBitmap*"/>
-      <field cname="fill_svp" type="ArtSVP*"/>
-      <field cname="first_svp" type="ArtSVP*"/>
-      <field cname="last_svp" type="ArtSVP*"/>
-      <field cname="width" type="double"/>
-      <field cname="shape_a" type="double"/>
-      <field cname="shape_b" type="double"/>
-      <field cname="shape_c" type="double"/>
-      <field cname="cap" type="GdkCapStyle"/>
-      <field cname="join" type="GdkJoinStyle"/>
-      <field cname="line_style" type="GdkLineStyle"/>
-      <field cname="fill_pixel" type="gulong"/>
-      <field cname="fill_rgba" type="guint32"/>
-      <field cname="num_points" type="int"/>
-      <field cname="fill_color" type="guint"/>
-      <field cname="spline_steps" type="int"/>
-      <field cname="width_pixels" bits="1" type="guint"/>
-      <field cname="first_arrow" bits="1" type="guint"/>
-      <field cname="last_arrow" bits="1" type="guint"/>
-      <field cname="smooth" bits="1" type="guint"/>
-      <property name="Points" cname="points" type="GnomeCanvasPoints" readable="true" writeable="true"/>
-      <property name="FillColor" cname="fill_color" type="gchar*" readable="true" writeable="true"/>
-      <property name="FillColorGdk" cname="fill_color_gdk" type="GdkColor" readable="true" writeable="true"/>
-      <property name="FillColorRgba" cname="fill_color_rgba" type="guint" readable="true" writeable="true"/>
-      <property name="FillStipple" cname="fill_stipple" type="GdkDrawable" readable="true" writeable="true"/>
-      <property name="WidthPixels" cname="width_pixels" type="guint" readable="true" writeable="true"/>
-      <property name="WidthUnits" cname="width_units" type="gdouble" readable="true" writeable="true"/>
-      <property name="CapStyle" cname="cap_style" type="GdkCapStyle" readable="true" writeable="true"/>
-      <property name="JoinStyle" cname="join_style" type="GdkJoinStyle" readable="true" writeable="true"/>
-      <property name="LineStyle" cname="line_style" type="GdkLineStyle" readable="true" writeable="true"/>
-      <property name="FirstArrowhead" cname="first_arrowhead" type="gboolean" readable="true" writeable="true"/>
-      <property name="LastArrowhead" cname="last_arrowhead" type="gboolean" readable="true" writeable="true"/>
-      <property name="Smooth" cname="smooth" type="gboolean" readable="true" writeable="true"/>
-      <property name="SplineSteps" cname="spline_steps" type="guint" readable="true" writeable="true"/>
-      <property name="ArrowShapeA" cname="arrow_shape_a" type="gdouble" readable="true" writeable="true"/>
-      <property name="ArrowShapeB" cname="arrow_shape_b" type="gdouble" readable="true" writeable="true"/>
-      <property name="ArrowShapeC" cname="arrow_shape_c" type="gdouble" readable="true" writeable="true"/>
+      <field cname="coords" type="double*" />
+      <field cname="first_coords" type="double*" />
+      <field cname="last_coords" type="double*" />
+      <field cname="gc" type="GdkGC*" />
+      <field cname="stipple" type="GdkBitmap*" />
+      <field cname="fill_svp" type="ArtSVP*" />
+      <field cname="first_svp" type="ArtSVP*" />
+      <field cname="last_svp" type="ArtSVP*" />
+      <field cname="width" type="double" />
+      <field cname="shape_a" type="double" />
+      <field cname="shape_b" type="double" />
+      <field cname="shape_c" type="double" />
+      <field cname="cap" type="GdkCapStyle" />
+      <field cname="join" type="GdkJoinStyle" />
+      <field cname="line_style" type="GdkLineStyle" />
+      <field cname="fill_pixel" type="gulong" />
+      <field cname="fill_rgba" type="guint32" />
+      <field cname="num_points" type="int" />
+      <field cname="fill_color" type="guint" />
+      <field cname="spline_steps" type="int" />
+      <field cname="width_pixels" bits="1" type="guint" />
+      <field cname="first_arrow" bits="1" type="guint" />
+      <field cname="last_arrow" bits="1" type="guint" />
+      <field cname="smooth" bits="1" type="guint" />
+      <property name="Points" cname="points" type="GnomeCanvasPoints" readable="true" writeable="true" />
+      <property name="FillColor" cname="fill_color" type="gchar*" readable="true" writeable="true" />
+      <property name="FillColorGdk" cname="fill_color_gdk" type="GdkColor" readable="true" writeable="true" />
+      <property name="FillColorRgba" cname="fill_color_rgba" type="guint" readable="true" writeable="true" />
+      <property name="FillStipple" cname="fill_stipple" type="GdkDrawable" readable="true" writeable="true" />
+      <property name="WidthPixels" cname="width_pixels" type="guint" readable="true" writeable="true" />
+      <property name="WidthUnits" cname="width_units" type="gdouble" readable="true" writeable="true" />
+      <property name="CapStyle" cname="cap_style" type="GdkCapStyle" readable="true" writeable="true" />
+      <property name="JoinStyle" cname="join_style" type="GdkJoinStyle" readable="true" writeable="true" />
+      <property name="LineStyle" cname="line_style" type="GdkLineStyle" readable="true" writeable="true" />
+      <property name="FirstArrowhead" cname="first_arrowhead" type="gboolean" readable="true" writeable="true" />
+      <property name="LastArrowhead" cname="last_arrowhead" type="gboolean" readable="true" writeable="true" />
+      <property name="Smooth" cname="smooth" type="gboolean" readable="true" writeable="true" />
+      <property name="SplineSteps" cname="spline_steps" type="guint" readable="true" writeable="true" />
+      <property name="ArrowShapeA" cname="arrow_shape_a" type="gdouble" readable="true" writeable="true" />
+      <property name="ArrowShapeB" cname="arrow_shape_b" type="gdouble" readable="true" writeable="true" />
+      <property name="ArrowShapeC" cname="arrow_shape_c" type="gdouble" readable="true" writeable="true" />
       <method name="GetType" cname="gnome_canvas_line_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
     </object>
     <object name="CanvasPixbuf" cname="GnomeCanvasPixbuf" parent="GnomeCanvasItem">
-      <field cname="priv" type="gpointer"/>
-      <property name="Pixbuf" cname="pixbuf" type="GdkPixbuf" readable="true" writeable="true"/>
-      <property name="Width" cname="width" type="gdouble" readable="true" writeable="true"/>
-      <property name="WidthSet" cname="width_set" type="gboolean" readable="true" writeable="true"/>
-      <property name="WidthInPixels" cname="width_in_pixels" type="gboolean" readable="true" writeable="true"/>
-      <property name="Height" cname="height" type="gdouble" readable="true" writeable="true"/>
-      <property name="HeightSet" cname="height_set" type="gboolean" readable="true" writeable="true"/>
-      <property name="HeightInPixels" cname="height_in_pixels" type="gboolean" readable="true" writeable="true"/>
-      <property name="X" cname="x" type="gdouble" readable="true" writeable="true"/>
-      <property name="XInPixels" cname="x_in_pixels" type="gboolean" readable="true" writeable="true"/>
-      <property name="Y" cname="y" type="gdouble" readable="true" writeable="true"/>
-      <property name="YInPixels" cname="y_in_pixels" type="gboolean" readable="true" writeable="true"/>
-      <property name="Anchor" cname="anchor" type="GtkAnchorType" readable="true" writeable="true"/>
+      <field cname="priv" type="gpointer" />
+      <property name="Pixbuf" cname="pixbuf" type="GdkPixbuf" readable="true" writeable="true" />
+      <property name="Width" cname="width" type="gdouble" readable="true" writeable="true" />
+      <property name="WidthSet" cname="width_set" type="gboolean" readable="true" writeable="true" />
+      <property name="WidthInPixels" cname="width_in_pixels" type="gboolean" readable="true" writeable="true" />
+      <property name="Height" cname="height" type="gdouble" readable="true" writeable="true" />
+      <property name="HeightSet" cname="height_set" type="gboolean" readable="true" writeable="true" />
+      <property name="HeightInPixels" cname="height_in_pixels" type="gboolean" readable="true" writeable="true" />
+      <property name="X" cname="x" type="gdouble" readable="true" writeable="true" />
+      <property name="XInPixels" cname="x_in_pixels" type="gboolean" readable="true" writeable="true" />
+      <property name="Y" cname="y" type="gdouble" readable="true" writeable="true" />
+      <property name="YInPixels" cname="y_in_pixels" type="gboolean" readable="true" writeable="true" />
+      <property name="Anchor" cname="anchor" type="GtkAnchorType" readable="true" writeable="true" />
       <method name="GetType" cname="gnome_canvas_pixbuf_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
     </object>
     <object name="CanvasPolygon" cname="GnomeCanvasPolygon" parent="GnomeCanvasShape">
-      <field cname="path_def" type="GnomeCanvasPathDef*"/>
-      <property name="Points" cname="points" type="GnomeCanvasPoints" readable="true" writeable="true"/>
+      <field cname="path_def" type="GnomeCanvasPathDef*" />
+      <property name="Points" cname="points" type="GnomeCanvasPoints" readable="true" writeable="true" />
       <method name="GetType" cname="gnome_canvas_polygon_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="ToPoint" cname="gnome_canvas_polygon_to_point" shared="true">
-        <return-type type="double"/>
+        <return-type type="double" />
         <parameters>
-          <parameter type="double*" name="poly"/>
-          <parameter type="int" name="num_points"/>
-          <parameter type="double" name="x"/>
-          <parameter type="double" name="y"/>
+          <parameter type="double*" name="poly" />
+          <parameter type="int" name="num_points" />
+          <parameter type="double" name="x" />
+          <parameter type="double" name="y" />
         </parameters>
       </method>
     </object>
     <object name="CanvasRE" cname="GnomeCanvasRE" parent="GnomeCanvasShape">
-      <field cname="x1" type="double"/>
-      <field cname="y1" type="double"/>
-      <field cname="x2" type="double"/>
-      <field cname="y2" type="double"/>
-      <field cname="path_dirty" bits="1" type="unsigned"/>
-      <property name="X1" cname="x1" type="gdouble" readable="true" writeable="true"/>
-      <property name="Y1" cname="y1" type="gdouble" readable="true" writeable="true"/>
-      <property name="X2" cname="x2" type="gdouble" readable="true" writeable="true"/>
-      <property name="Y2" cname="y2" type="gdouble" readable="true" writeable="true"/>
+      <field cname="x1" type="double" />
+      <field cname="y1" type="double" />
+      <field cname="x2" type="double" />
+      <field cname="y2" type="double" />
+      <field cname="path_dirty" bits="1" type="unsigned" />
+      <property name="X1" cname="x1" type="gdouble" readable="true" writeable="true" />
+      <property name="Y1" cname="y1" type="gdouble" readable="true" writeable="true" />
+      <property name="X2" cname="x2" type="gdouble" readable="true" writeable="true" />
+      <property name="Y2" cname="y2" type="gdouble" readable="true" writeable="true" />
       <method name="GetType" cname="gnome_canvas_re_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
     </object>
     <object name="CanvasRect" cname="GnomeCanvasRect" parent="GnomeCanvasRE">
       <method name="GetType" cname="gnome_canvas_rect_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
     </object>
     <object name="CanvasRichText" cname="GnomeCanvasRichText" parent="GnomeCanvasItem">
-      <field cname="_priv" type="GnomeCanvasRichTextPrivate*"/>
-      <property name="Text" cname="text" type="gchar*" readable="true" writeable="true"/>
-      <property name="X" cname="x" type="gdouble" readable="true" writeable="true"/>
-      <property name="Y" cname="y" type="gdouble" readable="true" writeable="true"/>
-      <property name="Width" cname="width" type="gdouble" readable="true" writeable="true"/>
-      <property name="Height" cname="height" type="gdouble" readable="true" writeable="true"/>
-      <property name="Editable" cname="editable" type="gboolean" readable="true" writeable="true"/>
-      <property name="Visible" cname="visible" type="gboolean" readable="true" writeable="true"/>
-      <property name="CursorVisible" cname="cursor_visible" type="gboolean" readable="true" writeable="true"/>
-      <property name="CursorBlink" cname="cursor_blink" type="gboolean" readable="true" writeable="true"/>
-      <property name="GrowHeight" cname="grow_height" type="gboolean" readable="true" writeable="true"/>
-      <property name="WrapMode" cname="wrap_mode" type="GtkWrapMode" readable="true" writeable="true"/>
-      <property name="Justification" cname="justification" type="GtkJustification" readable="true" writeable="true"/>
-      <property name="Direction" cname="direction" type="GtkDirectionType" readable="true" writeable="true"/>
-      <property name="Anchor" cname="anchor" type="GtkAnchorType" readable="true" writeable="true"/>
-      <property name="PixelsAboveLines" cname="pixels_above_lines" type="gint" readable="true" writeable="true"/>
-      <property name="PixelsBelowLines" cname="pixels_below_lines" type="gint" readable="true" writeable="true"/>
-      <property name="PixelsInsideWrap" cname="pixels_inside_wrap" type="gint" readable="true" writeable="true"/>
-      <property name="LeftMargin" cname="left_margin" type="gint" readable="true" writeable="true"/>
-      <property name="RightMargin" cname="right_margin" type="gint" readable="true" writeable="true"/>
-      <property name="Indent" cname="indent" type="gint" readable="true" writeable="true"/>
+      <field cname="_priv" type="GnomeCanvasRichTextPrivate*" />
+      <property name="Text" cname="text" type="gchar*" readable="true" writeable="true" />
+      <property name="X" cname="x" type="gdouble" readable="true" writeable="true" />
+      <property name="Y" cname="y" type="gdouble" readable="true" writeable="true" />
+      <property name="Width" cname="width" type="gdouble" readable="true" writeable="true" />
+      <property name="Height" cname="height" type="gdouble" readable="true" writeable="true" />
+      <property name="Editable" cname="editable" type="gboolean" readable="true" writeable="true" />
+      <property name="Visible" cname="visible" type="gboolean" readable="true" writeable="true" />
+      <property name="CursorVisible" cname="cursor_visible" type="gboolean" readable="true" writeable="true" />
+      <property name="CursorBlink" cname="cursor_blink" type="gboolean" readable="true" writeable="true" />
+      <property name="GrowHeight" cname="grow_height" type="gboolean" readable="true" writeable="true" />
+      <property name="WrapMode" cname="wrap_mode" type="GtkWrapMode" readable="true" writeable="true" />
+      <property name="Justification" cname="justification" type="GtkJustification" readable="true" writeable="true" />
+      <property name="Direction" cname="direction" type="GtkDirectionType" readable="true" writeable="true" />
+      <property name="Anchor" cname="anchor" type="GtkAnchorType" readable="true" writeable="true" />
+      <property name="PixelsAboveLines" cname="pixels_above_lines" type="gint" readable="true" writeable="true" />
+      <property name="PixelsBelowLines" cname="pixels_below_lines" type="gint" readable="true" writeable="true" />
+      <property name="PixelsInsideWrap" cname="pixels_inside_wrap" type="gint" readable="true" writeable="true" />
+      <property name="LeftMargin" cname="left_margin" type="gint" readable="true" writeable="true" />
+      <property name="RightMargin" cname="right_margin" type="gint" readable="true" writeable="true" />
+      <property name="Indent" cname="indent" type="gint" readable="true" writeable="true" />
       <signal when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeCanvasRichText*" name="text"/>
-          <parameter type="GtkTextTag*" name="tag"/>
+          <parameter type="GnomeCanvasRichText*" name="text" />
+          <parameter type="GtkTextTag*" name="tag" />
         </parameters>
       </signal>
       <method name="CopyClipboard" cname="gnome_canvas_rich_text_copy_clipboard">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="CutClipboard" cname="gnome_canvas_rich_text_cut_clipboard">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="GetBuffer" cname="gnome_canvas_rich_text_get_buffer">
-        <return-type type="GtkTextBuffer*"/>
+        <return-type type="GtkTextBuffer*" />
       </method>
       <method name="GetIterAtLocation" cname="gnome_canvas_rich_text_get_iter_at_location">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextIter*" name="iter" pass_as="out"/>
-          <parameter type="gint" name="x"/>
-          <parameter type="gint" name="y"/>
+          <parameter type="GtkTextIter*" name="iter" pass_as="out" />
+          <parameter type="gint" name="x" />
+          <parameter type="gint" name="y" />
         </parameters>
       </method>
       <method name="GetIterLocation" cname="gnome_canvas_rich_text_get_iter_location">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-GtkTextIter*" name="iter"/>
-          <parameter type="GdkRectangle*" name="location" pass_as="out"/>
+          <parameter type="const-GtkTextIter*" name="iter" />
+          <parameter type="GdkRectangle*" name="location" pass_as="out" />
         </parameters>
       </method>
       <method name="GetType" cname="gnome_canvas_rich_text_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="PasteClipboard" cname="gnome_canvas_rich_text_paste_clipboard">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="SetBuffer" cname="gnome_canvas_rich_text_set_buffer">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextBuffer*" name="buffer"/>
+          <parameter type="GtkTextBuffer*" name="buffer" />
         </parameters>
       </method>
     </object>
     <object name="CanvasShape" cname="GnomeCanvasShape" parent="GnomeCanvasItem">
-      <field cname="priv" type="GnomeCanvasShapePriv*"/>
-      <property name="FillColor" cname="fill_color" type="gchar*" writeable="true"/>
-      <property name="FillColorGdk" cname="fill_color_gdk" type="GdkColor" readable="true" writeable="true"/>
-      <property name="FillColorRgba" cname="fill_color_rgba" type="guint" readable="true" writeable="true"/>
-      <property name="OutlineColor" cname="outline_color" type="gchar*" writeable="true"/>
-      <property name="OutlineColorGdk" cname="outline_color_gdk" type="GdkColor" readable="true" writeable="true"/>
-      <property name="OutlineColorRgba" cname="outline_color_rgba" type="guint" readable="true" writeable="true"/>
-      <property name="FillStipple" cname="fill_stipple" type="GdkDrawable" readable="true" writeable="true"/>
-      <property name="OutlineStipple" cname="outline_stipple" type="GdkDrawable" readable="true" writeable="true"/>
-      <property name="WidthPixels" cname="width_pixels" type="guint" readable="true" writeable="true"/>
-      <property name="WidthUnits" cname="width_units" type="gdouble" writeable="true"/>
-      <property name="CapStyle" cname="cap_style" type="GdkCapStyle" readable="true" writeable="true"/>
-      <property name="JoinStyle" cname="join_style" type="GdkJoinStyle" readable="true" writeable="true"/>
-      <property name="Wind" cname="wind" type="guint" readable="true" writeable="true"/>
-      <property name="Miterlimit" cname="miterlimit" type="gdouble" readable="true" writeable="true"/>
-      <property name="Dash" cname="dash" type="ArtVpathDash" readable="true" writeable="true"/>
+      <field cname="priv" type="GnomeCanvasShapePriv*" />
+      <property name="FillColor" cname="fill_color" type="gchar*" writeable="true" />
+      <property name="FillColorGdk" cname="fill_color_gdk" type="GdkColor" readable="true" writeable="true" />
+      <property name="FillColorRgba" cname="fill_color_rgba" type="guint" readable="true" writeable="true" />
+      <property name="OutlineColor" cname="outline_color" type="gchar*" writeable="true" />
+      <property name="OutlineColorGdk" cname="outline_color_gdk" type="GdkColor" readable="true" writeable="true" />
+      <property name="OutlineColorRgba" cname="outline_color_rgba" type="guint" readable="true" writeable="true" />
+      <property name="FillStipple" cname="fill_stipple" type="GdkDrawable" readable="true" writeable="true" />
+      <property name="OutlineStipple" cname="outline_stipple" type="GdkDrawable" readable="true" writeable="true" />
+      <property name="WidthPixels" cname="width_pixels" type="guint" readable="true" writeable="true" />
+      <property name="WidthUnits" cname="width_units" type="gdouble" writeable="true" />
+      <property name="CapStyle" cname="cap_style" type="GdkCapStyle" readable="true" writeable="true" />
+      <property name="JoinStyle" cname="join_style" type="GdkJoinStyle" readable="true" writeable="true" />
+      <property name="Wind" cname="wind" type="guint" readable="true" writeable="true" />
+      <property name="Miterlimit" cname="miterlimit" type="gdouble" readable="true" writeable="true" />
+      <property name="Dash" cname="dash" readable="true" writeable="true" type="ArtVpathDash" />
       <method name="GetPathDef" cname="gnome_canvas_shape_get_path_def">
-        <return-type type="GnomeCanvasPathDef*"/>
+        <return-type type="GnomeCanvasPathDef*" />
       </method>
       <method name="GetType" cname="gnome_canvas_shape_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="SetPathDef" cname="gnome_canvas_shape_set_path_def">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeCanvasPathDef*" name="def"/>
+          <parameter type="GnomeCanvasPathDef*" name="def" />
         </parameters>
       </method>
     </object>
     <object name="CanvasText" cname="GnomeCanvasText" parent="GnomeCanvasItem">
-      <field cname="font_desc" type="PangoFontDescription*"/>
-      <field cname="attr_list" type="PangoAttrList*"/>
-      <field cname="underline" type="PangoUnderline"/>
-      <field cname="strikethrough" type="gboolean"/>
-      <field cname="rise" type="int"/>
-      <field cname="scale" type="double"/>
-      <field cname="text" type="char*"/>
-      <field cname="stipple" type="GdkBitmap*"/>
-      <field cname="gc" type="GdkGC*"/>
-      <field cname="layout" type="PangoLayout*"/>
-      <field cname="pixel" type="gulong"/>
-      <field cname="x" type="double"/>
-      <field cname="y" type="double"/>
-      <field cname="clip_width" type="double"/>
-      <field cname="clip_height" type="double"/>
-      <field cname="xofs" type="double"/>
-      <field cname="yofs" type="double"/>
-      <field cname="affine" array_len="6" type="double"/>
-      <field cname="anchor" type="GtkAnchorType"/>
-      <field cname="justification" type="GtkJustification"/>
-      <field cname="cx" type="int"/>
-      <field cname="cy" type="int"/>
-      <field cname="clip_cx" type="int"/>
-      <field cname="clip_cy" type="int"/>
-      <field cname="clip_cwidth" type="int"/>
-      <field cname="clip_cheight" type="int"/>
-      <field cname="max_width" type="int"/>
-      <field cname="height" type="int"/>
-      <field cname="rgba" type="guint32"/>
-      <field cname="clip" bits="1" type="guint"/>
-      <field cname="underline_set" bits="1" type="guint"/>
-      <field cname="strike_set" bits="1" type="guint"/>
-      <field cname="rise_set" bits="1" type="guint"/>
-      <field cname="scale_set" bits="1" type="guint"/>
-      <field cname="priv" type="GnomeCanvasTextPrivate*"/>
-      <property name="Text" cname="text" type="gchar*" readable="true" writeable="true"/>
-      <property name="Markup" cname="markup" type="gchar*" writeable="true"/>
-      <property name="X" cname="x" type="gdouble" readable="true" writeable="true"/>
-      <property name="Y" cname="y" type="gdouble" readable="true" writeable="true"/>
-      <property name="Font" cname="font" type="gchar*" readable="true" writeable="true"/>
-      <property name="FontDesc" cname="font_desc" type="PangoFontDescription" readable="true" writeable="true"/>
-      <property name="Family" cname="family" type="gchar*" readable="true" writeable="true"/>
-      <property name="Attributes" cname="attributes" type="PangoAttrList" readable="true" writeable="true"/>
-      <property name="Style" cname="style" type="PangoStyle" readable="true" writeable="true"/>
-      <property name="Variant" cname="variant" type="PangoVariant" readable="true" writeable="true"/>
-      <property name="Weight" cname="weight" type="gint" readable="true" writeable="true"/>
-      <property name="Stretch" cname="stretch" type="PangoStretch" readable="true" writeable="true"/>
-      <property name="Size" cname="size" type="gint" readable="true" writeable="true"/>
-      <property name="SizePoints" cname="size_points" type="gdouble" readable="true" writeable="true"/>
-      <property name="Rise" cname="rise" type="gint" readable="true" writeable="true"/>
-      <property name="Strikethrough" cname="strikethrough" type="gboolean" readable="true" writeable="true"/>
-      <property name="Underline" cname="underline" type="PangoUnderline" readable="true" writeable="true"/>
-      <property name="Scale" cname="scale" type="gdouble" readable="true" writeable="true"/>
-      <property name="Anchor" cname="anchor" type="GtkAnchorType" readable="true" writeable="true"/>
-      <property name="Justification" cname="justification" type="GtkJustification" readable="true" writeable="true"/>
-      <property name="ClipWidth" cname="clip_width" type="gdouble" readable="true" writeable="true"/>
-      <property name="ClipHeight" cname="clip_height" type="gdouble" readable="true" writeable="true"/>
-      <property name="Clip" cname="clip" type="gboolean" readable="true" writeable="true"/>
-      <property name="XOffset" cname="x_offset" type="gdouble" readable="true" writeable="true"/>
-      <property name="YOffset" cname="y_offset" type="gdouble" readable="true" writeable="true"/>
-      <property name="FillColor" cname="fill_color" type="gchar*" readable="true" writeable="true"/>
-      <property name="FillColorGdk" cname="fill_color_gdk" type="GdkColor" readable="true" writeable="true"/>
-      <property name="FillColorRgba" cname="fill_color_rgba" type="guint" readable="true" writeable="true"/>
-      <property name="FillStipple" cname="fill_stipple" type="GdkDrawable" readable="true" writeable="true"/>
-      <property name="TextWidth" cname="text_width" type="gdouble" readable="true" writeable="true"/>
-      <property name="TextHeight" cname="text_height" type="gdouble" readable="true" writeable="true"/>
+      <field cname="font_desc" type="PangoFontDescription*" />
+      <field cname="attr_list" type="PangoAttrList*" />
+      <field cname="underline" type="PangoUnderline" />
+      <field cname="strikethrough" type="gboolean" />
+      <field cname="rise" type="int" />
+      <field cname="scale" type="double" />
+      <field cname="text" type="char*" />
+      <field cname="stipple" type="GdkBitmap*" />
+      <field cname="gc" type="GdkGC*" />
+      <field cname="layout" type="PangoLayout*" />
+      <field cname="pixel" type="gulong" />
+      <field cname="x" type="double" />
+      <field cname="y" type="double" />
+      <field cname="clip_width" type="double" />
+      <field cname="clip_height" type="double" />
+      <field cname="xofs" type="double" />
+      <field cname="yofs" type="double" />
+      <field cname="affine" array_len="6" type="double" />
+      <field cname="anchor" type="GtkAnchorType" />
+      <field cname="justification" type="GtkJustification" />
+      <field cname="cx" type="int" />
+      <field cname="cy" type="int" />
+      <field cname="clip_cx" type="int" />
+      <field cname="clip_cy" type="int" />
+      <field cname="clip_cwidth" type="int" />
+      <field cname="clip_cheight" type="int" />
+      <field cname="max_width" type="int" />
+      <field cname="height" type="int" />
+      <field cname="rgba" type="guint32" />
+      <field cname="clip" bits="1" type="guint" />
+      <field cname="underline_set" bits="1" type="guint" />
+      <field cname="strike_set" bits="1" type="guint" />
+      <field cname="rise_set" bits="1" type="guint" />
+      <field cname="scale_set" bits="1" type="guint" />
+      <field cname="priv" type="GnomeCanvasTextPrivate*" />
+      <property name="Text" cname="text" type="gchar*" readable="true" writeable="true" />
+      <property name="Markup" cname="markup" type="gchar*" writeable="true" />
+      <property name="X" cname="x" type="gdouble" readable="true" writeable="true" />
+      <property name="Y" cname="y" type="gdouble" readable="true" writeable="true" />
+      <property name="Font" cname="font" type="gchar*" readable="true" writeable="true" />
+      <property name="FontDesc" cname="font_desc" type="PangoFontDescription" readable="true" writeable="true" />
+      <property name="Family" cname="family" type="gchar*" readable="true" writeable="true" />
+      <property name="Attributes" cname="attributes" type="PangoAttrList" readable="true" writeable="true" />
+      <property name="Style" cname="style" type="PangoStyle" readable="true" writeable="true" />
+      <property name="Variant" cname="variant" type="PangoVariant" readable="true" writeable="true" />
+      <property name="Weight" cname="weight" type="gint" readable="true" writeable="true" />
+      <property name="Stretch" cname="stretch" type="PangoStretch" readable="true" writeable="true" />
+      <property name="Size" cname="size" type="gint" readable="true" writeable="true" />
+      <property name="SizePoints" cname="size_points" type="gdouble" readable="true" writeable="true" />
+      <property name="Rise" cname="rise" type="gint" readable="true" writeable="true" />
+      <property name="Strikethrough" cname="strikethrough" type="gboolean" readable="true" writeable="true" />
+      <property name="Underline" cname="underline" type="PangoUnderline" readable="true" writeable="true" />
+      <property name="Scale" cname="scale" type="gdouble" readable="true" writeable="true" />
+      <property name="Anchor" cname="anchor" type="GtkAnchorType" readable="true" writeable="true" />
+      <property name="Justification" cname="justification" type="GtkJustification" readable="true" writeable="true" />
+      <property name="ClipWidth" cname="clip_width" type="gdouble" readable="true" writeable="true" />
+      <property name="ClipHeight" cname="clip_height" type="gdouble" readable="true" writeable="true" />
+      <property name="Clip" cname="clip" type="gboolean" readable="true" writeable="true" />
+      <property name="XOffset" cname="x_offset" type="gdouble" readable="true" writeable="true" />
+      <property name="YOffset" cname="y_offset" type="gdouble" readable="true" writeable="true" />
+      <property name="FillColor" cname="fill_color" type="gchar*" readable="true" writeable="true" />
+      <property name="FillColorGdk" cname="fill_color_gdk" type="GdkColor" readable="true" writeable="true" />
+      <property name="FillColorRgba" cname="fill_color_rgba" type="guint" readable="true" writeable="true" />
+      <property name="FillStipple" cname="fill_stipple" type="GdkDrawable" readable="true" writeable="true" />
+      <property name="TextWidth" cname="text_width" type="gdouble" readable="true" writeable="true" />
+      <property name="TextHeight" cname="text_height" type="gdouble" readable="true" writeable="true" />
       <method name="GetType" cname="gnome_canvas_text_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
     </object>
     <object name="CanvasWidget" cname="GnomeCanvasWidget" parent="GnomeCanvasItem">
-      <field cname="widget" type="GtkWidget*"/>
-      <field cname="x" type="double"/>
-      <field cname="y" type="double"/>
-      <field cname="width" type="double"/>
-      <field cname="height" type="double"/>
-      <field cname="anchor" type="GtkAnchorType"/>
-      <field cname="cx" type="int"/>
-      <field cname="cy" type="int"/>
-      <field cname="cwidth" type="int"/>
-      <field cname="cheight" type="int"/>
-      <field cname="destroy_id" type="guint"/>
-      <field cname="size_pixels" bits="1" type="guint"/>
-      <field cname="in_destroy" bits="1" type="guint"/>
-      <property name="Widget" cname="widget" type="GtkWidget" readable="true" writeable="true"/>
-      <property name="X" cname="x" type="gdouble" readable="true" writeable="true"/>
-      <property name="Y" cname="y" type="gdouble" readable="true" writeable="true"/>
-      <property name="Width" cname="width" type="gdouble" readable="true" writeable="true"/>
-      <property name="Height" cname="height" type="gdouble" readable="true" writeable="true"/>
-      <property name="Anchor" cname="anchor" type="GtkAnchorType" readable="true" writeable="true"/>
-      <property name="SizePixels" cname="size_pixels" type="gboolean" readable="true" writeable="true"/>
+      <field cname="widget" type="GtkWidget*" />
+      <field cname="x" type="double" />
+      <field cname="y" type="double" />
+      <field cname="width" type="double" />
+      <field cname="height" type="double" />
+      <field cname="anchor" type="GtkAnchorType" />
+      <field cname="cx" type="int" />
+      <field cname="cy" type="int" />
+      <field cname="cwidth" type="int" />
+      <field cname="cheight" type="int" />
+      <field cname="destroy_id" type="guint" />
+      <field cname="size_pixels" bits="1" type="guint" />
+      <field cname="in_destroy" bits="1" type="guint" />
+      <property name="Widget" cname="widget" type="GtkWidget" readable="true" writeable="true" />
+      <property name="X" cname="x" type="gdouble" readable="true" writeable="true" />
+      <property name="Y" cname="y" type="gdouble" readable="true" writeable="true" />
+      <property name="Width" cname="width" type="gdouble" readable="true" writeable="true" />
+      <property name="Height" cname="height" type="gdouble" readable="true" writeable="true" />
+      <property name="Anchor" cname="anchor" type="GtkAnchorType" readable="true" writeable="true" />
+      <property name="SizePixels" cname="size_pixels" type="gboolean" readable="true" writeable="true" />
       <method name="GetType" cname="gnome_canvas_widget_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
     </object>
-    <struct name="CanvasBpathPriv" cname="GnomeCanvasBpathPriv" opaque="true"/>
+    <struct name="CanvasBpathPriv" cname="GnomeCanvasBpathPriv" opaque="true" />
     <struct name="CanvasBuf" cname="GnomeCanvasBuf">
-      <field cname="buf" type="guchar*"/>
-      <field cname="rect" type="ArtIRect"/>
-      <field cname="buf_rowstride" type="int"/>
-      <field cname="bg_color" type="guint32"/>
-      <field cname="is_bg" bits="1" type="unsigned"/>
-      <field cname="is_buf" bits="1" type="unsigned"/>
+      <field cname="buf" type="guchar*" />
+      <field cname="rect" type="ArtIRect" />
+      <field cname="buf_rowstride" type="int" />
+      <field cname="bg_color" type="guint32" />
+      <field cname="is_bg" bits="1" type="unsigned" />
+      <field cname="is_buf" bits="1" type="unsigned" />
       <method name="EnsureBuf" cname="gnome_canvas_buf_ensure_buf">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
     </struct>
     <struct name="CanvasPathDef" cname="GnomeCanvasPathDef" opaque="true">
       <method name="AllClosed" cname="gnome_canvas_path_def_all_closed">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="AllOpen" cname="gnome_canvas_path_def_all_open">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="AnyClosed" cname="gnome_canvas_path_def_any_closed">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="AnyOpen" cname="gnome_canvas_path_def_any_open">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="Bpath" cname="gnome_canvas_path_def_bpath">
-        <return-type type="ArtBpath*"/>
+        <return-type type="ArtBpath*" />
       </method>
       <method name="CloseAll" cname="gnome_canvas_path_def_close_all">
-        <return-type type="GnomeCanvasPathDef*"/>
+        <return-type type="GnomeCanvasPathDef*" />
       </method>
       <method name="ClosedParts" cname="gnome_canvas_path_def_closed_parts">
-        <return-type type="GnomeCanvasPathDef*"/>
+        <return-type type="GnomeCanvasPathDef*" />
       </method>
       <method name="Closepath" cname="gnome_canvas_path_def_closepath">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="ClosepathCurrent" cname="gnome_canvas_path_def_closepath_current">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="Concat" cname="gnome_canvas_path_def_concat" shared="true">
-        <return-type type="GnomeCanvasPathDef*"/>
+        <return-type type="GnomeCanvasPathDef*" />
         <parameters>
-          <parameter type="const-GSList*" name="list"/>
+          <parameter type="const-GSList*" name="list" />
         </parameters>
       </method>
       <method name="Copy" cname="gnome_canvas_path_def_copy">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-GnomeCanvasPathDef*" name="src"/>
+          <parameter type="const-GnomeCanvasPathDef*" name="src" />
         </parameters>
       </method>
       <method name="Currentpoint" cname="gnome_canvas_path_def_currentpoint">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="ArtPoint*" name="p"/>
+          <parameter type="ArtPoint*" name="p" />
         </parameters>
       </method>
-      <method name="CurveTo" cname="gnome_canvas_path_def_curveto">
-        <return-type type="void"/>
+      <method cname="gnome_canvas_path_def_curveto" name="CurveTo">
+        <return-type type="void" />
         <parameters>
-          <parameter type="gdouble" name="x0"/>
-          <parameter type="gdouble" name="y0"/>
-          <parameter type="gdouble" name="x1"/>
-          <parameter type="gdouble" name="y1"/>
-          <parameter type="gdouble" name="x2"/>
-          <parameter type="gdouble" name="y2"/>
+          <parameter type="gdouble" name="x0" />
+          <parameter type="gdouble" name="y0" />
+          <parameter type="gdouble" name="x1" />
+          <parameter type="gdouble" name="y1" />
+          <parameter type="gdouble" name="x2" />
+          <parameter type="gdouble" name="y2" />
         </parameters>
       </method>
       <method name="Duplicate" cname="gnome_canvas_path_def_duplicate">
-        <return-type type="GnomeCanvasPathDef*"/>
+        <return-type type="GnomeCanvasPathDef*" />
       </method>
       <method name="EnsureSpace" cname="gnome_canvas_path_def_ensure_space">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="space"/>
+          <parameter type="gint" name="space" />
         </parameters>
       </method>
       <method name="Finish" cname="gnome_canvas_path_def_finish">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="FirstBpath" cname="gnome_canvas_path_def_first_bpath">
-        <return-type type="ArtBpath*"/>
+        <return-type type="ArtBpath*" />
       </method>
       <method name="HasCurrentpoint" cname="gnome_canvas_path_def_has_currentpoint">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="IsEmpty" cname="gnome_canvas_path_def_is_empty">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="LastBpath" cname="gnome_canvas_path_def_last_bpath">
-        <return-type type="ArtBpath*"/>
+        <return-type type="ArtBpath*" />
       </method>
       <method name="Length" cname="gnome_canvas_path_def_length">
-        <return-type type="gint"/>
+        <return-type type="gint" />
       </method>
-      <method name="LineTo" cname="gnome_canvas_path_def_lineto">
-        <return-type type="void"/>
+      <method cname="gnome_canvas_path_def_lineto" name="LineTo">
+        <return-type type="void" />
         <parameters>
-          <parameter type="gdouble" name="x"/>
-          <parameter type="gdouble" name="y"/>
+          <parameter type="gdouble" name="x" />
+          <parameter type="gdouble" name="y" />
         </parameters>
       </method>
-      <method name="LineToMoving" cname="gnome_canvas_path_def_lineto_moving">
-        <return-type type="void"/>
+      <method cname="gnome_canvas_path_def_lineto_moving" name="LineToMoving">
+        <return-type type="void" />
         <parameters>
-          <parameter type="gdouble" name="x"/>
-          <parameter type="gdouble" name="y"/>
+          <parameter type="gdouble" name="x" />
+          <parameter type="gdouble" name="y" />
         </parameters>
       </method>
-      <method name="MoveTo" cname="gnome_canvas_path_def_moveto">
-        <return-type type="void"/>
+      <method cname="gnome_canvas_path_def_moveto" name="MoveTo">
+        <return-type type="void" />
         <parameters>
-          <parameter type="gdouble" name="x"/>
-          <parameter type="gdouble" name="y"/>
+          <parameter type="gdouble" name="x" />
+          <parameter type="gdouble" name="y" />
         </parameters>
       </method>
-      <constructor cname="gnome_canvas_path_def_new"/>
+      <constructor cname="gnome_canvas_path_def_new" />
       <constructor cname="gnome_canvas_path_def_new_from_bpath">
         <parameters>
-          <parameter type="ArtBpath*" name="bpath"/>
+          <parameter type="ArtBpath*" name="bpath" />
         </parameters>
       </constructor>
       <constructor cname="gnome_canvas_path_def_new_from_foreign_bpath">
         <parameters>
-          <parameter type="ArtBpath*" name="bpath"/>
+          <parameter type="ArtBpath*" name="bpath" />
         </parameters>
       </constructor>
       <constructor cname="gnome_canvas_path_def_new_from_static_bpath">
         <parameters>
-          <parameter type="ArtBpath*" name="bpath"/>
+          <parameter type="ArtBpath*" name="bpath" />
         </parameters>
       </constructor>
       <constructor cname="gnome_canvas_path_def_new_sized">
         <parameters>
-          <parameter type="gint" name="length"/>
+          <parameter type="gint" name="length" />
         </parameters>
       </constructor>
       <method name="OpenParts" cname="gnome_canvas_path_def_open_parts">
-        <return-type type="GnomeCanvasPathDef*"/>
+        <return-type type="GnomeCanvasPathDef*" />
       </method>
       <method name="Ref" cname="gnome_canvas_path_def_ref">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="Reset" cname="gnome_canvas_path_def_reset">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="Split" cname="gnome_canvas_path_def_split">
-        <return-type type="GSList*" element_type="Gnome.CanvasPathDef"/>
+        <return-type type="GSList*" element_type="Gnome.CanvasPathDef" />
       </method>
       <method name="Unref" cname="gnome_canvas_path_def_unref">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
     </struct>
     <boxed name="CanvasPoints" cname="GnomeCanvasPoints">
-      <field cname="coords" type="double*"/>
-      <field cname="num_points" type="int"/>
-      <field cname="ref_count" type="int"/>
+      <field cname="coords" type="double*" />
+      <field cname="num_points" type="int" />
+      <field cname="ref_count" type="int" />
       <method name="Free" cname="gnome_canvas_points_free">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="GetType" cname="gnome_canvas_points_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <constructor cname="gnome_canvas_points_new">
         <parameters>
-          <parameter type="int" name="num_points"/>
+          <parameter type="int" name="num_points" />
         </parameters>
       </constructor>
       <method name="Ref" cname="gnome_canvas_points_ref">
-        <return-type type="GnomeCanvasPoints*"/>
+        <return-type type="GnomeCanvasPoints*" />
       </method>
     </boxed>
-    <struct name="CanvasShapePriv" cname="GnomeCanvasShapePriv" opaque="true"/>
+    <struct name="CanvasShapePriv" cname="GnomeCanvasShapePriv" opaque="true" />
   </namespace>
   <namespace name="Gnome" library="gnomeui-2">
     <enum name="ClientFlags" cname="GnomeClientFlags" type="flags">
-      <member cname="GNOME_CLIENT_IS_CONNECTED" name="IsConnected" value="1 &lt;&lt; 0"/>
-      <member cname="GNOME_CLIENT_RESTARTED" name="Restarted" value="1 &lt;&lt; 1"/>
-      <member cname="GNOME_CLIENT_RESTORED" name="Restored" value="1 &lt;&lt; 2"/>
+      <member cname="GNOME_CLIENT_IS_CONNECTED" name="IsConnected" value="1 &lt;&lt; 0" />
+      <member cname="GNOME_CLIENT_RESTARTED" name="Restarted" value="1 &lt;&lt; 1" />
+      <member cname="GNOME_CLIENT_RESTORED" name="Restored" value="1 &lt;&lt; 2" />
     </enum>
     <enum name="ClientState" cname="GnomeClientState" type="enum">
-      <member cname="GNOME_CLIENT_IDLE" name="Idle"/>
-      <member cname="GNOME_CLIENT_SAVING_PHASE_1" name="SavingPhase1"/>
-      <member cname="GNOME_CLIENT_WAITING_FOR_PHASE_2" name="WaitingForPhase2"/>
-      <member cname="GNOME_CLIENT_SAVING_PHASE_2" name="SavingPhase2"/>
-      <member cname="GNOME_CLIENT_FROZEN" name="Frozen"/>
-      <member cname="GNOME_CLIENT_DISCONNECTED" name="Disconnected"/>
-      <member cname="GNOME_CLIENT_REGISTERING" name="Registering"/>
+      <member cname="GNOME_CLIENT_IDLE" name="Idle" />
+      <member cname="GNOME_CLIENT_SAVING_PHASE_1" name="SavingPhase1" />
+      <member cname="GNOME_CLIENT_WAITING_FOR_PHASE_2" name="WaitingForPhase2" />
+      <member cname="GNOME_CLIENT_SAVING_PHASE_2" name="SavingPhase2" />
+      <member cname="GNOME_CLIENT_FROZEN" name="Frozen" />
+      <member cname="GNOME_CLIENT_DISCONNECTED" name="Disconnected" />
+      <member cname="GNOME_CLIENT_REGISTERING" name="Registering" />
     </enum>
     <enum name="DateEditFlags" cname="GnomeDateEditFlags" type="flags">
-      <member cname="GNOME_DATE_EDIT_SHOW_TIME" name="ShowTime" value="1 &lt;&lt; 0"/>
-      <member cname="GNOME_DATE_EDIT_24_HR" name="Two4Hr" value="1 &lt;&lt; 1"/>
-      <member cname="GNOME_DATE_EDIT_WEEK_STARTS_ON_MONDAY" name="WeekStartsOnMonday" value="1 &lt;&lt; 2"/>
+      <member cname="GNOME_DATE_EDIT_SHOW_TIME" name="ShowTime" value="1 &lt;&lt; 0" />
+      <member cname="GNOME_DATE_EDIT_24_HR" name="Two4Hr" value="1 &lt;&lt; 1" />
+      <member cname="GNOME_DATE_EDIT_WEEK_STARTS_ON_MONDAY" name="WeekStartsOnMonday" value="1 &lt;&lt; 2" />
     </enum>
     <enum name="DialogType" cname="GnomeDialogType" type="enum">
-      <member cname="GNOME_DIALOG_ERROR" name="Error"/>
-      <member cname="GNOME_DIALOG_NORMAL" name="Normal"/>
+      <member cname="GNOME_DIALOG_ERROR" name="Error" />
+      <member cname="GNOME_DIALOG_NORMAL" name="Normal" />
     </enum>
     <enum name="EdgePosition" cname="GnomeEdgePosition" type="enum">
-      <member cname="GNOME_EDGE_START" name="Start"/>
-      <member cname="GNOME_EDGE_FINISH" name="Finish"/>
-      <member cname="GNOME_EDGE_OTHER" name="Other"/>
-      <member cname="GNOME_EDGE_LAST" name="Last"/>
+      <member cname="GNOME_EDGE_START" name="Start" />
+      <member cname="GNOME_EDGE_FINISH" name="Finish" />
+      <member cname="GNOME_EDGE_OTHER" name="Other" />
+      <member cname="GNOME_EDGE_LAST" name="Last" />
     </enum>
     <enum name="FontPickerMode" cname="GnomeFontPickerMode" type="enum">
-      <member cname="GNOME_FONT_PICKER_MODE_PIXMAP" name="Pixmap"/>
-      <member cname="GNOME_FONT_PICKER_MODE_FONT_INFO" name="FontInfo"/>
-      <member cname="GNOME_FONT_PICKER_MODE_USER_WIDGET" name="UserWidget"/>
-      <member cname="GNOME_FONT_PICKER_MODE_UNKNOWN" name="Unknown"/>
+      <member cname="GNOME_FONT_PICKER_MODE_PIXMAP" name="Pixmap" />
+      <member cname="GNOME_FONT_PICKER_MODE_FONT_INFO" name="FontInfo" />
+      <member cname="GNOME_FONT_PICKER_MODE_USER_WIDGET" name="UserWidget" />
+      <member cname="GNOME_FONT_PICKER_MODE_UNKNOWN" name="Unknown" />
     </enum>
     <enum name="IconListMode" cname="GnomeIconListMode" type="enum">
-      <member cname="GNOME_ICON_LIST_ICONS" name="Icons"/>
-      <member cname="GNOME_ICON_LIST_TEXT_BELOW" name="TextBelow"/>
-      <member cname="GNOME_ICON_LIST_TEXT_RIGHT" name="TextRight"/>
+      <member cname="GNOME_ICON_LIST_ICONS" name="Icons" />
+      <member cname="GNOME_ICON_LIST_TEXT_BELOW" name="TextBelow" />
+      <member cname="GNOME_ICON_LIST_TEXT_RIGHT" name="TextRight" />
     </enum>
     <enum name="IconLookupFlags" cname="GnomeIconLookupFlags" type="flags">
-      <member cname="GNOME_ICON_LOOKUP_FLAGS_NONE" name="None"/>
-      <member cname="GNOME_ICON_LOOKUP_FLAGS_EMBEDDING_TEXT" name="EmbeddingText" value="1 &lt;&lt; 0"/>
-      <member cname="GNOME_ICON_LOOKUP_FLAGS_SHOW_SMALL_IMAGES_AS_THEMSELVES" name="ShowSmallImagesAsThemselves" value="1 &lt;&lt; 1"/>
+      <member cname="GNOME_ICON_LOOKUP_FLAGS_NONE" name="None" />
+      <member cname="GNOME_ICON_LOOKUP_FLAGS_EMBEDDING_TEXT" name="EmbeddingText" value="1 &lt;&lt; 0" />
+      <member cname="GNOME_ICON_LOOKUP_FLAGS_SHOW_SMALL_IMAGES_AS_THEMSELVES" name="ShowSmallImagesAsThemselves" value="1 &lt;&lt; 1" />
     </enum>
     <enum name="IconLookupResultFlags" cname="GnomeIconLookupResultFlags" type="flags">
-      <member cname="GNOME_ICON_LOOKUP_RESULT_FLAGS_NONE" name="None"/>
-      <member cname="GNOME_ICON_LOOKUP_RESULT_FLAGS_THUMBNAIL" name="Thumbnail" value="1 &lt;&lt; 0"/>
+      <member cname="GNOME_ICON_LOOKUP_RESULT_FLAGS_NONE" name="None" />
+      <member cname="GNOME_ICON_LOOKUP_RESULT_FLAGS_THUMBNAIL" name="Thumbnail" value="1 &lt;&lt; 0" />
     </enum>
     <enum name="InteractStyle" cname="GnomeInteractStyle" type="enum">
-      <member cname="GNOME_INTERACT_NONE" name="None"/>
-      <member cname="GNOME_INTERACT_ERRORS" name="Errors"/>
-      <member cname="GNOME_INTERACT_ANY" name="Any"/>
+      <member cname="GNOME_INTERACT_NONE" name="None" />
+      <member cname="GNOME_INTERACT_ERRORS" name="Errors" />
+      <member cname="GNOME_INTERACT_ANY" name="Any" />
     </enum>
     <enum name="PreferencesType" cname="GnomePreferencesType" type="enum">
-      <member cname="GNOME_PREFERENCES_NEVER" name="Never"/>
-      <member cname="GNOME_PREFERENCES_USER" name="User"/>
-      <member cname="GNOME_PREFERENCES_ALWAYS" name="Always"/>
+      <member cname="GNOME_PREFERENCES_NEVER" name="Never" />
+      <member cname="GNOME_PREFERENCES_USER" name="User" />
+      <member cname="GNOME_PREFERENCES_ALWAYS" name="Always" />
     </enum>
     <enum name="RestartStyle" cname="GnomeRestartStyle" type="enum">
-      <member cname="GNOME_RESTART_IF_RUNNING" name="IfRunning"/>
-      <member cname="GNOME_RESTART_ANYWAY" name="Anyway"/>
-      <member cname="GNOME_RESTART_IMMEDIATELY" name="Immediately"/>
-      <member cname="GNOME_RESTART_NEVER" name="Never"/>
+      <member cname="GNOME_RESTART_IF_RUNNING" name="IfRunning" />
+      <member cname="GNOME_RESTART_ANYWAY" name="Anyway" />
+      <member cname="GNOME_RESTART_IMMEDIATELY" name="Immediately" />
+      <member cname="GNOME_RESTART_NEVER" name="Never" />
     </enum>
     <enum name="SaveStyle" cname="GnomeSaveStyle" type="enum">
-      <member cname="GNOME_SAVE_GLOBAL" name="Global"/>
-      <member cname="GNOME_SAVE_LOCAL" name="Local"/>
-      <member cname="GNOME_SAVE_BOTH" name="Both"/>
+      <member cname="GNOME_SAVE_GLOBAL" name="Global" />
+      <member cname="GNOME_SAVE_LOCAL" name="Local" />
+      <member cname="GNOME_SAVE_BOTH" name="Both" />
     </enum>
     <enum name="ThemeFileParseError" cname="GnomeThemeFileParseError" type="enum">
-      <member cname="GNOME_THEME_FILE_PARSE_ERROR_INVALID_SYNTAX" name="Syntax"/>
-      <member cname="GNOME_THEME_FILE_PARSE_ERROR_INVALID_ESCAPES" name="Escapes"/>
-      <member cname="GNOME_THEME_FILE_PARSE_ERROR_INVALID_CHARS" name="Chars"/>
+      <member cname="GNOME_THEME_FILE_PARSE_ERROR_INVALID_SYNTAX" name="Syntax" />
+      <member cname="GNOME_THEME_FILE_PARSE_ERROR_INVALID_ESCAPES" name="Escapes" />
+      <member cname="GNOME_THEME_FILE_PARSE_ERROR_INVALID_CHARS" name="Chars" />
     </enum>
     <enum name="ThumbnailSize" cname="GnomeThumbnailSize" type="enum">
-      <member cname="GNOME_THUMBNAIL_SIZE_NORMAL" name="Normal"/>
-      <member cname="GNOME_THUMBNAIL_SIZE_LARGE" name="Large"/>
+      <member cname="GNOME_THUMBNAIL_SIZE_NORMAL" name="Normal" />
+      <member cname="GNOME_THUMBNAIL_SIZE_LARGE" name="Large" />
     </enum>
     <enum name="UIInfoConfigurableTypes" cname="GnomeUIInfoConfigurableTypes" type="enum">
-      <member cname="GNOME_APP_CONFIGURABLE_ITEM_NEW" name="New"/>
-      <member cname="GNOME_APP_CONFIGURABLE_ITEM_OPEN" name="Open"/>
-      <member cname="GNOME_APP_CONFIGURABLE_ITEM_SAVE" name="Save"/>
-      <member cname="GNOME_APP_CONFIGURABLE_ITEM_SAVE_AS" name="SaveAs"/>
-      <member cname="GNOME_APP_CONFIGURABLE_ITEM_REVERT" name="Revert"/>
-      <member cname="GNOME_APP_CONFIGURABLE_ITEM_PRINT" name="Print"/>
-      <member cname="GNOME_APP_CONFIGURABLE_ITEM_PRINT_SETUP" name="PrintSetup"/>
-      <member cname="GNOME_APP_CONFIGURABLE_ITEM_CLOSE" name="Close"/>
-      <member cname="GNOME_APP_CONFIGURABLE_ITEM_QUIT" name="Quit"/>
-      <member cname="GNOME_APP_CONFIGURABLE_ITEM_CUT" name="Cut"/>
-      <member cname="GNOME_APP_CONFIGURABLE_ITEM_COPY" name="Copy"/>
-      <member cname="GNOME_APP_CONFIGURABLE_ITEM_PASTE" name="Paste"/>
-      <member cname="GNOME_APP_CONFIGURABLE_ITEM_CLEAR" name="Clear"/>
-      <member cname="GNOME_APP_CONFIGURABLE_ITEM_UNDO" name="Undo"/>
-      <member cname="GNOME_APP_CONFIGURABLE_ITEM_REDO" name="Redo"/>
-      <member cname="GNOME_APP_CONFIGURABLE_ITEM_FIND" name="Find"/>
-      <member cname="GNOME_APP_CONFIGURABLE_ITEM_FIND_AGAIN" name="FindAgain"/>
-      <member cname="GNOME_APP_CONFIGURABLE_ITEM_REPLACE" name="Replace"/>
-      <member cname="GNOME_APP_CONFIGURABLE_ITEM_PROPERTIES" name="Properties"/>
-      <member cname="GNOME_APP_CONFIGURABLE_ITEM_PREFERENCES" name="Preferences"/>
-      <member cname="GNOME_APP_CONFIGURABLE_ITEM_ABOUT" name="About"/>
-      <member cname="GNOME_APP_CONFIGURABLE_ITEM_SELECT_ALL" name="SelectAll"/>
-      <member cname="GNOME_APP_CONFIGURABLE_ITEM_NEW_WINDOW" name="NewWindow"/>
-      <member cname="GNOME_APP_CONFIGURABLE_ITEM_CLOSE_WINDOW" name="CloseWindow"/>
-      <member cname="GNOME_APP_CONFIGURABLE_ITEM_NEW_GAME" name="NewGame"/>
-      <member cname="GNOME_APP_CONFIGURABLE_ITEM_PAUSE_GAME" name="PauseGame"/>
-      <member cname="GNOME_APP_CONFIGURABLE_ITEM_RESTART_GAME" name="RestartGame"/>
-      <member cname="GNOME_APP_CONFIGURABLE_ITEM_UNDO_MOVE" name="UndoMove"/>
-      <member cname="GNOME_APP_CONFIGURABLE_ITEM_REDO_MOVE" name="RedoMove"/>
-      <member cname="GNOME_APP_CONFIGURABLE_ITEM_HINT" name="Hint"/>
-      <member cname="GNOME_APP_CONFIGURABLE_ITEM_SCORES" name="Scores"/>
-      <member cname="GNOME_APP_CONFIGURABLE_ITEM_END_GAME" name="EndGame"/>
+      <member cname="GNOME_APP_CONFIGURABLE_ITEM_NEW" name="New" />
+      <member cname="GNOME_APP_CONFIGURABLE_ITEM_OPEN" name="Open" />
+      <member cname="GNOME_APP_CONFIGURABLE_ITEM_SAVE" name="Save" />
+      <member cname="GNOME_APP_CONFIGURABLE_ITEM_SAVE_AS" name="SaveAs" />
+      <member cname="GNOME_APP_CONFIGURABLE_ITEM_REVERT" name="Revert" />
+      <member cname="GNOME_APP_CONFIGURABLE_ITEM_PRINT" name="Print" />
+      <member cname="GNOME_APP_CONFIGURABLE_ITEM_PRINT_SETUP" name="PrintSetup" />
+      <member cname="GNOME_APP_CONFIGURABLE_ITEM_CLOSE" name="Close" />
+      <member cname="GNOME_APP_CONFIGURABLE_ITEM_QUIT" name="Quit" />
+      <member cname="GNOME_APP_CONFIGURABLE_ITEM_CUT" name="Cut" />
+      <member cname="GNOME_APP_CONFIGURABLE_ITEM_COPY" name="Copy" />
+      <member cname="GNOME_APP_CONFIGURABLE_ITEM_PASTE" name="Paste" />
+      <member cname="GNOME_APP_CONFIGURABLE_ITEM_CLEAR" name="Clear" />
+      <member cname="GNOME_APP_CONFIGURABLE_ITEM_UNDO" name="Undo" />
+      <member cname="GNOME_APP_CONFIGURABLE_ITEM_REDO" name="Redo" />
+      <member cname="GNOME_APP_CONFIGURABLE_ITEM_FIND" name="Find" />
+      <member cname="GNOME_APP_CONFIGURABLE_ITEM_FIND_AGAIN" name="FindAgain" />
+      <member cname="GNOME_APP_CONFIGURABLE_ITEM_REPLACE" name="Replace" />
+      <member cname="GNOME_APP_CONFIGURABLE_ITEM_PROPERTIES" name="Properties" />
+      <member cname="GNOME_APP_CONFIGURABLE_ITEM_PREFERENCES" name="Preferences" />
+      <member cname="GNOME_APP_CONFIGURABLE_ITEM_ABOUT" name="About" />
+      <member cname="GNOME_APP_CONFIGURABLE_ITEM_SELECT_ALL" name="SelectAll" />
+      <member cname="GNOME_APP_CONFIGURABLE_ITEM_NEW_WINDOW" name="NewWindow" />
+      <member cname="GNOME_APP_CONFIGURABLE_ITEM_CLOSE_WINDOW" name="CloseWindow" />
+      <member cname="GNOME_APP_CONFIGURABLE_ITEM_NEW_GAME" name="NewGame" />
+      <member cname="GNOME_APP_CONFIGURABLE_ITEM_PAUSE_GAME" name="PauseGame" />
+      <member cname="GNOME_APP_CONFIGURABLE_ITEM_RESTART_GAME" name="RestartGame" />
+      <member cname="GNOME_APP_CONFIGURABLE_ITEM_UNDO_MOVE" name="UndoMove" />
+      <member cname="GNOME_APP_CONFIGURABLE_ITEM_REDO_MOVE" name="RedoMove" />
+      <member cname="GNOME_APP_CONFIGURABLE_ITEM_HINT" name="Hint" />
+      <member cname="GNOME_APP_CONFIGURABLE_ITEM_SCORES" name="Scores" />
+      <member cname="GNOME_APP_CONFIGURABLE_ITEM_END_GAME" name="EndGame" />
     </enum>
     <enum name="UIInfoType" cname="GnomeUIInfoType" type="enum">
-      <member cname="GNOME_APP_UI_ENDOFINFO" name="Endofinfo"/>
-      <member cname="GNOME_APP_UI_ITEM" name="Item"/>
-      <member cname="GNOME_APP_UI_TOGGLEITEM" name="Toggleitem"/>
-      <member cname="GNOME_APP_UI_RADIOITEMS" name="Radioitems"/>
-      <member cname="GNOME_APP_UI_SUBTREE" name="Subtree"/>
-      <member cname="GNOME_APP_UI_SEPARATOR" name="Separator"/>
-      <member cname="GNOME_APP_UI_HELP" name="Help"/>
-      <member cname="GNOME_APP_UI_BUILDER_DATA" name="BuilderData"/>
-      <member cname="GNOME_APP_UI_ITEM_CONFIGURABLE" name="ItemConfigurable"/>
-      <member cname="GNOME_APP_UI_SUBTREE_STOCK" name="SubtreeStock"/>
-      <member cname="GNOME_APP_UI_INCLUDE" name="Include"/>
+      <member cname="GNOME_APP_UI_ENDOFINFO" name="Endofinfo" />
+      <member cname="GNOME_APP_UI_ITEM" name="Item" />
+      <member cname="GNOME_APP_UI_TOGGLEITEM" name="Toggleitem" />
+      <member cname="GNOME_APP_UI_RADIOITEMS" name="Radioitems" />
+      <member cname="GNOME_APP_UI_SUBTREE" name="Subtree" />
+      <member cname="GNOME_APP_UI_SEPARATOR" name="Separator" />
+      <member cname="GNOME_APP_UI_HELP" name="Help" />
+      <member cname="GNOME_APP_UI_BUILDER_DATA" name="BuilderData" />
+      <member cname="GNOME_APP_UI_ITEM_CONFIGURABLE" name="ItemConfigurable" />
+      <member cname="GNOME_APP_UI_SUBTREE_STOCK" name="SubtreeStock" />
+      <member cname="GNOME_APP_UI_INCLUDE" name="Include" />
     </enum>
     <enum name="UIPixmapType" cname="GnomeUIPixmapType" type="enum">
-      <member cname="GNOME_APP_PIXMAP_NONE" name="None"/>
-      <member cname="GNOME_APP_PIXMAP_STOCK" name="Stock"/>
-      <member cname="GNOME_APP_PIXMAP_DATA" name="Data"/>
-      <member cname="GNOME_APP_PIXMAP_FILENAME" name="Filename"/>
+      <member cname="GNOME_APP_PIXMAP_NONE" name="None" />
+      <member cname="GNOME_APP_PIXMAP_STOCK" name="Stock" />
+      <member cname="GNOME_APP_PIXMAP_DATA" name="Data" />
+      <member cname="GNOME_APP_PIXMAP_FILENAME" name="Filename" />
     </enum>
     <callback name="GdkPixbufDoneCallback" cname="GnomeGdkPixbufDoneCallback">
-      <return-type type="void"/>
+      <return-type type="void" />
       <parameters>
-        <parameter type="GnomeGdkPixbufAsyncHandle*" name="handle"/>
-        <parameter type="gpointer" name="cb_data"/>
+        <parameter type="GnomeGdkPixbufAsyncHandle*" name="handle" />
+        <parameter type="gpointer" name="cb_data" />
       </parameters>
     </callback>
     <callback name="GdkPixbufLoadCallback" cname="GnomeGdkPixbufLoadCallback">
-      <return-type type="void"/>
+      <return-type type="void" />
       <parameters>
-        <parameter type="GnomeGdkPixbufAsyncHandle*" name="handle"/>
-        <parameter type="GnomeVFSResult" name="error"/>
-        <parameter type="GdkPixbuf*" name="pixbuf"/>
-        <parameter type="gpointer" name="cb_data"/>
+        <parameter type="GnomeGdkPixbufAsyncHandle*" name="handle" />
+        <parameter type="GnomeVFSResult" name="error" />
+        <parameter type="GdkPixbuf*" name="pixbuf" />
+        <parameter type="gpointer" name="cb_data" />
       </parameters>
     </callback>
     <callback name="InteractFunction" cname="GnomeInteractFunction">
-      <return-type type="void"/>
+      <return-type type="void" />
       <parameters>
-        <parameter type="GnomeClient*" name="client"/>
-        <parameter type="gint" name="key"/>
-        <parameter type="GnomeDialogType" name="dialog_type"/>
-        <parameter type="gpointer" name="data"/>
+        <parameter type="GnomeClient*" name="client" />
+        <parameter type="gint" name="key" />
+        <parameter type="GnomeDialogType" name="dialog_type" />
+        <parameter type="gpointer" name="data" />
       </parameters>
     </callback>
     <callback name="ReplyCallback" cname="GnomeReplyCallback">
-      <return-type type="void"/>
+      <return-type type="void" />
       <parameters>
-        <parameter type="gint" name="reply"/>
-        <parameter type="gpointer" name="data"/>
+        <parameter type="gint" name="reply" />
+        <parameter type="gpointer" name="data" />
       </parameters>
     </callback>
     <callback name="StringCallback" cname="GnomeStringCallback">
-      <return-type type="void"/>
+      <return-type type="void" />
       <parameters>
-        <parameter type="gchar*" name="string"/>
-        <parameter type="gpointer" name="data"/>
+        <parameter type="gchar*" name="string" />
+        <parameter type="gpointer" name="data" />
       </parameters>
     </callback>
     <callback name="ThemeFileLineFunc" cname="GnomeThemeFileLineFunc">
-      <return-type type="void"/>
+      <return-type type="void" />
       <parameters>
-        <parameter type="GnomeThemeFile*" name="df"/>
-        <parameter type="const-char*" name="key"/>
-        <parameter type="const-char*" name="locale"/>
-        <parameter type="const-char*" name="value"/>
-        <parameter type="gpointer" name="data"/>
+        <parameter type="GnomeThemeFile*" name="df" />
+        <parameter type="const-char*" name="key" />
+        <parameter type="const-char*" name="locale" />
+        <parameter type="const-char*" name="value" />
+        <parameter type="gpointer" name="data" />
       </parameters>
     </callback>
     <callback name="ThemeFileSectionFunc" cname="GnomeThemeFileSectionFunc">
-      <return-type type="void"/>
+      <return-type type="void" />
       <parameters>
-        <parameter type="GnomeThemeFile*" name="df"/>
-        <parameter type="const-char*" name="name"/>
-        <parameter type="gpointer" name="data"/>
+        <parameter type="GnomeThemeFile*" name="df" />
+        <parameter type="const-char*" name="name" />
+        <parameter type="gpointer" name="data" />
       </parameters>
     </callback>
     <callback name="UISignalConnectFunc" cname="GnomeUISignalConnectFunc">
-      <return-type type="void"/>
+      <return-type type="void" />
       <parameters>
-        <parameter type="GnomeUIInfo*" name="uiinfo"/>
-        <parameter type="const-char*" name="signal_name"/>
-        <parameter type="GnomeUIBuilderData*" name="uibdata"/>
+        <parameter type="GnomeUIInfo*" name="uiinfo" />
+        <parameter type="const-char*" name="signal_name" />
+        <parameter type="GnomeUIBuilderData*" name="uibdata" />
       </parameters>
     </callback>
     <object name="About" cname="GnomeAbout" parent="GtkDialog">
-      <field cname="_priv" type="GnomeAboutPrivate*"/>
-      <property name="Name" cname="name" type="gchar*" readable="true" writeable="true"/>
-      <property name="Version" cname="version" type="gchar*" readable="true" writeable="true"/>
-      <property name="Copyright" cname="copyright" type="gchar*" readable="true" writeable="true"/>
-      <property name="Comments" cname="comments" type="gchar*" readable="true" writeable="true"/>
-      <property name="Authors" cname="authors" type="value_array" writeable="true"/>
-      <property name="Documenters" cname="documenters" type="value_array" writeable="true"/>
-      <property name="TranslatorCredits" cname="translator_credits" type="gchar*" readable="true" writeable="true"/>
-      <property name="Logo" cname="logo" type="GdkPixbuf" writeable="true"/>
+      <field cname="_priv" type="GnomeAboutPrivate*" />
+      <property name="Name" cname="name" type="gchar*" readable="true" writeable="true" />
+      <property name="Version" cname="version" type="gchar*" readable="true" writeable="true" />
+      <property name="Copyright" cname="copyright" type="gchar*" readable="true" writeable="true" />
+      <property name="Comments" cname="comments" type="gchar*" readable="true" writeable="true" />
+      <property name="Authors" cname="authors" type="value_array" writeable="true" />
+      <property name="Documenters" cname="documenters" type="value_array" writeable="true" />
+      <property name="TranslatorCredits" cname="translator_credits" type="gchar*" readable="true" writeable="true" />
+      <property name="Logo" cname="logo" type="GdkPixbuf" writeable="true" />
       <method name="Construct" cname="gnome_about_construct">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="name"/>
-          <parameter type="const-gchar*" name="version"/>
-          <parameter type="const-gchar*" name="copyright"/>
-          <parameter type="const-gchar*" name="comments"/>
-          <parameter type="const-gchar**" name="authors"/>
-          <parameter type="const-gchar**" name="documenters"/>
-          <parameter type="const-gchar*" name="translator_credits"/>
-          <parameter type="GdkPixbuf*" name="logo_pixbuf"/>
+          <parameter type="const-gchar*" name="name" />
+          <parameter type="const-gchar*" name="version" />
+          <parameter type="const-gchar*" name="copyright" />
+          <parameter type="const-gchar*" name="comments" />
+          <parameter type="const-gchar**" name="authors" />
+          <parameter type="const-gchar**" name="documenters" />
+          <parameter type="const-gchar*" name="translator_credits" />
+          <parameter type="GdkPixbuf*" name="logo_pixbuf" />
         </parameters>
       </method>
       <method name="GetType" cname="gnome_about_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <constructor cname="gnome_about_new">
         <parameters>
-          <parameter type="const-gchar*" name="name"/>
-          <parameter type="const-gchar*" name="version"/>
-          <parameter type="const-gchar*" name="copyright"/>
-          <parameter type="const-gchar*" name="comments"/>
-          <parameter type="const-gchar**" name="authors" array="1"/>
-          <parameter type="const-gchar**" name="documenters" array="1"/>
-          <parameter type="const-gchar*" name="translator_credits"/>
-          <parameter type="GdkPixbuf*" name="logo_pixbuf"/>
+          <parameter type="const-gchar*" name="name" />
+          <parameter type="const-gchar*" name="version" />
+          <parameter type="const-gchar*" name="copyright" />
+          <parameter type="const-gchar*" name="comments" />
+          <parameter type="const-gchar**" name="authors" array="1" />
+          <parameter type="const-gchar**" name="documenters" array="1" />
+          <parameter type="const-gchar*" name="translator_credits" />
+          <parameter type="GdkPixbuf*" name="logo_pixbuf" />
         </parameters>
       </constructor>
     </object>
     <object name="App" cname="GnomeApp" parent="GtkWindow">
-      <field cname="name" type="gchar*"/>
-      <field cname="prefix" type="gchar*"/>
-      <field cname="dock" type="GtkWidget*"/>
-      <field cname="statusbar" type="GtkWidget*"/>
-      <field cname="vbox" type="GtkWidget*"/>
-      <field cname="menubar" type="GtkWidget*"/>
-      <field cname="contents" type="GtkWidget*"/>
-      <field cname="layout" type="BonoboDockLayout*"/>
-      <field cname="accel_group" type="GtkAccelGroup*"/>
-      <field cname="enable_layout_config" bits="1" type="guint"/>
-      <field cname="_priv" type="GnomeAppPrivate*"/>
-      <property name="AppId" cname="app_id" type="gchar*" readable="true" writeable="true" construct-only="true"/>
+      <field cname="name" type="gchar*" />
+      <field cname="prefix" type="gchar*" />
+      <field cname="dock" type="GtkWidget*" />
+      <field cname="statusbar" type="GtkWidget*" />
+      <field cname="vbox" type="GtkWidget*" />
+      <field cname="menubar" type="GtkWidget*" />
+      <field cname="contents" type="GtkWidget*" />
+      <field cname="layout" type="BonoboDockLayout*" />
+      <field cname="accel_group" type="GtkAccelGroup*" />
+      <field cname="enable_layout_config" bits="1" type="guint" />
+      <field cname="_priv" type="GnomeAppPrivate*" />
+      <property name="AppId" cname="app_id" type="gchar*" readable="true" writeable="true" construct-only="true" />
       <method name="AddDockItem" cname="gnome_app_add_dock_item">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="BonoboDockItem*" name="item"/>
-          <parameter type="BonoboDockPlacement" name="placement"/>
-          <parameter type="gint" name="band_num"/>
-          <parameter type="gint" name="band_position"/>
-          <parameter type="gint" name="offset"/>
+          <parameter type="BonoboDockItem*" name="item" />
+          <parameter type="BonoboDockPlacement" name="placement" />
+          <parameter type="gint" name="band_num" />
+          <parameter type="gint" name="band_position" />
+          <parameter type="gint" name="offset" />
         </parameters>
       </method>
       <method name="AddDocked" cname="gnome_app_add_docked">
-        <return-type type="GtkWidget*"/>
+        <return-type type="GtkWidget*" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="const-gchar*" name="name"/>
-          <parameter type="BonoboDockItemBehavior" name="behavior"/>
-          <parameter type="BonoboDockPlacement" name="placement"/>
-          <parameter type="gint" name="band_num"/>
-          <parameter type="gint" name="band_position"/>
-          <parameter type="gint" name="offset"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="const-gchar*" name="name" />
+          <parameter type="BonoboDockItemBehavior" name="behavior" />
+          <parameter type="BonoboDockPlacement" name="placement" />
+          <parameter type="gint" name="band_num" />
+          <parameter type="gint" name="band_position" />
+          <parameter type="gint" name="offset" />
         </parameters>
       </method>
       <method name="AddToolbar" cname="gnome_app_add_toolbar">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkToolbar*" name="toolbar"/>
-          <parameter type="const-gchar*" name="name"/>
-          <parameter type="BonoboDockItemBehavior" name="behavior"/>
-          <parameter type="BonoboDockPlacement" name="placement"/>
-          <parameter type="gint" name="band_num"/>
-          <parameter type="gint" name="band_position"/>
-          <parameter type="gint" name="offset"/>
+          <parameter type="GtkToolbar*" name="toolbar" />
+          <parameter type="const-gchar*" name="name" />
+          <parameter type="BonoboDockItemBehavior" name="behavior" />
+          <parameter type="BonoboDockPlacement" name="placement" />
+          <parameter type="gint" name="band_num" />
+          <parameter type="gint" name="band_position" />
+          <parameter type="gint" name="offset" />
         </parameters>
       </method>
       <method name="Construct" cname="gnome_app_construct">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="appname"/>
-          <parameter type="const-gchar*" name="title"/>
+          <parameter type="const-gchar*" name="appname" />
+          <parameter type="const-gchar*" name="title" />
         </parameters>
       </method>
       <method name="CreateMenus" cname="gnome_app_create_menus">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeUIInfo*" name="uiinfo"/>
+          <parameter type="GnomeUIInfo*" name="uiinfo" />
         </parameters>
       </method>
       <method name="CreateMenusCustom" cname="gnome_app_create_menus_custom">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeUIInfo*" name="uiinfo"/>
-          <parameter type="GnomeUIBuilderData*" name="uibdata"/>
+          <parameter type="GnomeUIInfo*" name="uiinfo" />
+          <parameter type="GnomeUIBuilderData*" name="uibdata" />
         </parameters>
       </method>
       <method name="CreateMenusInterp" cname="gnome_app_create_menus_interp">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeUIInfo*" name="uiinfo"/>
-          <parameter type="GtkCallbackMarshal" name="relay_func"/>
-          <parameter type="gpointer" name="data"/>
-          <parameter type="GtkDestroyNotify" name="destroy_func"/>
+          <parameter type="GnomeUIInfo*" name="uiinfo" />
+          <parameter type="GtkCallbackMarshal" name="relay_func" />
+          <parameter type="gpointer" name="data" />
+          <parameter type="GtkDestroyNotify" name="destroy_func" />
         </parameters>
       </method>
       <method name="CreateMenusWithData" cname="gnome_app_create_menus_with_data">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeUIInfo*" name="uiinfo"/>
-          <parameter type="gpointer" name="user_data"/>
+          <parameter type="GnomeUIInfo*" name="uiinfo" />
+          <parameter type="gpointer" name="user_data" />
         </parameters>
       </method>
       <method name="CreateToolbar" cname="gnome_app_create_toolbar">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeUIInfo*" name="uiinfo"/>
+          <parameter type="GnomeUIInfo*" name="uiinfo" />
         </parameters>
       </method>
       <method name="CreateToolbarCustom" cname="gnome_app_create_toolbar_custom">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeUIInfo*" name="uiinfo"/>
-          <parameter type="GnomeUIBuilderData*" name="uibdata"/>
+          <parameter type="GnomeUIInfo*" name="uiinfo" />
+          <parameter type="GnomeUIBuilderData*" name="uibdata" />
         </parameters>
       </method>
       <method name="CreateToolbarInterp" cname="gnome_app_create_toolbar_interp">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeUIInfo*" name="uiinfo"/>
-          <parameter type="GtkCallbackMarshal" name="relay_func"/>
-          <parameter type="gpointer" name="data"/>
-          <parameter type="GtkDestroyNotify" name="destroy_func"/>
+          <parameter type="GnomeUIInfo*" name="uiinfo" />
+          <parameter type="GtkCallbackMarshal" name="relay_func" />
+          <parameter type="gpointer" name="data" />
+          <parameter type="GtkDestroyNotify" name="destroy_func" />
         </parameters>
       </method>
       <method name="CreateToolbarWithData" cname="gnome_app_create_toolbar_with_data">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeUIInfo*" name="uiinfo"/>
-          <parameter type="gpointer" name="user_data"/>
+          <parameter type="GnomeUIInfo*" name="uiinfo" />
+          <parameter type="gpointer" name="user_data" />
         </parameters>
       </method>
       <method name="EnableLayoutConfig" cname="gnome_app_enable_layout_config">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="enable"/>
+          <parameter type="gboolean" name="enable" />
         </parameters>
       </method>
       <method name="FillMenu" cname="gnome_app_fill_menu" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkMenuShell*" name="menu_shell"/>
-          <parameter type="GnomeUIInfo*" name="uiinfo"/>
-          <parameter type="GtkAccelGroup*" name="accel_group"/>
-          <parameter type="gboolean" name="uline_accels"/>
-          <parameter type="gint" name="pos"/>
+          <parameter type="GtkMenuShell*" name="menu_shell" />
+          <parameter type="GnomeUIInfo*" name="uiinfo" />
+          <parameter type="GtkAccelGroup*" name="accel_group" />
+          <parameter type="gboolean" name="uline_accels" />
+          <parameter type="gint" name="pos" />
         </parameters>
       </method>
       <method name="FillMenuCustom" cname="gnome_app_fill_menu_custom" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkMenuShell*" name="menu_shell"/>
-          <parameter type="GnomeUIInfo*" name="uiinfo"/>
-          <parameter type="GnomeUIBuilderData*" name="uibdata"/>
-          <parameter type="GtkAccelGroup*" name="accel_group"/>
-          <parameter type="gboolean" name="uline_accels"/>
-          <parameter type="gint" name="pos"/>
+          <parameter type="GtkMenuShell*" name="menu_shell" />
+          <parameter type="GnomeUIInfo*" name="uiinfo" />
+          <parameter type="GnomeUIBuilderData*" name="uibdata" />
+          <parameter type="GtkAccelGroup*" name="accel_group" />
+          <parameter type="gboolean" name="uline_accels" />
+          <parameter type="gint" name="pos" />
         </parameters>
       </method>
       <method name="FillMenuWithData" cname="gnome_app_fill_menu_with_data" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkMenuShell*" name="menu_shell"/>
-          <parameter type="GnomeUIInfo*" name="uiinfo"/>
-          <parameter type="GtkAccelGroup*" name="accel_group"/>
-          <parameter type="gboolean" name="uline_accels"/>
-          <parameter type="gint" name="pos"/>
-          <parameter type="gpointer" name="user_data"/>
+          <parameter type="GtkMenuShell*" name="menu_shell" />
+          <parameter type="GnomeUIInfo*" name="uiinfo" />
+          <parameter type="GtkAccelGroup*" name="accel_group" />
+          <parameter type="gboolean" name="uline_accels" />
+          <parameter type="gint" name="pos" />
+          <parameter type="gpointer" name="user_data" />
         </parameters>
       </method>
       <method name="FillToolbar" cname="gnome_app_fill_toolbar" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkToolbar*" name="toolbar"/>
-          <parameter type="GnomeUIInfo*" name="uiinfo"/>
-          <parameter type="GtkAccelGroup*" name="accel_group"/>
+          <parameter type="GtkToolbar*" name="toolbar" />
+          <parameter type="GnomeUIInfo*" name="uiinfo" />
+          <parameter type="GtkAccelGroup*" name="accel_group" />
         </parameters>
       </method>
       <method name="FillToolbarCustom" cname="gnome_app_fill_toolbar_custom" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkToolbar*" name="toolbar"/>
-          <parameter type="GnomeUIInfo*" name="uiinfo"/>
-          <parameter type="GnomeUIBuilderData*" name="uibdata"/>
-          <parameter type="GtkAccelGroup*" name="accel_group"/>
+          <parameter type="GtkToolbar*" name="toolbar" />
+          <parameter type="GnomeUIInfo*" name="uiinfo" />
+          <parameter type="GnomeUIBuilderData*" name="uibdata" />
+          <parameter type="GtkAccelGroup*" name="accel_group" />
         </parameters>
       </method>
       <method name="FillToolbarWithData" cname="gnome_app_fill_toolbar_with_data" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkToolbar*" name="toolbar"/>
-          <parameter type="GnomeUIInfo*" name="uiinfo"/>
-          <parameter type="GtkAccelGroup*" name="accel_group"/>
-          <parameter type="gpointer" name="user_data"/>
+          <parameter type="GtkToolbar*" name="toolbar" />
+          <parameter type="GnomeUIInfo*" name="uiinfo" />
+          <parameter type="GtkAccelGroup*" name="accel_group" />
+          <parameter type="gpointer" name="user_data" />
         </parameters>
       </method>
       <method name="FindMenuPos" cname="gnome_app_find_menu_pos" shared="true">
-        <return-type type="GtkWidget*"/>
+        <return-type type="GtkWidget*" />
         <parameters>
-          <parameter type="GtkWidget*" name="parent"/>
-          <parameter type="const-gchar*" name="path"/>
-          <parameter type="gint*" name="pos"/>
+          <parameter type="GtkWidget*" name="parent" />
+          <parameter type="const-gchar*" name="path" />
+          <parameter type="gint*" name="pos" />
         </parameters>
       </method>
       <method name="GetDock" cname="gnome_app_get_dock">
-        <return-type type="BonoboDock*"/>
+        <return-type type="BonoboDock*" />
       </method>
       <method name="GetDockItemByName" cname="gnome_app_get_dock_item_by_name">
-        <return-type type="BonoboDockItem*"/>
+        <return-type type="BonoboDockItem*" />
         <parameters>
-          <parameter type="const-gchar*" name="name"/>
+          <parameter type="const-gchar*" name="name" />
         </parameters>
       </method>
       <method name="GetType" cname="gnome_app_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="HelperGettext" cname="gnome_app_helper_gettext" shared="true">
-        <return-type type="const-gchar*"/>
+        <return-type type="const-gchar*" />
         <parameters>
-          <parameter type="const-gchar*" name="string"/>
+          <parameter type="const-gchar*" name="string" />
         </parameters>
       </method>
       <method name="InsertMenus" cname="gnome_app_insert_menus">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="path"/>
-          <parameter type="GnomeUIInfo*" name="menuinfo"/>
+          <parameter type="const-gchar*" name="path" />
+          <parameter type="GnomeUIInfo*" name="menuinfo" />
         </parameters>
       </method>
       <method name="InsertMenusCustom" cname="gnome_app_insert_menus_custom">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="path"/>
-          <parameter type="GnomeUIInfo*" name="uiinfo"/>
-          <parameter type="GnomeUIBuilderData*" name="uibdata"/>
+          <parameter type="const-gchar*" name="path" />
+          <parameter type="GnomeUIInfo*" name="uiinfo" />
+          <parameter type="GnomeUIBuilderData*" name="uibdata" />
         </parameters>
       </method>
       <method name="InsertMenusInterp" cname="gnome_app_insert_menus_interp">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="path"/>
-          <parameter type="GnomeUIInfo*" name="menuinfo"/>
-          <parameter type="GtkCallbackMarshal" name="relay_func"/>
-          <parameter type="gpointer" name="data"/>
-          <parameter type="GtkDestroyNotify" name="destroy_func"/>
+          <parameter type="const-gchar*" name="path" />
+          <parameter type="GnomeUIInfo*" name="menuinfo" />
+          <parameter type="GtkCallbackMarshal" name="relay_func" />
+          <parameter type="gpointer" name="data" />
+          <parameter type="GtkDestroyNotify" name="destroy_func" />
         </parameters>
       </method>
       <method name="InsertMenusWithData" cname="gnome_app_insert_menus_with_data">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="path"/>
-          <parameter type="GnomeUIInfo*" name="menuinfo"/>
-          <parameter type="gpointer" name="data"/>
+          <parameter type="const-gchar*" name="path" />
+          <parameter type="GnomeUIInfo*" name="menuinfo" />
+          <parameter type="gpointer" name="data" />
         </parameters>
       </method>
       <method name="InstallAppbarMenuHints" cname="gnome_app_install_appbar_menu_hints" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeAppBar*" name="appbar"/>
-          <parameter type="GnomeUIInfo*" name="uiinfo"/>
+          <parameter type="GnomeAppBar*" name="appbar" />
+          <parameter type="GnomeUIInfo*" name="uiinfo" />
         </parameters>
       </method>
       <method name="InstallMenuHints" cname="gnome_app_install_menu_hints">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeUIInfo*" name="uiinfo"/>
+          <parameter type="GnomeUIInfo*" name="uiinfo" />
         </parameters>
       </method>
       <method name="InstallStatusbarMenuHints" cname="gnome_app_install_statusbar_menu_hints" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkStatusbar*" name="bar"/>
-          <parameter type="GnomeUIInfo*" name="uiinfo"/>
+          <parameter type="GtkStatusbar*" name="bar" />
+          <parameter type="GnomeUIInfo*" name="uiinfo" />
         </parameters>
       </method>
       <constructor cname="gnome_app_new">
         <parameters>
-          <parameter type="const-gchar*" name="appname"/>
-          <parameter type="const-gchar*" name="title"/>
+          <parameter type="const-gchar*" name="appname" />
+          <parameter type="const-gchar*" name="title" />
         </parameters>
       </constructor>
       <method name="RemoveMenuRange" cname="gnome_app_remove_menu_range">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="path"/>
-          <parameter type="gint" name="start"/>
-          <parameter type="gint" name="items"/>
+          <parameter type="const-gchar*" name="path" />
+          <parameter type="gint" name="start" />
+          <parameter type="gint" name="items" />
         </parameters>
       </method>
       <method name="RemoveMenus" cname="gnome_app_remove_menus">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="path"/>
-          <parameter type="gint" name="items"/>
+          <parameter type="const-gchar*" name="path" />
+          <parameter type="gint" name="items" />
         </parameters>
       </method>
       <method name="SetContents" cname="gnome_app_set_contents">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="contents"/>
+          <parameter type="GtkWidget*" name="contents" />
         </parameters>
       </method>
       <method name="SetMenus" cname="gnome_app_set_menus">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkMenuBar*" name="menubar"/>
+          <parameter type="GtkMenuBar*" name="menubar" />
         </parameters>
       </method>
       <method name="SetStatusbar" cname="gnome_app_set_statusbar">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="statusbar"/>
+          <parameter type="GtkWidget*" name="statusbar" />
         </parameters>
       </method>
       <method name="SetStatusbarCustom" cname="gnome_app_set_statusbar_custom">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="container"/>
-          <parameter type="GtkWidget*" name="statusbar"/>
+          <parameter type="GtkWidget*" name="container" />
+          <parameter type="GtkWidget*" name="statusbar" />
         </parameters>
       </method>
       <method name="SetToolbar" cname="gnome_app_set_toolbar">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkToolbar*" name="toolbar"/>
+          <parameter type="GtkToolbar*" name="toolbar" />
         </parameters>
       </method>
       <method name="SetupToolbar" cname="gnome_app_setup_toolbar" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkToolbar*" name="toolbar"/>
-          <parameter type="BonoboDockItem*" name="dock_item"/>
+          <parameter type="GtkToolbar*" name="toolbar" />
+          <parameter type="BonoboDockItem*" name="dock_item" />
         </parameters>
       </method>
       <method name="UiConfigureConfigurable" cname="gnome_app_ui_configure_configurable" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeUIInfo*" name="uiinfo"/>
+          <parameter type="GnomeUIInfo*" name="uiinfo" />
         </parameters>
       </method>
     </object>
     <object name="AppBar" cname="GnomeAppBar" parent="GtkHBox">
-      <field cname="_priv" type="GnomeAppBarPrivate*"/>
+      <field cname="_priv" type="GnomeAppBarPrivate*" />
       <signal name="UserResponse" cname="user_response" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeAppBar*" name="ab"/>
+          <parameter type="GnomeAppBar*" name="ab" />
         </parameters>
       </signal>
-      <signal name="PromptCleared" cname="clear_prompt" when="LAST">
-        <return-type type="void"/>
+      <signal cname="clear_prompt" when="LAST" name="PromptCleared">
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeAppBar*" name="ab"/>
+          <parameter type="GnomeAppBar*" name="ab" />
         </parameters>
       </signal>
-      <property name="HasProgress" cname="has_progress" type="gboolean" readable="true" writeable="true" construct-only="true"/>
-      <property name="HasStatus" cname="has_status" type="gboolean" readable="true" writeable="true" construct-only="true"/>
-      <property name="Interactivity" cname="interactivity" type="GnomePreferencesType" readable="true" writeable="true" construct-only="true"/>
+      <property name="HasProgress" cname="has_progress" type="gboolean" readable="true" writeable="true" construct-only="true" />
+      <property name="HasStatus" cname="has_status" type="gboolean" readable="true" writeable="true" construct-only="true" />
+      <property name="Interactivity" cname="interactivity" type="GnomePreferencesType" readable="true" writeable="true" construct-only="true" />
       <method name="ClearPrompt" cname="gnome_appbar_clear_prompt">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="ClearStack" cname="gnome_appbar_clear_stack">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="GetProgress" cname="gnome_appbar_get_progress">
-        <return-type type="GtkProgressBar*"/>
+        <return-type type="GtkProgressBar*" />
       </method>
       <method name="GetResponse" cname="gnome_appbar_get_response">
-        <return-type type="gchar*"/>
+        <return-type type="gchar*" />
       </method>
       <method name="GetStatus" cname="gnome_appbar_get_status">
-        <return-type type="GtkWidget*"/>
+        <return-type type="GtkWidget*" />
       </method>
       <method name="GetType" cname="gnome_appbar_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <constructor cname="gnome_appbar_new">
         <parameters>
-          <parameter type="gboolean" name="has_progress"/>
-          <parameter type="gboolean" name="has_status"/>
-          <parameter type="GnomePreferencesType" name="interactivity"/>
+          <parameter type="gboolean" name="has_progress" />
+          <parameter type="gboolean" name="has_status" />
+          <parameter type="GnomePreferencesType" name="interactivity" />
         </parameters>
       </constructor>
       <method name="Pop" cname="gnome_appbar_pop">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="Push" cname="gnome_appbar_push">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="status"/>
+          <parameter type="const-gchar*" name="status" />
         </parameters>
       </method>
       <method name="Refresh" cname="gnome_appbar_refresh">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="SetDefault" cname="gnome_appbar_set_default">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="default_status"/>
+          <parameter type="const-gchar*" name="default_status" />
         </parameters>
       </method>
       <method name="SetProgressPercentage" cname="gnome_appbar_set_progress_percentage">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gfloat" name="percentage"/>
+          <parameter type="gfloat" name="percentage" />
         </parameters>
       </method>
       <method name="SetPrompt" cname="gnome_appbar_set_prompt">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="prompt"/>
-          <parameter type="gboolean" name="modal"/>
+          <parameter type="const-gchar*" name="prompt" />
+          <parameter type="gboolean" name="modal" />
         </parameters>
       </method>
       <method name="SetStatus" cname="gnome_appbar_set_status">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="status"/>
+          <parameter type="const-gchar*" name="status" />
         </parameters>
       </method>
     </object>
     <object name="Client" cname="GnomeClient" parent="GtkObject">
-      <field cname="smc_conn" type="gpointer"/>
-      <field cname="client_id" type="gchar*"/>
-      <field cname="previous_id" type="gchar*"/>
-      <field cname="config_prefix" type="gchar*"/>
-      <field cname="global_config_prefix" type="gchar*"/>
-      <field cname="static_args" type="GList*"/>
-      <field cname="clone_command" type="gchar**"/>
-      <field cname="current_directory" type="gchar*"/>
-      <field cname="discard_command" type="gchar**"/>
-      <field cname="environment" type="GHashTable*"/>
-      <field cname="process_id" type="pid_t"/>
-      <field cname="program" type="gchar*"/>
-      <field cname="resign_command" type="gchar**"/>
-      <field cname="restart_command" type="gchar**"/>
-      <field cname="restart_style" type="GnomeRestartStyle"/>
-      <field cname="shutdown_command" type="gchar**"/>
-      <field cname="user_id" type="gchar*"/>
-      <field cname="interaction_keys" type="GSList*"/>
-      <field cname="input_id" type="gint"/>
-      <field cname="save_style" bits="2" type="GnomeSaveStyle"/>
-      <field cname="interact_style" bits="2" type="GnomeInteractStyle"/>
-      <field cname="state" bits="3" type="GnomeClientState"/>
-      <field cname="shutdown" bits="1" type="guint"/>
-      <field cname="fast" bits="1" type="guint"/>
-      <field cname="save_phase_2_requested" bits="1" type="guint"/>
-      <field cname="save_successfull" bits="1" type="guint"/>
-      <field cname="save_yourself_emitted" bits="1" type="guint"/>
-      <field cname="reserved" type="gpointer"/>
+      <field cname="smc_conn" type="gpointer" />
+      <field cname="client_id" type="gchar*" />
+      <field cname="previous_id" type="gchar*" />
+      <field cname="config_prefix" type="gchar*" />
+      <field cname="global_config_prefix" type="gchar*" />
+      <field cname="static_args" type="GList*" />
+      <field cname="clone_command" type="gchar**" />
+      <field cname="current_directory" type="gchar*" />
+      <field cname="discard_command" type="gchar**" />
+      <field cname="environment" type="GHashTable*" />
+      <field cname="process_id" type="pid_t" />
+      <field cname="program" type="gchar*" />
+      <field cname="resign_command" type="gchar**" />
+      <field cname="restart_command" type="gchar**" />
+      <field cname="restart_style" type="GnomeRestartStyle" />
+      <field cname="shutdown_command" type="gchar**" />
+      <field cname="user_id" type="gchar*" />
+      <field cname="interaction_keys" type="GSList*" />
+      <field cname="input_id" type="gint" />
+      <field cname="save_style" bits="2" type="GnomeSaveStyle" />
+      <field cname="interact_style" bits="2" type="GnomeInteractStyle" />
+      <field cname="state" bits="3" type="GnomeClientState" />
+      <field cname="shutdown" bits="1" type="guint" />
+      <field cname="fast" bits="1" type="guint" />
+      <field cname="save_phase_2_requested" bits="1" type="guint" />
+      <field cname="save_successfull" bits="1" type="guint" />
+      <field cname="save_yourself_emitted" bits="1" type="guint" />
+      <field cname="reserved" type="gpointer" />
       <signal name="SaveYourself" cname="save_yourself" when="LAST">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GnomeClient*" name="client"/>
-          <parameter type="gint" name="phase"/>
-          <parameter type="GnomeSaveStyle" name="save_style"/>
-          <parameter type="gboolean" name="shutdown"/>
-          <parameter type="GnomeInteractStyle" name="interact_style"/>
-          <parameter type="gboolean" name="fast"/>
+          <parameter type="GnomeClient*" name="client" />
+          <parameter type="gint" name="phase" />
+          <parameter type="GnomeSaveStyle" name="save_style" />
+          <parameter type="gboolean" name="shutdown" />
+          <parameter type="GnomeInteractStyle" name="interact_style" />
+          <parameter type="gboolean" name="fast" />
         </parameters>
       </signal>
       <signal name="Die" cname="die" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeClient*" name="client"/>
+          <parameter type="GnomeClient*" name="client" />
         </parameters>
       </signal>
       <signal name="SaveComplete" cname="save_complete" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeClient*" name="client"/>
+          <parameter type="GnomeClient*" name="client" />
         </parameters>
       </signal>
       <signal name="ShutdownCancelled" cname="shutdown_cancelled" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeClient*" name="client"/>
+          <parameter type="GnomeClient*" name="client" />
         </parameters>
       </signal>
-      <signal name="Connected" cname="connect" when="FIRST">
-        <return-type type="void"/>
+      <signal cname="connect" when="FIRST" name="Connected">
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeClient*" name="client"/>
-          <parameter type="gboolean" name="restarted"/>
+          <parameter type="GnomeClient*" name="client" />
+          <parameter type="gboolean" name="restarted" />
         </parameters>
       </signal>
-      <signal name="Disconnected" cname="disconnect" when="FIRST">
-        <return-type type="void"/>
+      <signal cname="disconnect" when="FIRST" name="Disconnected">
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeClient*" name="client"/>
+          <parameter type="GnomeClient*" name="client" />
         </parameters>
       </signal>
       <method name="AddStaticArg" cname="gnome_client_add_static_arg">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter ellipsis="true"/>
+          <parameter ellipsis="true" />
         </parameters>
       </method>
       <method name="Connect" cname="gnome_client_connect">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="Disconnect" cname="gnome_client_disconnect">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="Flush" cname="gnome_client_flush">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="GetConfigPrefix" cname="gnome_client_get_config_prefix">
-        <return-type type="const-gchar*"/>
+        <return-type type="const-gchar*" />
       </method>
       <method name="GetDesktopId" cname="gnome_client_get_desktop_id">
-        <return-type type="const-gchar*"/>
+        <return-type type="const-gchar*" />
       </method>
       <method name="GetFlags" cname="gnome_client_get_flags">
-        <return-type type="GnomeClientFlags"/>
+        <return-type type="GnomeClientFlags" />
       </method>
       <method name="GetGlobalConfigPrefix" cname="gnome_client_get_global_config_prefix">
-        <return-type type="const-gchar*"/>
+        <return-type type="const-gchar*" />
       </method>
       <method name="GetId" cname="gnome_client_get_id">
-        <return-type type="const-gchar*"/>
+        <return-type type="const-gchar*" />
       </method>
       <method name="GetPreviousId" cname="gnome_client_get_previous_id">
-        <return-type type="const-gchar*"/>
+        <return-type type="const-gchar*" />
       </method>
       <method name="GetType" cname="gnome_client_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="ModuleInfoGet" cname="gnome_client_module_info_get" shared="true">
-        <return-type type="const-GnomeModuleInfo*"/>
+        <return-type type="const-GnomeModuleInfo*" />
       </method>
-      <constructor cname="gnome_client_new"/>
-      <constructor cname="gnome_client_new_without_connection"/>
+      <constructor cname="gnome_client_new" />
+      <constructor cname="gnome_client_new_without_connection" />
       <method name="RequestInteraction" cname="gnome_client_request_interaction">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeDialogType" name="dialog_type"/>
-          <parameter type="GnomeInteractFunction" name="function"/>
-          <parameter type="gpointer" name="data"/>
+          <parameter type="GnomeDialogType" name="dialog_type" />
+          <parameter type="GnomeInteractFunction" name="function" />
+          <parameter type="gpointer" name="data" />
         </parameters>
       </method>
       <method name="RequestInteractionInterp" cname="gnome_client_request_interaction_interp">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeDialogType" name="dialog_type"/>
-          <parameter type="GtkCallbackMarshal" name="function"/>
-          <parameter type="gpointer" name="data"/>
-          <parameter type="GtkDestroyNotify" name="destroy"/>
+          <parameter type="GnomeDialogType" name="dialog_type" />
+          <parameter type="GtkCallbackMarshal" name="function" />
+          <parameter type="gpointer" name="data" />
+          <parameter type="GtkDestroyNotify" name="destroy" />
         </parameters>
       </method>
       <method name="RequestPhase2" cname="gnome_client_request_phase_2">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="RequestSave" cname="gnome_client_request_save">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeSaveStyle" name="save_style"/>
-          <parameter type="gboolean" name="shutdown"/>
-          <parameter type="GnomeInteractStyle" name="interact_style"/>
-          <parameter type="gboolean" name="fast"/>
-          <parameter type="gboolean" name="global"/>
+          <parameter type="GnomeSaveStyle" name="save_style" />
+          <parameter type="gboolean" name="shutdown" />
+          <parameter type="GnomeInteractStyle" name="interact_style" />
+          <parameter type="gboolean" name="fast" />
+          <parameter type="gboolean" name="global" />
         </parameters>
       </method>
       <method name="SaveAnyDialog" cname="gnome_client_save_any_dialog">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkDialog*" name="dialog"/>
+          <parameter type="GtkDialog*" name="dialog" />
         </parameters>
       </method>
       <method name="SaveErrorDialog" cname="gnome_client_save_error_dialog">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkDialog*" name="dialog"/>
+          <parameter type="GtkDialog*" name="dialog" />
         </parameters>
       </method>
       <method name="SetCloneCommand" cname="gnome_client_set_clone_command">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="argc"/>
-          <parameter type="gchar*" array="true" name="argv"/>
+          <parameter type="gint" name="argc" />
+          <parameter type="gchar*" array="true" name="argv" />
         </parameters>
       </method>
       <method name="SetCurrentDirectory" cname="gnome_client_set_current_directory">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="dir"/>
+          <parameter type="const-gchar*" name="dir" />
         </parameters>
       </method>
       <method name="SetDiscardCommand" cname="gnome_client_set_discard_command">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="argc"/>
-          <parameter type="gchar*" array="true" name="argv"/>
+          <parameter type="gint" name="argc" />
+          <parameter type="gchar*" array="true" name="argv" />
         </parameters>
       </method>
       <method name="SetEnvironment" cname="gnome_client_set_environment">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="name"/>
-          <parameter type="const-gchar*" name="value"/>
+          <parameter type="const-gchar*" name="name" />
+          <parameter type="const-gchar*" name="value" />
         </parameters>
       </method>
       <method name="SetGlobalConfigPrefix" cname="gnome_client_set_global_config_prefix">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="prefix"/>
+          <parameter type="const-gchar*" name="prefix" />
         </parameters>
       </method>
       <method name="SetId" cname="gnome_client_set_id">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="id"/>
+          <parameter type="const-gchar*" name="id" />
         </parameters>
       </method>
       <method name="SetPriority" cname="gnome_client_set_priority">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="guint" name="priority"/>
+          <parameter type="guint" name="priority" />
         </parameters>
       </method>
       <method name="SetProcessId" cname="gnome_client_set_process_id">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="pid_t" name="pid"/>
+          <parameter type="pid_t" name="pid" />
         </parameters>
       </method>
       <method name="SetProgram" cname="gnome_client_set_program">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="program"/>
+          <parameter type="const-gchar*" name="program" />
         </parameters>
       </method>
       <method name="SetResignCommand" cname="gnome_client_set_resign_command">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="argc"/>
-          <parameter type="gchar*" array="true" name="argv"/>
+          <parameter type="gint" name="argc" />
+          <parameter type="gchar*" array="true" name="argv" />
         </parameters>
       </method>
       <method name="SetRestartCommand" cname="gnome_client_set_restart_command">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="argc"/>
-          <parameter type="gchar*" array="true" name="argv"/>
+          <parameter type="gint" name="argc" />
+          <parameter type="gchar*" array="true" name="argv" />
         </parameters>
       </method>
       <method name="SetRestartStyle" cname="gnome_client_set_restart_style">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeRestartStyle" name="style"/>
+          <parameter type="GnomeRestartStyle" name="style" />
         </parameters>
       </method>
       <method name="SetShutdownCommand" cname="gnome_client_set_shutdown_command">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="argc"/>
-          <parameter type="gchar*" array="true" name="argv"/>
+          <parameter type="gint" name="argc" />
+          <parameter type="gchar*" array="true" name="argv" />
         </parameters>
       </method>
       <method name="SetUserId" cname="gnome_client_set_user_id">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="id"/>
+          <parameter type="const-gchar*" name="id" />
         </parameters>
       </method>
     </object>
     <object name="ColorPicker" cname="GnomeColorPicker" parent="GtkButton">
-      <field cname="_priv" type="GnomeColorPickerPrivate*"/>
+      <field cname="_priv" type="GnomeColorPickerPrivate*" />
       <signal name="ColorSet" cname="color_set" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeColorPicker*" name="cp"/>
-          <parameter type="guint" name="r"/>
-          <parameter type="guint" name="g"/>
-          <parameter type="guint" name="b"/>
-          <parameter type="guint" name="a"/>
+          <parameter type="GnomeColorPicker*" name="cp" />
+          <parameter type="guint" name="r" />
+          <parameter type="guint" name="g" />
+          <parameter type="guint" name="b" />
+          <parameter type="guint" name="a" />
         </parameters>
       </signal>
-      <property name="Dither" cname="dither" type="gboolean" readable="true" writeable="true"/>
-      <property name="UseAlpha" cname="use_alpha" type="gboolean" readable="true" writeable="true"/>
-      <property name="Title" cname="title" type="gchar*" readable="true" writeable="true"/>
-      <property name="Red" cname="red" type="guint" readable="true" writeable="true"/>
-      <property name="Green" cname="green" type="guint" readable="true" writeable="true"/>
-      <property name="Blue" cname="blue" type="guint" readable="true" writeable="true"/>
-      <property name="Alpha" cname="alpha" type="guint" readable="true" writeable="true"/>
+      <property name="Dither" cname="dither" type="gboolean" readable="true" writeable="true" />
+      <property name="UseAlpha" cname="use_alpha" type="gboolean" readable="true" writeable="true" />
+      <property name="Title" cname="title" type="gchar*" readable="true" writeable="true" />
+      <property name="Red" cname="red" type="guint" readable="true" writeable="true" />
+      <property name="Green" cname="green" type="guint" readable="true" writeable="true" />
+      <property name="Blue" cname="blue" type="guint" readable="true" writeable="true" />
+      <property name="Alpha" cname="alpha" type="guint" readable="true" writeable="true" />
       <method name="GetD" cname="gnome_color_picker_get_d">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gdouble*" name="r"/>
-          <parameter type="gdouble*" name="g"/>
-          <parameter type="gdouble*" name="b"/>
-          <parameter type="gdouble*" name="a"/>
+          <parameter type="gdouble*" name="r" />
+          <parameter type="gdouble*" name="g" />
+          <parameter type="gdouble*" name="b" />
+          <parameter type="gdouble*" name="a" />
         </parameters>
       </method>
       <method name="GetDither" cname="gnome_color_picker_get_dither">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetI16" cname="gnome_color_picker_get_i16">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gushort*" name="r"/>
-          <parameter type="gushort*" name="g"/>
-          <parameter type="gushort*" name="b"/>
-          <parameter type="gushort*" name="a"/>
+          <parameter type="gushort*" name="r" />
+          <parameter type="gushort*" name="g" />
+          <parameter type="gushort*" name="b" />
+          <parameter type="gushort*" name="a" />
         </parameters>
       </method>
       <method name="GetI8" cname="gnome_color_picker_get_i8">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="guint8*" name="r"/>
-          <parameter type="guint8*" name="g"/>
-          <parameter type="guint8*" name="b"/>
-          <parameter type="guint8*" name="a"/>
+          <parameter type="guint8*" name="r" />
+          <parameter type="guint8*" name="g" />
+          <parameter type="guint8*" name="b" />
+          <parameter type="guint8*" name="a" />
         </parameters>
       </method>
       <method name="GetTitle" cname="gnome_color_picker_get_title">
-        <return-type type="const-char*"/>
+        <return-type type="const-char*" />
       </method>
       <method name="GetType" cname="gnome_color_picker_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="GetUseAlpha" cname="gnome_color_picker_get_use_alpha">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
-      <constructor cname="gnome_color_picker_new"/>
+      <constructor cname="gnome_color_picker_new" />
       <method name="SetD" cname="gnome_color_picker_set_d">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gdouble" name="r"/>
-          <parameter type="gdouble" name="g"/>
-          <parameter type="gdouble" name="b"/>
-          <parameter type="gdouble" name="a"/>
+          <parameter type="gdouble" name="r" />
+          <parameter type="gdouble" name="g" />
+          <parameter type="gdouble" name="b" />
+          <parameter type="gdouble" name="a" />
         </parameters>
       </method>
       <method name="SetDither" cname="gnome_color_picker_set_dither">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="dither"/>
+          <parameter type="gboolean" name="dither" />
         </parameters>
       </method>
       <method name="SetI16" cname="gnome_color_picker_set_i16">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gushort" name="r"/>
-          <parameter type="gushort" name="g"/>
-          <parameter type="gushort" name="b"/>
-          <parameter type="gushort" name="a"/>
+          <parameter type="gushort" name="r" />
+          <parameter type="gushort" name="g" />
+          <parameter type="gushort" name="b" />
+          <parameter type="gushort" name="a" />
         </parameters>
       </method>
       <method name="SetI8" cname="gnome_color_picker_set_i8">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="guint8" name="r"/>
-          <parameter type="guint8" name="g"/>
-          <parameter type="guint8" name="b"/>
-          <parameter type="guint8" name="a"/>
+          <parameter type="guint8" name="r" />
+          <parameter type="guint8" name="g" />
+          <parameter type="guint8" name="b" />
+          <parameter type="guint8" name="a" />
         </parameters>
       </method>
       <method name="SetTitle" cname="gnome_color_picker_set_title">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="title"/>
+          <parameter type="const-gchar*" name="title" />
         </parameters>
       </method>
       <method name="SetUseAlpha" cname="gnome_color_picker_set_use_alpha">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="use_alpha"/>
+          <parameter type="gboolean" name="use_alpha" />
         </parameters>
       </method>
     </object>
     <object name="DateEdit" cname="GnomeDateEdit" parent="GtkHBox">
-      <field cname="_priv" type="GnomeDateEditPrivate*"/>
-      <property name="Time" cname="time" type="ulong" readable="true" writeable="true"/>
-      <property name="DateeditFlags" cname="dateedit_flags" type="GnomeDateEditFlags" readable="true" writeable="true"/>
-      <property name="LowerHour" cname="lower_hour" type="gint" readable="true" writeable="true"/>
-      <property name="UpperHour" cname="upper_hour" type="gint" readable="true" writeable="true"/>
-      <property name="InitialTime" cname="initial_time" type="ulong" readable="true" writeable="true"/>
+      <field cname="_priv" type="GnomeDateEditPrivate*" />
+      <property name="Time" cname="time" type="ulong" readable="true" writeable="true" />
+      <property name="DateeditFlags" cname="dateedit_flags" type="GnomeDateEditFlags" readable="true" writeable="true" />
+      <property name="LowerHour" cname="lower_hour" type="gint" readable="true" writeable="true" />
+      <property name="UpperHour" cname="upper_hour" type="gint" readable="true" writeable="true" />
+      <property name="InitialTime" cname="initial_time" type="ulong" readable="true" writeable="true" />
       <signal name="TimeChanged" cname="time_changed" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeDateEdit*" name="gde"/>
+          <parameter type="GnomeDateEdit*" name="gde" />
         </parameters>
       </signal>
       <signal name="DateChanged" cname="date_changed" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeDateEdit*" name="gde"/>
+          <parameter type="GnomeDateEdit*" name="gde" />
         </parameters>
       </signal>
       <method name="Construct" cname="gnome_date_edit_construct">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="time_t" name="the_time"/>
-          <parameter type="GnomeDateEditFlags" name="flags"/>
+          <parameter type="time_t" name="the_time" />
+          <parameter type="GnomeDateEditFlags" name="flags" />
         </parameters>
       </method>
       <method name="GetFlags" cname="gnome_date_edit_get_flags">
-        <return-type type="int"/>
+        <return-type type="int" />
       </method>
       <method name="GetInitialTime" cname="gnome_date_edit_get_initial_time">
-        <return-type type="time_t"/>
+        <return-type type="time_t" />
       </method>
       <method name="GetTime" cname="gnome_date_edit_get_time">
-        <return-type type="time_t"/>
+        <return-type type="time_t" />
       </method>
       <method name="GetType" cname="gnome_date_edit_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <constructor cname="gnome_date_edit_new">
         <parameters>
-          <parameter type="time_t" name="the_time"/>
-          <parameter type="gboolean" name="show_time"/>
-          <parameter type="gboolean" name="use_24_format"/>
+          <parameter type="time_t" name="the_time" />
+          <parameter type="gboolean" name="show_time" />
+          <parameter type="gboolean" name="use_24_format" />
         </parameters>
       </constructor>
       <constructor cname="gnome_date_edit_new_flags">
         <parameters>
-          <parameter type="time_t" name="the_time"/>
-          <parameter type="GnomeDateEditFlags" name="flags"/>
+          <parameter type="time_t" name="the_time" />
+          <parameter type="GnomeDateEditFlags" name="flags" />
         </parameters>
       </constructor>
       <method name="SetFlags" cname="gnome_date_edit_set_flags">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeDateEditFlags" name="flags"/>
+          <parameter type="GnomeDateEditFlags" name="flags" />
         </parameters>
       </method>
       <method name="SetPopupRange" cname="gnome_date_edit_set_popup_range">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="int" name="low_hour"/>
-          <parameter type="int" name="up_hour"/>
+          <parameter type="int" name="low_hour" />
+          <parameter type="int" name="up_hour" />
         </parameters>
       </method>
       <method name="SetTime" cname="gnome_date_edit_set_time">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="time_t" name="the_time"/>
+          <parameter type="time_t" name="the_time" />
         </parameters>
       </method>
     </object>
     <object name="Druid" cname="GnomeDruid" parent="GtkContainer">
-      <field cname="help" type="GtkWidget*"/>
-      <field cname="back" type="GtkWidget*"/>
-      <field cname="next" type="GtkWidget*"/>
-      <field cname="cancel" type="GtkWidget*"/>
-      <field cname="finish" type="GtkWidget*"/>
-      <field cname="_priv" type="GnomeDruidPrivate*"/>
+      <field cname="help" type="GtkWidget*" />
+      <field cname="back" type="GtkWidget*" />
+      <field cname="next" type="GtkWidget*" />
+      <field cname="cancel" type="GtkWidget*" />
+      <field cname="finish" type="GtkWidget*" />
+      <field cname="_priv" type="GnomeDruidPrivate*" />
       <signal name="Cancel" cname="cancel" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeDruid*" name="druid"/>
+          <parameter type="GnomeDruid*" name="druid" />
         </parameters>
       </signal>
       <signal name="Help" cname="help" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeDruid*" name="druid"/>
+          <parameter type="GnomeDruid*" name="druid" />
         </parameters>
       </signal>
-      <property name="ShowFinish" cname="show_finish" type="gboolean" readable="true" writeable="true"/>
-      <property name="ShowHelp" cname="show_help" type="gboolean" readable="true" writeable="true"/>
+      <property name="ShowFinish" cname="show_finish" type="gboolean" readable="true" writeable="true" />
+      <property name="ShowHelp" cname="show_help" type="gboolean" readable="true" writeable="true" />
       <method name="AppendPage" cname="gnome_druid_append_page">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeDruidPage*" name="page"/>
+          <parameter type="GnomeDruidPage*" name="page" />
         </parameters>
       </method>
       <method name="ConstructWithWindow" cname="gnome_druid_construct_with_window">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-char*" name="title"/>
-          <parameter type="GtkWindow*" name="parent"/>
-          <parameter type="gboolean" name="close_on_cancel"/>
-          <parameter type="GtkWidget**" name="window"/>
+          <parameter type="const-char*" name="title" />
+          <parameter type="GtkWindow*" name="parent" />
+          <parameter type="gboolean" name="close_on_cancel" />
+          <parameter type="GtkWidget**" name="window" />
         </parameters>
       </method>
       <method name="GetType" cname="gnome_druid_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="InsertPage" cname="gnome_druid_insert_page">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeDruidPage*" name="back_page"/>
-          <parameter type="GnomeDruidPage*" name="page"/>
+          <parameter type="GnomeDruidPage*" name="back_page" />
+          <parameter type="GnomeDruidPage*" name="page" />
         </parameters>
       </method>
-      <constructor cname="gnome_druid_new"/>
+      <constructor cname="gnome_druid_new" />
       <constructor cname="gnome_druid_new_with_window">
         <parameters>
-          <parameter type="const-char*" name="title"/>
-          <parameter type="GtkWindow*" name="parent"/>
-          <parameter type="gboolean" name="close_on_cancel"/>
-          <parameter type="GtkWidget**" name="window"/>
+          <parameter type="const-char*" name="title" />
+          <parameter type="GtkWindow*" name="parent" />
+          <parameter type="gboolean" name="close_on_cancel" />
+          <parameter type="GtkWidget**" name="window" />
         </parameters>
       </constructor>
       <method name="PrependPage" cname="gnome_druid_prepend_page">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeDruidPage*" name="page"/>
+          <parameter type="GnomeDruidPage*" name="page" />
         </parameters>
       </method>
       <method name="SetButtonsSensitive" cname="gnome_druid_set_buttons_sensitive">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="back_sensitive"/>
-          <parameter type="gboolean" name="next_sensitive"/>
-          <parameter type="gboolean" name="cancel_sensitive"/>
-          <parameter type="gboolean" name="help_sensitive"/>
+          <parameter type="gboolean" name="back_sensitive" />
+          <parameter type="gboolean" name="next_sensitive" />
+          <parameter type="gboolean" name="cancel_sensitive" />
+          <parameter type="gboolean" name="help_sensitive" />
         </parameters>
       </method>
       <method name="SetPage" cname="gnome_druid_set_page">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeDruidPage*" name="page"/>
+          <parameter type="GnomeDruidPage*" name="page" />
         </parameters>
       </method>
       <method name="SetShowFinish" cname="gnome_druid_set_show_finish">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="show_finish"/>
+          <parameter type="gboolean" name="show_finish" />
         </parameters>
       </method>
       <method name="SetShowHelp" cname="gnome_druid_set_show_help">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="show_help"/>
+          <parameter type="gboolean" name="show_help" />
         </parameters>
       </method>
     </object>
     <object name="DruidPage" cname="GnomeDruidPage" parent="GtkBin">
-      <field cname="_priv" type="GnomeDruidPagePrivate*"/>
-      <signal name="NextClicked" cname="next" when="LAST">
-        <return-type type="gboolean"/>
+      <field cname="_priv" type="GnomeDruidPagePrivate*" />
+      <signal cname="next" when="LAST" name="NextClicked">
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GnomeDruidPage*" name="druid_page"/>
-          <parameter type="GtkWidget*" name="druid"/>
+          <parameter type="GnomeDruidPage*" name="druid_page" />
+          <parameter type="GtkWidget*" name="druid" />
         </parameters>
       </signal>
-      <signal name="Prepared" cname="prepare" when="LAST">
-        <return-type type="void"/>
+      <signal cname="prepare" when="LAST" name="Prepared">
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeDruidPage*" name="druid_page"/>
-          <parameter type="GtkWidget*" name="druid"/>
+          <parameter type="GnomeDruidPage*" name="druid_page" />
+          <parameter type="GtkWidget*" name="druid" />
         </parameters>
       </signal>
-      <signal name="BackClicked" cname="back" when="LAST">
-        <return-type type="gboolean"/>
+      <signal cname="back" when="LAST" name="BackClicked">
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GnomeDruidPage*" name="druid_page"/>
-          <parameter type="GtkWidget*" name="druid"/>
+          <parameter type="GnomeDruidPage*" name="druid_page" />
+          <parameter type="GtkWidget*" name="druid" />
         </parameters>
       </signal>
-      <signal name="FinishClicked" cname="finish" when="LAST">
-        <return-type type="void"/>
+      <signal cname="finish" when="LAST" name="FinishClicked">
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeDruidPage*" name="druid_page"/>
-          <parameter type="GtkWidget*" name="druid"/>
+          <parameter type="GnomeDruidPage*" name="druid_page" />
+          <parameter type="GtkWidget*" name="druid" />
         </parameters>
       </signal>
-      <signal name="CancelClicked" cname="cancel" when="LAST">
-        <return-type type="gboolean"/>
+      <signal cname="cancel" when="LAST" name="CancelClicked">
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GnomeDruidPage*" name="druid_page"/>
-          <parameter type="GtkWidget*" name="druid"/>
+          <parameter type="GnomeDruidPage*" name="druid_page" />
+          <parameter type="GtkWidget*" name="druid" />
         </parameters>
       </signal>
       <method name="Back" cname="gnome_druid_page_back">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="Cancel" cname="gnome_druid_page_cancel">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="Finish" cname="gnome_druid_page_finish">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="GetType" cname="gnome_druid_page_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
-      <constructor cname="gnome_druid_page_new"/>
+      <constructor cname="gnome_druid_page_new" />
       <method name="Next" cname="gnome_druid_page_next">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="Prepare" cname="gnome_druid_page_prepare">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
     </object>
     <object name="DruidPageEdge" cname="GnomeDruidPageEdge" parent="GnomeDruidPage">
-      <field cname="title" type="gchar*"/>
-      <field cname="text" type="gchar*"/>
-      <field cname="logo_image" type="GdkPixbuf*"/>
-      <field cname="watermark_image" type="GdkPixbuf*"/>
-      <field cname="top_watermark_image" type="GdkPixbuf*"/>
-      <field cname="background_color" type="GdkColor"/>
-      <field cname="textbox_color" type="GdkColor"/>
-      <field cname="logo_background_color" type="GdkColor"/>
-      <field cname="title_color" type="GdkColor"/>
-      <field cname="text_color" type="GdkColor"/>
-      <field cname="position" bits="2" type="GnomeEdgePosition"/>
-      <field cname="_priv" type="GnomeDruidPageEdgePrivate*"/>
+      <field cname="title" type="gchar*" />
+      <field cname="text" type="gchar*" />
+      <field cname="logo_image" type="GdkPixbuf*" />
+      <field cname="watermark_image" type="GdkPixbuf*" />
+      <field cname="top_watermark_image" type="GdkPixbuf*" />
+      <field cname="background_color" type="GdkColor" />
+      <field cname="textbox_color" type="GdkColor" />
+      <field cname="logo_background_color" type="GdkColor" />
+      <field cname="title_color" type="GdkColor" />
+      <field cname="text_color" type="GdkColor" />
+      <field cname="position" bits="2" type="GnomeEdgePosition" />
+      <field cname="_priv" type="GnomeDruidPageEdgePrivate*" />
       <method name="Construct" cname="gnome_druid_page_edge_construct">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeEdgePosition" name="position"/>
-          <parameter type="gboolean" name="antialiased"/>
-          <parameter type="const-gchar*" name="title"/>
-          <parameter type="const-gchar*" name="text"/>
-          <parameter type="GdkPixbuf*" name="logo"/>
-          <parameter type="GdkPixbuf*" name="watermark"/>
-          <parameter type="GdkPixbuf*" name="top_watermark"/>
+          <parameter type="GnomeEdgePosition" name="position" />
+          <parameter type="gboolean" name="antialiased" />
+          <parameter type="const-gchar*" name="title" />
+          <parameter type="const-gchar*" name="text" />
+          <parameter type="GdkPixbuf*" name="logo" />
+          <parameter type="GdkPixbuf*" name="watermark" />
+          <parameter type="GdkPixbuf*" name="top_watermark" />
         </parameters>
       </method>
       <method name="GetType" cname="gnome_druid_page_edge_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <constructor cname="gnome_druid_page_edge_new">
         <parameters>
-          <parameter type="GnomeEdgePosition" name="position"/>
+          <parameter type="GnomeEdgePosition" name="position" />
         </parameters>
       </constructor>
       <constructor cname="gnome_druid_page_edge_new_aa">
         <parameters>
-          <parameter type="GnomeEdgePosition" name="position"/>
+          <parameter type="GnomeEdgePosition" name="position" />
         </parameters>
       </constructor>
       <constructor cname="gnome_druid_page_edge_new_with_vals">
         <parameters>
-          <parameter type="GnomeEdgePosition" name="position"/>
-          <parameter type="gboolean" name="antialiased"/>
-          <parameter type="const-gchar*" name="title"/>
-          <parameter type="const-gchar*" name="text"/>
-          <parameter type="GdkPixbuf*" name="logo"/>
-          <parameter type="GdkPixbuf*" name="watermark"/>
-          <parameter type="GdkPixbuf*" name="top_watermark"/>
+          <parameter type="GnomeEdgePosition" name="position" />
+          <parameter type="gboolean" name="antialiased" />
+          <parameter type="const-gchar*" name="title" />
+          <parameter type="const-gchar*" name="text" />
+          <parameter type="GdkPixbuf*" name="logo" />
+          <parameter type="GdkPixbuf*" name="watermark" />
+          <parameter type="GdkPixbuf*" name="top_watermark" />
         </parameters>
       </constructor>
       <method name="SetBgColor" cname="gnome_druid_page_edge_set_bg_color">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkColor*" name="color"/>
+          <parameter type="GdkColor*" name="color" />
         </parameters>
       </method>
       <method name="SetLogo" cname="gnome_druid_page_edge_set_logo">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkPixbuf*" name="logo_image"/>
+          <parameter type="GdkPixbuf*" name="logo_image" />
         </parameters>
       </method>
       <method name="SetLogoBgColor" cname="gnome_druid_page_edge_set_logo_bg_color">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkColor*" name="color"/>
+          <parameter type="GdkColor*" name="color" />
         </parameters>
       </method>
       <method name="SetText" cname="gnome_druid_page_edge_set_text">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="text"/>
+          <parameter type="const-gchar*" name="text" />
         </parameters>
       </method>
       <method name="SetTextColor" cname="gnome_druid_page_edge_set_text_color">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkColor*" name="color"/>
+          <parameter type="GdkColor*" name="color" />
         </parameters>
       </method>
       <method name="SetTextboxColor" cname="gnome_druid_page_edge_set_textbox_color">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkColor*" name="color"/>
+          <parameter type="GdkColor*" name="color" />
         </parameters>
       </method>
       <method name="SetTitle" cname="gnome_druid_page_edge_set_title">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="title"/>
+          <parameter type="const-gchar*" name="title" />
         </parameters>
       </method>
       <method name="SetTitleColor" cname="gnome_druid_page_edge_set_title_color">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkColor*" name="color"/>
+          <parameter type="GdkColor*" name="color" />
         </parameters>
       </method>
       <method name="SetTopWatermark" cname="gnome_druid_page_edge_set_top_watermark">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkPixbuf*" name="top_watermark_image"/>
+          <parameter type="GdkPixbuf*" name="top_watermark_image" />
         </parameters>
       </method>
       <method name="SetWatermark" cname="gnome_druid_page_edge_set_watermark">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkPixbuf*" name="watermark"/>
+          <parameter type="GdkPixbuf*" name="watermark" />
         </parameters>
       </method>
     </object>
     <object name="DruidPageStandard" cname="GnomeDruidPageStandard" parent="GnomeDruidPage">
-      <field cname="vbox" type="GtkWidget*"/>
-      <field cname="title" type="gchar*"/>
-      <field cname="logo" type="GdkPixbuf*"/>
-      <field cname="top_watermark" type="GdkPixbuf*"/>
-      <field cname="title_foreground" type="GdkColor"/>
-      <field cname="background" type="GdkColor"/>
-      <field cname="logo_background" type="GdkColor"/>
-      <field cname="contents_background" type="GdkColor"/>
-      <field cname="_priv" type="GnomeDruidPageStandardPrivate*"/>
-      <property name="Title" cname="title" type="gchar*" readable="true" writeable="true"/>
-      <property name="Logo" cname="logo" type="GdkPixbuf" readable="true" writeable="true"/>
-      <property name="TopWatermark" cname="top_watermark" type="GdkPixbuf" readable="true" writeable="true"/>
-      <property name="TitleForeground" cname="title_foreground" type="gchar*" writeable="true"/>
-      <property name="TitleForegroundGdk" cname="title_foreground_gdk" type="GdkColor" readable="true" writeable="true"/>
-      <property name="TitleForegroundSet" cname="title_foreground_set" type="gboolean" readable="true" writeable="true"/>
-      <property name="Background" cname="background" type="gchar*" writeable="true"/>
-      <property name="BackgroundGdk" cname="background_gdk" type="GdkColor" readable="true" writeable="true"/>
-      <property name="BackgroundSet" cname="background_set" type="gboolean" readable="true" writeable="true"/>
-      <property name="LogoBackground" cname="logo_background" type="gchar*" writeable="true"/>
-      <property name="LogoBackgroundGdk" cname="logo_background_gdk" type="GdkColor" readable="true" writeable="true"/>
-      <property name="LogoBackgroundSet" cname="logo_background_set" type="gboolean" readable="true" writeable="true"/>
+      <field cname="vbox" type="GtkWidget*" />
+      <field cname="title" type="gchar*" />
+      <field cname="logo" type="GdkPixbuf*" />
+      <field cname="top_watermark" type="GdkPixbuf*" />
+      <field cname="title_foreground" type="GdkColor" />
+      <field cname="background" type="GdkColor" />
+      <field cname="logo_background" type="GdkColor" />
+      <field cname="contents_background" type="GdkColor" />
+      <field cname="_priv" type="GnomeDruidPageStandardPrivate*" />
+      <property name="Title" cname="title" type="gchar*" readable="true" writeable="true" />
+      <property name="Logo" cname="logo" type="GdkPixbuf" readable="true" writeable="true" />
+      <property name="TopWatermark" cname="top_watermark" type="GdkPixbuf" readable="true" writeable="true" />
+      <property name="TitleForeground" cname="title_foreground" type="gchar*" writeable="true" />
+      <property name="TitleForegroundGdk" cname="title_foreground_gdk" type="GdkColor" readable="true" writeable="true" />
+      <property name="TitleForegroundSet" cname="title_foreground_set" type="gboolean" readable="true" writeable="true" />
+      <property name="Background" cname="background" type="gchar*" writeable="true" />
+      <property name="BackgroundGdk" cname="background_gdk" type="GdkColor" readable="true" writeable="true" />
+      <property name="BackgroundSet" cname="background_set" type="gboolean" readable="true" writeable="true" />
+      <property name="LogoBackground" cname="logo_background" type="gchar*" writeable="true" />
+      <property name="LogoBackgroundGdk" cname="logo_background_gdk" type="GdkColor" readable="true" writeable="true" />
+      <property name="LogoBackgroundSet" cname="logo_background_set" type="gboolean" readable="true" writeable="true" />
       <method name="AppendItem" cname="gnome_druid_page_standard_append_item">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="question"/>
-          <parameter type="GtkWidget*" name="item"/>
-          <parameter type="const-gchar*" name="additional_info"/>
+          <parameter type="const-gchar*" name="question" />
+          <parameter type="GtkWidget*" name="item" />
+          <parameter type="const-gchar*" name="additional_info" />
         </parameters>
       </method>
       <method name="GetType" cname="gnome_druid_page_standard_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
-      <constructor cname="gnome_druid_page_standard_new"/>
+      <constructor cname="gnome_druid_page_standard_new" />
       <constructor cname="gnome_druid_page_standard_new_with_vals">
         <parameters>
-          <parameter type="const-gchar*" name="title"/>
-          <parameter type="GdkPixbuf*" name="logo"/>
-          <parameter type="GdkPixbuf*" name="top_watermark"/>
+          <parameter type="const-gchar*" name="title" />
+          <parameter type="GdkPixbuf*" name="logo" />
+          <parameter type="GdkPixbuf*" name="top_watermark" />
         </parameters>
       </constructor>
       <method name="SetBackground" cname="gnome_druid_page_standard_set_background">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkColor*" name="color"/>
+          <parameter type="GdkColor*" name="color" />
         </parameters>
       </method>
       <method name="SetContentsBackground" cname="gnome_druid_page_standard_set_contents_background">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkColor*" name="color"/>
+          <parameter type="GdkColor*" name="color" />
         </parameters>
       </method>
       <method name="SetLogo" cname="gnome_druid_page_standard_set_logo">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkPixbuf*" name="logo_image"/>
+          <parameter type="GdkPixbuf*" name="logo_image" />
         </parameters>
       </method>
       <method name="SetLogoBackground" cname="gnome_druid_page_standard_set_logo_background">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkColor*" name="color"/>
+          <parameter type="GdkColor*" name="color" />
         </parameters>
       </method>
       <method name="SetTitle" cname="gnome_druid_page_standard_set_title">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="title"/>
+          <parameter type="const-gchar*" name="title" />
         </parameters>
       </method>
       <method name="SetTitleForeground" cname="gnome_druid_page_standard_set_title_foreground">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkColor*" name="color"/>
+          <parameter type="GdkColor*" name="color" />
         </parameters>
       </method>
       <method name="SetTopWatermark" cname="gnome_druid_page_standard_set_top_watermark">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkPixbuf*" name="top_watermark_image"/>
+          <parameter type="GdkPixbuf*" name="top_watermark_image" />
         </parameters>
       </method>
     </object>
     <object name="Entry" cname="GnomeEntry" parent="GtkCombo">
-      <field cname="_priv" type="GnomeEntryPrivate*"/>
-      <signal name="Activated" cname="activate" when="LAST">
-        <return-type type="void"/>
+      <field cname="_priv" type="GnomeEntryPrivate*" />
+      <signal cname="activate" when="LAST" name="Activated">
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeEntry*" name="entry"/>
+          <parameter type="GnomeEntry*" name="entry" />
         </parameters>
       </signal>
-      <property name="HistoryId" cname="history_id" type="gchar*" readable="true" writeable="true"/>
-      <property name="GtkEntry" cname="gtk_entry" type="GtkEntry" readable="true"/>
+      <property name="HistoryId" cname="history_id" type="gchar*" readable="true" writeable="true" />
+      <property name="GtkEntry" cname="gtk_entry" type="GtkEntry" readable="true" />
       <implements>
-        <interface cname="GtkEditable"/>
+        <interface cname="GtkEditable" />
       </implements>
       <method name="AppendHistory" cname="gnome_entry_append_history">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="save"/>
-          <parameter type="const-gchar*" name="text"/>
+          <parameter type="gboolean" name="save" />
+          <parameter type="const-gchar*" name="text" />
         </parameters>
       </method>
       <method name="ClearHistory" cname="gnome_entry_clear_history">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="Construct" cname="gnome_entry_construct">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="history_id"/>
+          <parameter type="const-gchar*" name="history_id" />
         </parameters>
       </method>
       <method name="GetHistoryId" cname="gnome_entry_get_history_id">
-        <return-type type="const-gchar*"/>
+        <return-type type="const-gchar*" />
       </method>
       <method name="GetMaxSaved" cname="gnome_entry_get_max_saved">
-        <return-type type="guint"/>
+        <return-type type="guint" />
       </method>
       <method name="GetType" cname="gnome_entry_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
-      <method name="GetGtkEntry" cname="gnome_entry_gtk_entry">
-        <return-type type="GtkWidget*"/>
+      <method cname="gnome_entry_gtk_entry" name="GetGtkEntry">
+        <return-type type="GtkWidget*" />
       </method>
       <constructor cname="gnome_entry_new">
         <parameters>
-          <parameter type="const-gchar*" name="history_id"/>
+          <parameter type="const-gchar*" name="history_id" />
         </parameters>
       </constructor>
       <method name="PrependHistory" cname="gnome_entry_prepend_history">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="save"/>
-          <parameter type="const-gchar*" name="text"/>
+          <parameter type="gboolean" name="save" />
+          <parameter type="const-gchar*" name="text" />
         </parameters>
       </method>
       <method name="SetHistoryId" cname="gnome_entry_set_history_id">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="history_id"/>
+          <parameter type="const-gchar*" name="history_id" />
         </parameters>
       </method>
       <method name="SetMaxSaved" cname="gnome_entry_set_max_saved">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="guint" name="max_saved"/>
+          <parameter type="guint" name="max_saved" />
         </parameters>
       </method>
     </object>
     <object name="FileEntry" cname="GnomeFileEntry" parent="GtkVBox">
-      <field cname="fsw" type="GtkWidget*"/>
-      <field cname="default_path" type="char*"/>
-      <field cname="_priv" type="GnomeFileEntryPrivate*"/>
+      <field cname="fsw" type="GtkWidget*" />
+      <field cname="default_path" type="char*" />
+      <field cname="_priv" type="GnomeFileEntryPrivate*" />
       <signal name="BrowseClicked" cname="browse_clicked" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeFileEntry*" name="fentry"/>
+          <parameter type="GnomeFileEntry*" name="fentry" />
         </parameters>
       </signal>
-      <signal name="Activated" cname="activate" when="LAST">
-        <return-type type="void"/>
+      <signal cname="activate" when="LAST" name="Activated">
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeFileEntry*" name="fentry"/>
+          <parameter type="GnomeFileEntry*" name="fentry" />
         </parameters>
       </signal>
-      <property name="HistoryId" cname="history_id" type="gchar*" readable="true" writeable="true"/>
-      <property name="BrowseDialogTitle" cname="browse_dialog_title" type="gchar*" readable="true" writeable="true"/>
-      <property name="DirectoryEntry" cname="directory_entry" type="gboolean" readable="true" writeable="true"/>
-      <property name="Modal" cname="modal" type="gboolean" readable="true" writeable="true"/>
-      <property name="Filename" cname="filename" type="gchar*" readable="true" writeable="true"/>
-      <property name="DefaultPath" cname="default_path" type="gchar*" readable="true" writeable="true"/>
-      <property name="GnomeEntry" cname="gnome_entry" type="GnomeEntry" readable="true"/>
-      <property name="GtkEntry" cname="gtk_entry" type="GtkEntry" readable="true"/>
+      <property name="HistoryId" cname="history_id" type="gchar*" readable="true" writeable="true" />
+      <property name="BrowseDialogTitle" cname="browse_dialog_title" type="gchar*" readable="true" writeable="true" />
+      <property name="DirectoryEntry" cname="directory_entry" type="gboolean" readable="true" writeable="true" />
+      <property name="Modal" cname="modal" type="gboolean" readable="true" writeable="true" />
+      <property name="Filename" cname="filename" type="gchar*" readable="true" writeable="true" />
+      <property name="DefaultPath" cname="default_path" type="gchar*" readable="true" writeable="true" />
+      <property name="GnomeEntry" cname="gnome_entry" type="GnomeEntry" readable="true" />
+      <property name="GtkEntry" cname="gtk_entry" type="GtkEntry" readable="true" />
       <implements>
-        <interface cname="GtkEditable"/>
+        <interface cname="GtkEditable" />
       </implements>
       <method name="Construct" cname="gnome_file_entry_construct">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-char*" name="history_id"/>
-          <parameter type="const-char*" name="browse_dialog_title"/>
+          <parameter type="const-char*" name="history_id" />
+          <parameter type="const-char*" name="browse_dialog_title" />
         </parameters>
       </method>
       <method name="GetDirectoryEntry" cname="gnome_file_entry_get_directory_entry">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetFullPath" cname="gnome_file_entry_get_full_path">
-        <return-type type="char*"/>
+        <return-type type="char*" />
         <parameters>
-          <parameter type="gboolean" name="file_must_exist"/>
+          <parameter type="gboolean" name="file_must_exist" />
         </parameters>
       </method>
       <method name="GetModal" cname="gnome_file_entry_get_modal">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetType" cname="gnome_file_entry_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="GnomeEntry" cname="gnome_file_entry_gnome_entry" hidden="1">
-        <return-type type="GtkWidget*"/>
+        <return-type type="GtkWidget*" />
       </method>
       <method name="GtkEntry" cname="gnome_file_entry_gtk_entry" hidden="1">
-        <return-type type="GtkWidget*"/>
+        <return-type type="GtkWidget*" />
       </method>
       <constructor cname="gnome_file_entry_new">
         <parameters>
-          <parameter type="const-char*" name="history_id"/>
-          <parameter type="const-char*" name="browse_dialog_title"/>
+          <parameter type="const-char*" name="history_id" />
+          <parameter type="const-char*" name="browse_dialog_title" />
         </parameters>
       </constructor>
       <method name="SetDefaultPath" cname="gnome_file_entry_set_default_path">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-char*" name="path"/>
+          <parameter type="const-char*" name="path" />
         </parameters>
       </method>
       <method name="SetDirectoryEntry" cname="gnome_file_entry_set_directory_entry">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="directory_entry"/>
+          <parameter type="gboolean" name="directory_entry" />
         </parameters>
       </method>
       <method name="SetFilename" cname="gnome_file_entry_set_filename">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-char*" name="filename"/>
+          <parameter type="const-char*" name="filename" />
         </parameters>
       </method>
       <method name="SetModal" cname="gnome_file_entry_set_modal">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="is_modal"/>
+          <parameter type="gboolean" name="is_modal" />
         </parameters>
       </method>
       <method name="SetTitle" cname="gnome_file_entry_set_title">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-char*" name="browse_dialog_title"/>
+          <parameter type="const-char*" name="browse_dialog_title" />
         </parameters>
       </method>
     </object>
     <object name="FontPicker" cname="GnomeFontPicker" parent="GtkButton">
-      <field cname="_priv" type="GnomeFontPickerPrivate*"/>
-      <property name="Title" cname="title" type="gchar*" readable="true" writeable="true"/>
-      <property name="Mode" cname="mode" type="GnomeFontPickerMode" readable="true" writeable="true"/>
-      <property name="FontName" cname="font_name" type="gchar*" readable="true" writeable="true"/>
-      <property name="Font" cname="font" type="gpointer" readable="true"/>
-      <property name="PreviewText" cname="preview_text" type="gchar*" readable="true" writeable="true"/>
-      <property name="UseFontInLabel" cname="use-font-in-label" type="gboolean" readable="true" writeable="true"/>
-      <property name="LabelFontSize" cname="label-font-size" type="gint" readable="true" writeable="true"/>
-      <property name="ShowSize" cname="show-size" type="gboolean" readable="true" writeable="true"/>
+      <field cname="_priv" type="GnomeFontPickerPrivate*" />
+      <property name="Title" cname="title" type="gchar*" readable="true" writeable="true" />
+      <property name="Mode" cname="mode" type="GnomeFontPickerMode" readable="true" writeable="true" />
+      <property name="FontName" cname="font_name" type="gchar*" readable="true" writeable="true" />
+      <property name="Font" cname="font" type="gpointer" readable="true" />
+      <property name="PreviewText" cname="preview_text" type="gchar*" readable="true" writeable="true" />
+      <property name="UseFontInLabel" cname="use-font-in-label" type="gboolean" readable="true" writeable="true" />
+      <property name="LabelFontSize" cname="label-font-size" type="gint" readable="true" writeable="true" />
+      <property name="ShowSize" cname="show-size" type="gboolean" readable="true" writeable="true" />
       <signal name="FontSet" cname="font_set" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeFontPicker*" name="gfp"/>
-          <parameter type="const-gchar*" name="font_name"/>
+          <parameter type="GnomeFontPicker*" name="gfp" />
+          <parameter type="const-gchar*" name="font_name" />
         </parameters>
       </signal>
       <method name="FiSetShowSize" cname="gnome_font_picker_fi_set_show_size">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="show_size"/>
+          <parameter type="gboolean" name="show_size" />
         </parameters>
       </method>
       <method name="FiSetUseFontInLabel" cname="gnome_font_picker_fi_set_use_font_in_label">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="use_font_in_label"/>
-          <parameter type="gint" name="size"/>
+          <parameter type="gboolean" name="use_font_in_label" />
+          <parameter type="gint" name="size" />
         </parameters>
       </method>
       <method name="GetFontName" cname="gnome_font_picker_get_font_name">
-        <return-type type="const-gchar*"/>
+        <return-type type="const-gchar*" />
       </method>
       <method name="GetMode" cname="gnome_font_picker_get_mode">
-        <return-type type="GnomeFontPickerMode"/>
+        <return-type type="GnomeFontPickerMode" />
       </method>
       <method name="GetPreviewText" cname="gnome_font_picker_get_preview_text">
-        <return-type type="const-gchar*"/>
+        <return-type type="const-gchar*" />
       </method>
       <method name="GetTitle" cname="gnome_font_picker_get_title">
-        <return-type type="const-gchar*"/>
+        <return-type type="const-gchar*" />
       </method>
       <method name="GetType" cname="gnome_font_picker_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
-      <constructor cname="gnome_font_picker_new"/>
+      <constructor cname="gnome_font_picker_new" />
       <method name="SetFontName" cname="gnome_font_picker_set_font_name">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="const-gchar*" name="fontname"/>
+          <parameter type="const-gchar*" name="fontname" />
         </parameters>
       </method>
       <method name="SetMode" cname="gnome_font_picker_set_mode">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeFontPickerMode" name="mode"/>
+          <parameter type="GnomeFontPickerMode" name="mode" />
         </parameters>
       </method>
       <method name="SetPreviewText" cname="gnome_font_picker_set_preview_text">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="text"/>
+          <parameter type="const-gchar*" name="text" />
         </parameters>
       </method>
       <method name="SetTitle" cname="gnome_font_picker_set_title">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="title"/>
+          <parameter type="const-gchar*" name="title" />
         </parameters>
       </method>
       <method name="UwGetWidget" cname="gnome_font_picker_uw_get_widget">
-        <return-type type="GtkWidget*"/>
+        <return-type type="GtkWidget*" />
       </method>
       <method name="UwSetWidget" cname="gnome_font_picker_uw_set_widget">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
+          <parameter type="GtkWidget*" name="widget" />
         </parameters>
       </method>
     </object>
     <object name="HRef" cname="GnomeHRef" parent="GtkButton">
-      <field cname="_priv" type="GnomeHRefPrivate*"/>
-      <property name="Url" cname="url" type="gchar*" readable="true" writeable="true"/>
-      <property name="Text" cname="text" type="gchar*" readable="true" writeable="true"/>
+      <field cname="_priv" type="GnomeHRefPrivate*" />
+      <property name="Url" cname="url" type="gchar*" readable="true" writeable="true" />
+      <property name="Text" cname="text" type="gchar*" readable="true" writeable="true" />
       <method name="Construct" cname="gnome_href_construct">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="url"/>
-          <parameter type="const-gchar*" name="text"/>
+          <parameter type="const-gchar*" name="url" />
+          <parameter type="const-gchar*" name="text" />
         </parameters>
       </method>
       <method name="GetText" cname="gnome_href_get_text">
-        <return-type type="const-gchar*"/>
+        <return-type type="const-gchar*" />
       </method>
       <method name="GetType" cname="gnome_href_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="GetUrl" cname="gnome_href_get_url">
-        <return-type type="const-gchar*"/>
+        <return-type type="const-gchar*" />
       </method>
       <constructor cname="gnome_href_new">
         <parameters>
-          <parameter type="const-gchar*" name="url"/>
-          <parameter type="const-gchar*" name="text"/>
+          <parameter type="const-gchar*" name="url" />
+          <parameter type="const-gchar*" name="text" />
         </parameters>
       </constructor>
       <method name="SetText" cname="gnome_href_set_text">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="text"/>
+          <parameter type="const-gchar*" name="text" />
         </parameters>
       </method>
       <method name="SetUrl" cname="gnome_href_set_url">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="url"/>
+          <parameter type="const-gchar*" name="url" />
         </parameters>
       </method>
     </object>
     <object name="IconEntry" cname="GnomeIconEntry" parent="GtkVBox">
-      <field cname="_priv" type="GnomeIconEntryPrivate*"/>
+      <field cname="_priv" type="GnomeIconEntryPrivate*" />
       <signal name="Changed" cname="changed" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeIconEntry*" name="ientry"/>
+          <parameter type="GnomeIconEntry*" name="ientry" />
         </parameters>
       </signal>
       <signal name="Browse" cname="browse" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeIconEntry*" name="ientry"/>
+          <parameter type="GnomeIconEntry*" name="ientry" />
         </parameters>
       </signal>
-      <property name="HistoryId" cname="history_id" type="gchar*" readable="true" writeable="true"/>
-      <property name="BrowseDialogTitle" cname="browse_dialog_title" type="gchar*" readable="true" writeable="true"/>
-      <property name="PixmapSubdir" cname="pixmap_subdir" type="gchar*" readable="true" writeable="true"/>
-      <property name="Filename" cname="filename" type="gchar*" readable="true" writeable="true"/>
-      <property name="PickDialog" cname="pick_dialog" type="GtkDialog" readable="true"/>
+      <property name="HistoryId" cname="history_id" type="gchar*" readable="true" writeable="true" />
+      <property name="BrowseDialogTitle" cname="browse_dialog_title" type="gchar*" readable="true" writeable="true" />
+      <property name="PixmapSubdir" cname="pixmap_subdir" type="gchar*" readable="true" writeable="true" />
+      <property name="Filename" cname="filename" type="gchar*" readable="true" writeable="true" />
+      <property name="PickDialog" cname="pick_dialog" type="GtkDialog" readable="true" />
       <method name="Construct" cname="gnome_icon_entry_construct">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="history_id"/>
-          <parameter type="const-gchar*" name="browse_dialog_title"/>
+          <parameter type="const-gchar*" name="history_id" />
+          <parameter type="const-gchar*" name="browse_dialog_title" />
         </parameters>
       </method>
       <method name="GetFilename" cname="gnome_icon_entry_get_filename">
-        <return-type type="gchar*"/>
+        <return-type type="gchar*" />
       </method>
       <method name="GetType" cname="gnome_icon_entry_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="GnomeEntry" cname="gnome_icon_entry_gnome_entry">
-        <return-type type="GtkWidget*"/>
+        <return-type type="GtkWidget*" />
       </method>
       <method name="GnomeFileEntry" cname="gnome_icon_entry_gnome_file_entry">
-        <return-type type="GtkWidget*"/>
+        <return-type type="GtkWidget*" />
       </method>
       <method name="GtkEntry" cname="gnome_icon_entry_gtk_entry">
-        <return-type type="GtkWidget*"/>
+        <return-type type="GtkWidget*" />
       </method>
       <constructor cname="gnome_icon_entry_new">
         <parameters>
-          <parameter type="const-gchar*" name="history_id"/>
-          <parameter type="const-gchar*" name="browse_dialog_title"/>
+          <parameter type="const-gchar*" name="history_id" />
+          <parameter type="const-gchar*" name="browse_dialog_title" />
         </parameters>
       </constructor>
       <method name="PickDialog" cname="gnome_icon_entry_pick_dialog" hidden="1">
-        <return-type type="GtkWidget*"/>
+        <return-type type="GtkWidget*" />
       </method>
       <method name="SetBrowseDialogTitle" cname="gnome_icon_entry_set_browse_dialog_title">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="browse_dialog_title"/>
+          <parameter type="const-gchar*" name="browse_dialog_title" />
         </parameters>
       </method>
       <method name="SetFilename" cname="gnome_icon_entry_set_filename">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="const-gchar*" name="filename"/>
+          <parameter type="const-gchar*" name="filename" />
         </parameters>
       </method>
       <method name="SetHistoryId" cname="gnome_icon_entry_set_history_id">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="history_id"/>
+          <parameter type="const-gchar*" name="history_id" />
         </parameters>
       </method>
       <method name="SetIcon" cname="gnome_icon_entry_set_icon">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="filename"/>
+          <parameter type="const-gchar*" name="filename" />
         </parameters>
       </method>
       <method name="SetPixmapSubdir" cname="gnome_icon_entry_set_pixmap_subdir">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="subdir"/>
+          <parameter type="const-gchar*" name="subdir" />
         </parameters>
       </method>
     </object>
     <object name="IconList" cname="GnomeIconList" parent="GnomeCanvas">
-      <field cname="adj" type="GtkAdjustment*"/>
-      <field cname="hadj" type="GtkAdjustment*"/>
-      <field cname="_priv" type="GnomeIconListPrivate*"/>
-      <signal name="IconSelected" cname="select_icon" when="FIRST">
-        <return-type type="void"/>
+      <field cname="adj" type="GtkAdjustment*" />
+      <field cname="hadj" type="GtkAdjustment*" />
+      <field cname="_priv" type="GnomeIconListPrivate*" />
+      <signal cname="select_icon" when="FIRST" name="IconSelected">
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeIconList*" name="gil"/>
-          <parameter type="gint" name="num"/>
-          <parameter type="GdkEvent*" name="event"/>
+          <parameter type="GnomeIconList*" name="gil" />
+          <parameter type="gint" name="num" />
+          <parameter type="GdkEvent*" name="event" />
         </parameters>
       </signal>
-      <signal name="IconUnselected" cname="unselect_icon" when="FIRST">
-        <return-type type="void"/>
+      <signal cname="unselect_icon" when="FIRST" name="IconUnselected">
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeIconList*" name="gil"/>
-          <parameter type="gint" name="num"/>
-          <parameter type="GdkEvent*" name="event"/>
+          <parameter type="GnomeIconList*" name="gil" />
+          <parameter type="gint" name="num" />
+          <parameter type="GdkEvent*" name="event" />
         </parameters>
       </signal>
-      <signal name="IconFocused" cname="focus_icon" when="FIRST">
-        <return-type type="void"/>
+      <signal cname="focus_icon" when="FIRST" name="IconFocused">
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeIconList*" name="gil"/>
-          <parameter type="gint" name="num"/>
+          <parameter type="GnomeIconList*" name="gil" />
+          <parameter type="gint" name="num" />
         </parameters>
       </signal>
       <signal name="TextChanged" cname="text_changed" when="LAST">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GnomeIconList*" name="gil"/>
-          <parameter type="gint" name="num"/>
-          <parameter type="const-char*" name="new_text"/>
+          <parameter type="GnomeIconList*" name="gil" />
+          <parameter type="gint" name="num" />
+          <parameter type="const-char*" name="new_text" />
         </parameters>
       </signal>
       <signal name="MoveCursor" cname="move_cursor" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeIconList*" name="gil"/>
-          <parameter type="GtkDirectionType" name="dir"/>
-          <parameter type="gboolean" name="clear_selection"/>
+          <parameter type="GnomeIconList*" name="gil" />
+          <parameter type="GtkDirectionType" name="dir" />
+          <parameter type="gboolean" name="clear_selection" />
         </parameters>
       </signal>
       <signal name="ToggleCursorSelection" cname="toggle_cursor_selection" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeIconList*" name="gil"/>
+          <parameter type="GnomeIconList*" name="gil" />
         </parameters>
       </signal>
       <method name="Append" cname="gnome_icon_list_append">
-        <return-type type="int"/>
+        <return-type type="int" />
         <parameters>
-          <parameter type="const-char*" name="icon_filename"/>
-          <parameter type="const-char*" name="text"/>
+          <parameter type="const-char*" name="icon_filename" />
+          <parameter type="const-char*" name="text" />
         </parameters>
       </method>
       <method name="AppendPixbuf" cname="gnome_icon_list_append_pixbuf">
-        <return-type type="int"/>
+        <return-type type="int" />
         <parameters>
-          <parameter type="GdkPixbuf*" name="im"/>
-          <parameter type="const-char*" name="icon_filename"/>
-          <parameter type="const-char*" name="text"/>
+          <parameter type="GdkPixbuf*" name="im" />
+          <parameter type="const-char*" name="icon_filename" />
+          <parameter type="const-char*" name="text" />
         </parameters>
       </method>
       <method name="Clear" cname="gnome_icon_list_clear">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="Construct" cname="gnome_icon_list_construct">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="guint" name="icon_width"/>
-          <parameter type="GtkAdjustment*" name="adj"/>
-          <parameter type="int" name="flags"/>
+          <parameter type="guint" name="icon_width" />
+          <parameter type="GtkAdjustment*" name="adj" />
+          <parameter type="int" name="flags" />
         </parameters>
       </method>
       <method name="FindIconFromData" cname="gnome_icon_list_find_icon_from_data">
-        <return-type type="int"/>
+        <return-type type="int" />
         <parameters>
-          <parameter type="gpointer" name="data"/>
+          <parameter type="gpointer" name="data" />
         </parameters>
       </method>
       <method name="FindIconFromFilename" cname="gnome_icon_list_find_icon_from_filename">
-        <return-type type="int"/>
+        <return-type type="int" />
         <parameters>
-          <parameter type="const-char*" name="filename"/>
+          <parameter type="const-char*" name="filename" />
         </parameters>
       </method>
       <method name="FocusIcon" cname="gnome_icon_list_focus_icon">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="idx"/>
+          <parameter type="gint" name="idx" />
         </parameters>
       </method>
       <method name="Freeze" cname="gnome_icon_list_freeze">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="GetIconAt" cname="gnome_icon_list_get_icon_at">
-        <return-type type="int"/>
+        <return-type type="int" />
         <parameters>
-          <parameter type="int" name="x"/>
-          <parameter type="int" name="y"/>
+          <parameter type="int" name="x" />
+          <parameter type="int" name="y" />
         </parameters>
       </method>
       <method name="GetIconData" cname="gnome_icon_list_get_icon_data">
-        <return-type type="gpointer"/>
+        <return-type type="gpointer" />
         <parameters>
-          <parameter type="int" name="pos"/>
+          <parameter type="int" name="pos" />
         </parameters>
       </method>
       <method name="GetIconFilename" cname="gnome_icon_list_get_icon_filename">
-        <return-type type="gchar*"/>
+        <return-type type="gchar*" />
         <parameters>
-          <parameter type="int" name="idx"/>
+          <parameter type="int" name="idx" />
         </parameters>
       </method>
       <method name="GetIconPixbufItem" cname="gnome_icon_list_get_icon_pixbuf_item">
-        <return-type type="GnomeCanvasPixbuf*"/>
+        <return-type type="GnomeCanvasPixbuf*" />
         <parameters>
-          <parameter type="int" name="idx"/>
+          <parameter type="int" name="idx" />
         </parameters>
       </method>
       <method name="GetIconTextItem" cname="gnome_icon_list_get_icon_text_item">
-        <return-type type="GnomeIconTextItem*"/>
+        <return-type type="GnomeIconTextItem*" />
         <parameters>
-          <parameter type="int" name="idx"/>
+          <parameter type="int" name="idx" />
         </parameters>
       </method>
       <method name="GetItemsPerLine" cname="gnome_icon_list_get_items_per_line">
-        <return-type type="int"/>
+        <return-type type="int" />
       </method>
       <method name="GetNumIcons" cname="gnome_icon_list_get_num_icons">
-        <return-type type="guint"/>
+        <return-type type="guint" />
       </method>
       <method name="GetSelection" cname="gnome_icon_list_get_selection">
-        <return-type type="GList*" element_type="int"/>
+        <return-type type="GList*" element_type="int" />
       </method>
       <method name="GetSelectionMode" cname="gnome_icon_list_get_selection_mode">
-        <return-type type="GtkSelectionMode"/>
+        <return-type type="GtkSelectionMode" />
       </method>
       <method name="GetType" cname="gnome_icon_list_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="IconIsVisible" cname="gnome_icon_list_icon_is_visible">
-        <return-type type="GtkVisibility"/>
+        <return-type type="GtkVisibility" />
         <parameters>
-          <parameter type="int" name="pos"/>
+          <parameter type="int" name="pos" />
         </parameters>
       </method>
       <method name="Insert" cname="gnome_icon_list_insert">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="int" name="pos"/>
-          <parameter type="const-char*" name="icon_filename"/>
-          <parameter type="const-char*" name="text"/>
+          <parameter type="int" name="pos" />
+          <parameter type="const-char*" name="icon_filename" />
+          <parameter type="const-char*" name="text" />
         </parameters>
       </method>
       <method name="InsertPixbuf" cname="gnome_icon_list_insert_pixbuf">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="int" name="pos"/>
-          <parameter type="GdkPixbuf*" name="im"/>
-          <parameter type="const-char*" name="icon_filename"/>
-          <parameter type="const-char*" name="text"/>
+          <parameter type="int" name="pos" />
+          <parameter type="GdkPixbuf*" name="im" />
+          <parameter type="const-char*" name="icon_filename" />
+          <parameter type="const-char*" name="text" />
         </parameters>
       </method>
       <method name="Moveto" cname="gnome_icon_list_moveto">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="int" name="pos"/>
-          <parameter type="double" name="yalign"/>
+          <parameter type="int" name="pos" />
+          <parameter type="double" name="yalign" />
         </parameters>
       </method>
       <constructor cname="gnome_icon_list_new">
         <parameters>
-          <parameter type="guint" name="icon_width"/>
-          <parameter type="GtkAdjustment*" name="adj" null_ok="1"/>
-          <parameter type="int" name="flags"/>
+          <parameter type="guint" name="icon_width" />
+          <parameter type="GtkAdjustment*" name="adj" null_ok="1" />
+          <parameter type="int" name="flags" />
         </parameters>
       </constructor>
       <method name="Remove" cname="gnome_icon_list_remove">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="int" name="pos"/>
+          <parameter type="int" name="pos" />
         </parameters>
       </method>
       <method name="SelectIcon" cname="gnome_icon_list_select_icon">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="int" name="pos"/>
+          <parameter type="int" name="pos" />
         </parameters>
       </method>
       <method name="SetColSpacing" cname="gnome_icon_list_set_col_spacing">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="int" name="pixels"/>
+          <parameter type="int" name="pixels" />
         </parameters>
       </method>
       <method name="SetHadjustment" cname="gnome_icon_list_set_hadjustment">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkAdjustment*" name="hadj"/>
+          <parameter type="GtkAdjustment*" name="hadj" null_ok="1" />
         </parameters>
       </method>
       <method name="SetIconBorder" cname="gnome_icon_list_set_icon_border">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="int" name="pixels"/>
+          <parameter type="int" name="pixels" />
         </parameters>
       </method>
       <method name="SetIconData" cname="gnome_icon_list_set_icon_data">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="int" name="idx"/>
-          <parameter type="gpointer" name="data"/>
+          <parameter type="int" name="idx" />
+          <parameter type="gpointer" name="data" />
         </parameters>
       </method>
       <method name="SetIconDataFull" cname="gnome_icon_list_set_icon_data_full">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="int" name="pos"/>
-          <parameter type="gpointer" name="data"/>
-          <parameter type="GDestroyNotify" name="destroy"/>
+          <parameter type="int" name="pos" />
+          <parameter type="gpointer" name="data" />
+          <parameter type="GDestroyNotify" name="destroy" />
         </parameters>
       </method>
       <method name="SetIconWidth" cname="gnome_icon_list_set_icon_width">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="int" name="w"/>
+          <parameter type="int" name="w" />
         </parameters>
       </method>
       <method name="SetRowSpacing" cname="gnome_icon_list_set_row_spacing">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="int" name="pixels"/>
+          <parameter type="int" name="pixels" />
         </parameters>
       </method>
       <method name="SetSelectionMode" cname="gnome_icon_list_set_selection_mode">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkSelectionMode" name="mode"/>
+          <parameter type="GtkSelectionMode" name="mode" />
         </parameters>
       </method>
       <method name="SetSeparators" cname="gnome_icon_list_set_separators">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-char*" name="sep"/>
+          <parameter type="const-char*" name="sep" />
         </parameters>
       </method>
       <method name="SetTextSpacing" cname="gnome_icon_list_set_text_spacing">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="int" name="pixels"/>
+          <parameter type="int" name="pixels" />
         </parameters>
       </method>
       <method name="SetVadjustment" cname="gnome_icon_list_set_vadjustment">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkAdjustment*" name="vadj"/>
+          <parameter type="GtkAdjustment*" name="vadj" null_ok="1" />
         </parameters>
       </method>
       <method name="Thaw" cname="gnome_icon_list_thaw">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="UnselectAll" cname="gnome_icon_list_unselect_all">
-        <return-type type="int"/>
+        <return-type type="int" />
       </method>
       <method name="UnselectIcon" cname="gnome_icon_list_unselect_icon">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="int" name="pos"/>
+          <parameter type="int" name="pos" />
         </parameters>
       </method>
     </object>
     <object name="IconSelection" cname="GnomeIconSelection" parent="GtkVBox">
-      <field cname="_priv" type="GnomeIconSelectionPrivate*"/>
+      <field cname="_priv" type="GnomeIconSelectionPrivate*" />
       <method name="AddDefaults" cname="gnome_icon_selection_add_defaults">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="AddDirectory" cname="gnome_icon_selection_add_directory">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="dir"/>
+          <parameter type="const-gchar*" name="dir" />
         </parameters>
       </method>
       <method name="Clear" cname="gnome_icon_selection_clear">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="not_shown"/>
+          <parameter type="gboolean" name="not_shown" />
         </parameters>
       </method>
       <method name="GetBox" cname="gnome_icon_selection_get_box">
-        <return-type type="GtkWidget*"/>
+        <return-type type="GtkWidget*" />
       </method>
       <method name="GetGil" cname="gnome_icon_selection_get_gil">
-        <return-type type="GtkWidget*"/>
+        <return-type type="GtkWidget*" />
       </method>
       <method name="GetIcon" cname="gnome_icon_selection_get_icon">
-        <return-type type="gchar*"/>
+        <return-type type="gchar*" />
         <parameters>
-          <parameter type="gboolean" name="full_path"/>
+          <parameter type="gboolean" name="full_path" />
         </parameters>
       </method>
       <method name="GetType" cname="gnome_icon_selection_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
-      <constructor cname="gnome_icon_selection_new"/>
+      <constructor cname="gnome_icon_selection_new" />
       <method name="SelectIcon" cname="gnome_icon_selection_select_icon">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="filename"/>
+          <parameter type="const-gchar*" name="filename" />
         </parameters>
       </method>
       <method name="ShowIcons" cname="gnome_icon_selection_show_icons">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="StopLoading" cname="gnome_icon_selection_stop_loading">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
     </object>
     <object name="IconTextItem" cname="GnomeIconTextItem" parent="GnomeCanvasItem">
-      <field cname="x" type="int"/>
-      <field cname="y" type="int"/>
-      <field cname="width" type="int"/>
-      <field cname="fontname" type="char*"/>
-      <field cname="text" type="char*"/>
-      <field cname="editing" bits="1" type="unsigned"/>
-      <field cname="selected" bits="1" type="unsigned"/>
-      <field cname="focused" bits="1" type="unsigned"/>
-      <field cname="is_editable" bits="1" type="unsigned"/>
-      <field cname="is_text_allocated" bits="1" type="unsigned"/>
-      <field cname="_priv" type="GnomeIconTextItemPrivate*"/>
+      <field cname="x" type="int" />
+      <field cname="y" type="int" />
+      <field cname="width" type="int" />
+      <field cname="fontname" type="char*" />
+      <field cname="text" type="char*" />
+      <field cname="editing" bits="1" type="unsigned" />
+      <field cname="selected" bits="1" type="unsigned" />
+      <field cname="focused" bits="1" type="unsigned" />
+      <field cname="is_editable" bits="1" type="unsigned" />
+      <field cname="is_text_allocated" bits="1" type="unsigned" />
+      <field cname="_priv" type="GnomeIconTextItemPrivate*" />
       <signal name="TextChanged" cname="text_changed" when="LAST">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GnomeIconTextItem*" name="iti"/>
+          <parameter type="GnomeIconTextItem*" name="iti" />
         </parameters>
       </signal>
       <signal name="HeightChanged" cname="height_changed" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeIconTextItem*" name="iti"/>
+          <parameter type="GnomeIconTextItem*" name="iti" />
         </parameters>
       </signal>
       <signal name="WidthChanged" cname="width_changed" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeIconTextItem*" name="iti"/>
+          <parameter type="GnomeIconTextItem*" name="iti" />
         </parameters>
       </signal>
       <signal name="EditingStarted" cname="editing_started" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeIconTextItem*" name="iti"/>
+          <parameter type="GnomeIconTextItem*" name="iti" />
         </parameters>
       </signal>
       <signal name="EditingStopped" cname="editing_stopped" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeIconTextItem*" name="iti"/>
+          <parameter type="GnomeIconTextItem*" name="iti" />
         </parameters>
       </signal>
       <signal name="SelectionStarted" cname="selection_started" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeIconTextItem*" name="iti"/>
+          <parameter type="GnomeIconTextItem*" name="iti" />
         </parameters>
       </signal>
       <signal name="SelectionStopped" cname="selection_stopped" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeIconTextItem*" name="iti"/>
+          <parameter type="GnomeIconTextItem*" name="iti" />
         </parameters>
       </signal>
       <method name="Configure" cname="gnome_icon_text_item_configure">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="int" name="x"/>
-          <parameter type="int" name="y"/>
-          <parameter type="int" name="width"/>
-          <parameter type="const-char*" name="fontname"/>
-          <parameter type="const-char*" name="text"/>
-          <parameter type="gboolean" name="is_editable"/>
-          <parameter type="gboolean" name="is_static"/>
+          <parameter type="int" name="x" />
+          <parameter type="int" name="y" />
+          <parameter type="int" name="width" />
+          <parameter type="const-char*" name="fontname" />
+          <parameter type="const-char*" name="text" />
+          <parameter type="gboolean" name="is_editable" />
+          <parameter type="gboolean" name="is_static" />
         </parameters>
       </method>
       <method name="Focus" cname="gnome_icon_text_item_focus">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="focused"/>
+          <parameter type="gboolean" name="focused" />
         </parameters>
       </method>
       <method name="GetEditable" cname="gnome_icon_text_item_get_editable">
-        <return-type type="GtkEditable*"/>
+        <return-type type="GtkEditable*" />
       </method>
       <method name="GetText" cname="gnome_icon_text_item_get_text">
-        <return-type type="const-char*"/>
+        <return-type type="const-char*" />
       </method>
       <method name="GetType" cname="gnome_icon_text_item_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="Select" cname="gnome_icon_text_item_select">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="sel"/>
+          <parameter type="gboolean" name="sel" />
         </parameters>
       </method>
       <method name="Setxy" cname="gnome_icon_text_item_setxy">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="int" name="x"/>
-          <parameter type="int" name="y"/>
+          <parameter type="int" name="x" />
+          <parameter type="int" name="y" />
         </parameters>
       </method>
       <method name="StartEditing" cname="gnome_icon_text_item_start_editing">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="StopEditing" cname="gnome_icon_text_item_stop_editing">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="accept"/>
+          <parameter type="gboolean" name="accept" />
         </parameters>
       </method>
     </object>
     <object name="IconTheme" cname="GnomeIconTheme" parent="GObject">
-      <field cname="priv" type="GnomeIconThemePrivate*"/>
+      <field cname="priv" type="GnomeIconThemePrivate*" />
       <signal name="Changed" cname="changed" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeIconTheme*" name="icon_theme"/>
+          <parameter type="GnomeIconTheme*" name="icon_theme" />
         </parameters>
       </signal>
       <method name="AppendSearchPath" cname="gnome_icon_theme_append_search_path">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-char*" name="path"/>
+          <parameter type="const-char*" name="path" />
         </parameters>
       </method>
       <method name="GetAllowSvg" cname="gnome_icon_theme_get_allow_svg">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetExampleIconName" cname="gnome_icon_theme_get_example_icon_name">
-        <return-type type="char*"/>
+        <return-type type="char*" />
       </method>
       <method name="GetSearchPath" cname="gnome_icon_theme_get_search_path">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="char**" array="true" name="path"/>
-          <parameter type="int*" name="n_elements"/>
+          <parameter type="char**" array="true" name="path" />
+          <parameter type="int*" name="n_elements" />
         </parameters>
       </method>
       <method name="GetType" cname="gnome_icon_theme_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="HasIcon" cname="gnome_icon_theme_has_icon">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="const-char*" name="icon_name"/>
+          <parameter type="const-char*" name="icon_name" />
         </parameters>
       </method>
       <method name="ListIcons" cname="gnome_icon_theme_list_icons">
-        <return-type type="GList*"/>
+        <return-type type="GList*" />
         <parameters>
-          <parameter type="const-char*" name="context"/>
+          <parameter type="const-char*" name="context" />
         </parameters>
       </method>
       <method name="LookupIcon" cname="gnome_icon_theme_lookup_icon">
-        <return-type type="char*"/>
+        <return-type type="char*" />
         <parameters>
-          <parameter type="const-char*" name="icon_name"/>
-          <parameter type="int" name="size"/>
-          <parameter type="const-GnomeIconData**" name="icon_data"/>
-          <parameter type="int*" name="base_size"/>
+          <parameter type="const-char*" name="icon_name" />
+          <parameter type="int" name="size" />
+          <parameter type="const-GnomeIconData**" name="icon_data" />
+          <parameter type="int*" name="base_size" />
         </parameters>
       </method>
-      <constructor cname="gnome_icon_theme_new"/>
+      <constructor cname="gnome_icon_theme_new" />
       <method name="PrependSearchPath" cname="gnome_icon_theme_prepend_search_path">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-char*" name="path"/>
+          <parameter type="const-char*" name="path" />
         </parameters>
       </method>
       <method name="RescanIfNeeded" cname="gnome_icon_theme_rescan_if_needed">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="SetAllowSvg" cname="gnome_icon_theme_set_allow_svg">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="allow_svg"/>
+          <parameter type="gboolean" name="allow_svg" />
         </parameters>
       </method>
       <method name="SetCustomTheme" cname="gnome_icon_theme_set_custom_theme">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-char*" name="theme_name"/>
+          <parameter type="const-char*" name="theme_name" />
         </parameters>
       </method>
       <method name="SetSearchPath" cname="gnome_icon_theme_set_search_path">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-char*" array="true" name="path"/>
-          <parameter type="int" name="n_elements"/>
+          <parameter type="const-char*" array="true" name="path" />
+          <parameter type="int" name="n_elements" />
         </parameters>
       </method>
     </object>
     <object name="PixmapEntry" cname="GnomePixmapEntry" parent="GnomeFileEntry">
-      <field cname="_priv" type="GnomePixmapEntryPrivate*"/>
-      <property name="DoPreview" cname="do_preview" type="gboolean" readable="true" writeable="true"/>
+      <field cname="_priv" type="GnomePixmapEntryPrivate*" />
+      <property name="DoPreview" cname="do_preview" type="gboolean" readable="true" writeable="true" />
       <method name="Construct" cname="gnome_pixmap_entry_construct">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="history_id"/>
-          <parameter type="const-gchar*" name="browse_dialog_title"/>
-          <parameter type="gboolean" name="do_preview"/>
+          <parameter type="const-gchar*" name="history_id" />
+          <parameter type="const-gchar*" name="browse_dialog_title" />
+          <parameter type="gboolean" name="do_preview" />
         </parameters>
       </method>
       <method name="GetFilename" cname="gnome_pixmap_entry_get_filename">
-        <return-type type="gchar*"/>
+        <return-type type="gchar*" />
       </method>
       <method name="GetType" cname="gnome_pixmap_entry_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <constructor cname="gnome_pixmap_entry_new">
         <parameters>
-          <parameter type="const-gchar*" name="history_id"/>
-          <parameter type="const-gchar*" name="browse_dialog_title"/>
-          <parameter type="gboolean" name="do_preview"/>
+          <parameter type="const-gchar*" name="history_id" />
+          <parameter type="const-gchar*" name="browse_dialog_title" />
+          <parameter type="gboolean" name="do_preview" />
         </parameters>
       </constructor>
       <method name="PreviewWidget" cname="gnome_pixmap_entry_preview_widget">
-        <return-type type="GtkWidget*"/>
+        <return-type type="GtkWidget*" />
       </method>
       <method name="ScrolledWindow" cname="gnome_pixmap_entry_scrolled_window">
-        <return-type type="GtkWidget*"/>
+        <return-type type="GtkWidget*" />
       </method>
       <method name="SetPixmapSubdir" cname="gnome_pixmap_entry_set_pixmap_subdir">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="subdir"/>
+          <parameter type="const-gchar*" name="subdir" />
         </parameters>
       </method>
       <method name="SetPreview" cname="gnome_pixmap_entry_set_preview">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="do_preview"/>
+          <parameter type="gboolean" name="do_preview" />
         </parameters>
       </method>
       <method name="SetPreviewSize" cname="gnome_pixmap_entry_set_preview_size">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="preview_w"/>
-          <parameter type="gint" name="preview_h"/>
+          <parameter type="gint" name="preview_w" />
+          <parameter type="gint" name="preview_h" />
         </parameters>
       </method>
     </object>
     <object name="Scores" cname="GnomeScores" parent="GtkDialog">
-      <field cname="_priv" type="GnomeScoresPrivate*"/>
+      <field cname="_priv" type="GnomeScoresPrivate*" />
       <method name="Construct" cname="gnome_scores_construct">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="guint" name="n_scores"/>
-          <parameter type="gchar**" name="names"/>
-          <parameter type="gfloat*" name="scores"/>
-          <parameter type="time_t*" name="times"/>
-          <parameter type="gboolean" name="clear"/>
+          <parameter type="guint" name="n_scores" />
+          <parameter type="gchar**" name="names" />
+          <parameter type="gfloat*" name="scores" />
+          <parameter type="time_t*" name="times" />
+          <parameter type="gboolean" name="clear" />
         </parameters>
       </method>
       <method name="Display" cname="gnome_scores_display" shared="true">
-        <return-type type="GtkWidget*"/>
+        <return-type type="GtkWidget*" />
         <parameters>
-          <parameter type="const-gchar*" name="title"/>
-          <parameter type="const-gchar*" name="app_name"/>
-          <parameter type="/*" name="Name"/>
-          <parameter type="as" name="in"/>
-          <parameter type="int" name="pos"/>
-          <parameter type="as" name="returned"/>
+          <parameter type="const-gchar*" name="title" />
+          <parameter type="const-gchar*" name="app_name" />
+          <parameter type="/*" name="Name" />
+          <parameter type="as" name="in" />
+          <parameter type="int" name="pos" />
+          <parameter type="as" name="returned" />
         </parameters>
       </method>
       <method name="DisplayWithPixmap" cname="gnome_scores_display_with_pixmap" shared="true">
-        <return-type type="GtkWidget*"/>
+        <return-type type="GtkWidget*" />
         <parameters>
-          <parameter type="const-gchar*" name="pixmap_logo"/>
-          <parameter type="const-gchar*" name="app_name"/>
-          <parameter type="const-gchar*" name="level"/>
-          <parameter type="int" name="pos"/>
+          <parameter type="const-gchar*" name="pixmap_logo" />
+          <parameter type="const-gchar*" name="app_name" />
+          <parameter type="const-gchar*" name="level" />
+          <parameter type="int" name="pos" />
         </parameters>
       </method>
       <method name="GetType" cname="gnome_scores_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <constructor cname="gnome_scores_new">
         <parameters>
-          <parameter type="guint" name="n_scores"/>
-          <parameter type="gchar**" name="names"/>
-          <parameter type="gfloat*" name="scores"/>
-          <parameter type="time_t*" name="times"/>
-          <parameter type="gboolean" name="clear"/>
+          <parameter type="guint" name="n_scores" />
+          <parameter type="gchar**" name="names" />
+          <parameter type="gfloat*" name="scores" />
+          <parameter type="time_t*" name="times" />
+          <parameter type="gboolean" name="clear" />
         </parameters>
       </constructor>
       <method name="SetColor" cname="gnome_scores_set_color">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="guint" name="n"/>
-          <parameter type="GdkColor*" name="col"/>
+          <parameter type="guint" name="n" />
+          <parameter type="GdkColor*" name="col" />
         </parameters>
       </method>
       <method name="SetColors" cname="gnome_scores_set_colors">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkColor*" name="col"/>
+          <parameter type="GdkColor*" name="col" />
         </parameters>
       </method>
       <method name="SetCurrentPlayer" cname="gnome_scores_set_current_player">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="i"/>
+          <parameter type="gint" name="i" />
         </parameters>
       </method>
       <method name="SetDefColor" cname="gnome_scores_set_def_color">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkColor*" name="col"/>
+          <parameter type="GdkColor*" name="col" />
         </parameters>
       </method>
       <method name="SetLogoLabel" cname="gnome_scores_set_logo_label">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="txt"/>
-          <parameter type="const-gchar*" name="font"/>
-          <parameter type="GdkColor*" name="col"/>
+          <parameter type="const-gchar*" name="txt" />
+          <parameter type="const-gchar*" name="font" />
+          <parameter type="GdkColor*" name="col" />
         </parameters>
       </method>
       <method name="SetLogoLabelTitle" cname="gnome_scores_set_logo_label_title">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="txt"/>
+          <parameter type="const-gchar*" name="txt" />
         </parameters>
       </method>
       <method name="SetLogoPixmap" cname="gnome_scores_set_logo_pixmap">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="pix_name"/>
+          <parameter type="const-gchar*" name="pix_name" />
         </parameters>
       </method>
       <method name="SetLogoWidget" cname="gnome_scores_set_logo_widget">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="w"/>
+          <parameter type="GtkWidget*" name="w" />
         </parameters>
       </method>
     </object>
     <object name="ThumbnailFactory" cname="GnomeThumbnailFactory" parent="GObject">
-      <field cname="priv" type="GnomeThumbnailFactoryPrivate*"/>
+      <field cname="priv" type="GnomeThumbnailFactoryPrivate*" />
       <method name="CanThumbnail" cname="gnome_thumbnail_factory_can_thumbnail">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="const-char*" name="uri"/>
-          <parameter type="const-char*" name="mime_type"/>
-          <parameter type="time_t" name="mtime"/>
+          <parameter type="const-char*" name="uri" />
+          <parameter type="const-char*" name="mime_type" />
+          <parameter type="time_t" name="mtime" />
         </parameters>
       </method>
       <method name="CreateFailedThumbnail" cname="gnome_thumbnail_factory_create_failed_thumbnail">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-char*" name="uri"/>
-          <parameter type="time_t" name="mtime"/>
+          <parameter type="const-char*" name="uri" />
+          <parameter type="time_t" name="mtime" />
         </parameters>
       </method>
       <method name="GenerateThumbnail" cname="gnome_thumbnail_factory_generate_thumbnail">
-        <return-type type="GdkPixbuf*"/>
+        <return-type type="GdkPixbuf*" />
         <parameters>
-          <parameter type="const-char*" name="uri"/>
-          <parameter type="const-char*" name="mime_type"/>
+          <parameter type="const-char*" name="uri" />
+          <parameter type="const-char*" name="mime_type" />
         </parameters>
       </method>
       <method name="GetType" cname="gnome_thumbnail_factory_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="HasValidFailedThumbnail" cname="gnome_thumbnail_factory_has_valid_failed_thumbnail">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="const-char*" name="uri"/>
-          <parameter type="time_t" name="mtime"/>
+          <parameter type="const-char*" name="uri" />
+          <parameter type="time_t" name="mtime" />
         </parameters>
       </method>
       <method name="Lookup" cname="gnome_thumbnail_factory_lookup">
-        <return-type type="char*"/>
+        <return-type type="char*" />
         <parameters>
-          <parameter type="const-char*" name="uri"/>
-          <parameter type="time_t" name="mtime"/>
+          <parameter type="const-char*" name="uri" />
+          <parameter type="time_t" name="mtime" />
         </parameters>
       </method>
       <constructor cname="gnome_thumbnail_factory_new">
         <parameters>
-          <parameter type="GnomeThumbnailSize" name="size"/>
+          <parameter type="GnomeThumbnailSize" name="size" />
         </parameters>
       </constructor>
       <method name="SaveThumbnail" cname="gnome_thumbnail_factory_save_thumbnail">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkPixbuf*" name="thumbnail"/>
-          <parameter type="const-char*" name="uri"/>
-          <parameter type="time_t" name="original_mtime"/>
+          <parameter type="GdkPixbuf*" name="thumbnail" />
+          <parameter type="const-char*" name="uri" />
+          <parameter type="time_t" name="original_mtime" />
         </parameters>
       </method>
     </object>
-    <struct name="AppBarMsg" cname="GnomeAppBarMsg" opaque="true"/>
-    <struct name="GdkPixbufAsyncHandle" cname="GnomeGdkPixbufAsyncHandle" opaque="true"/>
+    <struct name="AppBarMsg" cname="GnomeAppBarMsg" opaque="true" />
+    <struct name="GdkPixbufAsyncHandle" cname="GnomeGdkPixbufAsyncHandle" opaque="true" />
     <struct name="IconDataPoint" cname="GnomeIconDataPoint">
-      <field cname="x" type="int"/>
-      <field cname="y" type="int"/>
+      <field cname="x" type="int" />
+      <field cname="y" type="int" />
     </struct>
     <struct name="ThemeFile" cname="GnomeThemeFile" opaque="true">
       <method name="ForeachKey" cname="gnome_theme_file_foreach_key">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-char*" name="section"/>
-          <parameter type="gboolean" name="include_localized"/>
-          <parameter type="GnomeThemeFileLineFunc" name="func"/>
-          <parameter type="gpointer" name="user_data"/>
+          <parameter type="const-char*" name="section" />
+          <parameter type="gboolean" name="include_localized" />
+          <parameter type="GnomeThemeFileLineFunc" name="func" />
+          <parameter type="gpointer" name="user_data" />
         </parameters>
       </method>
       <method name="ForeachSection" cname="gnome_theme_file_foreach_section">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeThemeFileSectionFunc" name="func"/>
-          <parameter type="gpointer" name="user_data"/>
+          <parameter type="GnomeThemeFileSectionFunc" name="func" />
+          <parameter type="gpointer" name="user_data" />
         </parameters>
       </method>
       <method name="Free" cname="gnome_theme_file_free">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="GetInteger" cname="gnome_theme_file_get_integer">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="const-char*" name="section"/>
-          <parameter type="const-char*" name="keyname"/>
-          <parameter type="int*" name="val"/>
+          <parameter type="const-char*" name="section" />
+          <parameter type="const-char*" name="keyname" />
+          <parameter type="int*" name="val" />
         </parameters>
       </method>
       <method name="GetLocaleString" cname="gnome_theme_file_get_locale_string">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="const-char*" name="section"/>
-          <parameter type="const-char*" name="keyname"/>
-          <parameter type="char**" name="val"/>
+          <parameter type="const-char*" name="section" />
+          <parameter type="const-char*" name="keyname" />
+          <parameter type="char**" name="val" />
         </parameters>
       </method>
       <method name="GetRaw" cname="gnome_theme_file_get_raw">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="const-char*" name="section"/>
-          <parameter type="const-char*" name="keyname"/>
-          <parameter type="const-char*" name="locale"/>
-          <parameter type="char**" name="val"/>
+          <parameter type="const-char*" name="section" />
+          <parameter type="const-char*" name="keyname" />
+          <parameter type="const-char*" name="locale" />
+          <parameter type="char**" name="val" />
         </parameters>
       </method>
       <method name="GetString" cname="gnome_theme_file_get_string">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="const-char*" name="section"/>
-          <parameter type="const-char*" name="keyname"/>
-          <parameter type="char**" name="val"/>
+          <parameter type="const-char*" name="section" />
+          <parameter type="const-char*" name="keyname" />
+          <parameter type="char**" name="val" />
         </parameters>
       </method>
       <constructor cname="gnome_theme_file_new_from_string">
         <parameters>
-          <parameter type="char*" name="data"/>
-          <parameter type="GError**" name="error"/>
+          <parameter type="char*" name="data" />
+          <parameter type="GError**" name="error" />
         </parameters>
       </constructor>
       <method name="ParseErrorQuark" cname="gnome_theme_file_parse_error_quark" shared="true">
-        <return-type type="GQuark"/>
+        <return-type type="GQuark" />
       </method>
       <method name="ToString" cname="gnome_theme_file_to_string">
-        <return-type type="char*"/>
+        <return-type type="char*" />
       </method>
     </struct>
     <struct name="UIBuilderData" cname="GnomeUIBuilderData">
-      <field cname="connect_func" type="GnomeUISignalConnectFunc"/>
-      <field cname="data" type="gpointer"/>
-      <field cname="is_interp" type="gboolean"/>
-      <field cname="relay_func" type="GtkCallbackMarshal"/>
-      <field cname="destroy_func" type="GtkDestroyNotify"/>
+      <field cname="connect_func" type="GnomeUISignalConnectFunc" />
+      <field cname="data" type="gpointer" />
+      <field cname="is_interp" type="gboolean" />
+      <field cname="relay_func" type="GtkCallbackMarshal" />
+      <field cname="destroy_func" type="GtkDestroyNotify" />
     </struct>
     <struct name="UIInfo" cname="GnomeUIInfo">
-      <field cname="type" type="GnomeUIInfoType"/>
-      <field cname="label" type="const-gchar*"/>
-      <field cname="hint" type="const-gchar*"/>
-      <field cname="moreinfo" type="gpointer"/>
-      <field cname="user_data" type="gpointer"/>
-      <field cname="unused_data" type="gpointer"/>
-      <field cname="pixmap_type" type="GnomeUIPixmapType"/>
-      <field cname="pixmap_info" type="gconstpointer"/>
-      <field cname="accelerator_key" type="guint"/>
-      <field cname="ac_mods" type="GdkModifierType"/>
-      <field cname="widget" type="GtkWidget*"/>
+      <field cname="type" type="GnomeUIInfoType" />
+      <field cname="label" type="const-gchar*" />
+      <field cname="hint" type="const-gchar*" />
+      <field cname="moreinfo" type="gpointer" />
+      <field cname="user_data" type="gpointer" />
+      <field cname="unused_data" type="gpointer" />
+      <field cname="pixmap_type" type="GnomeUIPixmapType" />
+      <field cname="pixmap_info" type="gconstpointer" />
+      <field cname="accelerator_key" type="guint" />
+      <field cname="ac_mods" type="GdkModifierType" />
+      <field cname="widget" type="GtkWidget*" />
     </struct>
     <class name="Global" cname="GnomeGlobal">
       <method name="AcceleratorsSync" cname="gnome_accelerators_sync" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="IceInit" cname="gnome_ice_init" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="InteractionKeyReturn" cname="gnome_interaction_key_return" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="key"/>
-          <parameter type="gboolean" name="cancel_shutdown"/>
+          <parameter type="gint" name="key" />
+          <parameter type="gboolean" name="cancel_shutdown" />
         </parameters>
       </method>
       <method name="MasterClient" cname="gnome_master_client" shared="true">
-        <return-type type="GnomeClient*"/>
+        <return-type type="GnomeClient*" />
       </method>
       <method name="MdiModeGetType" cname="gnome_mdi_mode_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="TypeInit" cname="gnome_type_init" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
     </class>
-    <class name="GdkHelper" cname="GnomeGdk_">
+    <class cname="GnomeGdk_" name="GdkHelper">
       <method name="PixbufNewFromUri" cname="gnome_gdk_pixbuf_new_from_uri" shared="true">
-        <return-type type="GdkPixbuf*"/>
+        <return-type type="GdkPixbuf*" />
         <parameters>
-          <parameter type="const-char*" name="uri"/>
+          <parameter type="const-char*" name="uri" />
         </parameters>
       </method>
       <method name="PixbufNewFromUriAsync" cname="gnome_gdk_pixbuf_new_from_uri_async" shared="true">
-        <return-type type="GnomeGdkPixbufAsyncHandle*"/>
+        <return-type type="GnomeGdkPixbufAsyncHandle*" />
         <parameters>
-          <parameter type="const-char*" name="uri"/>
-          <parameter type="GnomeGdkPixbufLoadCallback" name="load_callback"/>
-          <parameter type="GnomeGdkPixbufDoneCallback" name="done_callback"/>
-          <parameter type="gpointer" name="callback_data"/>
+          <parameter type="const-char*" name="uri" />
+          <parameter type="GnomeGdkPixbufLoadCallback" name="load_callback" />
+          <parameter type="GnomeGdkPixbufDoneCallback" name="done_callback" />
+          <parameter type="gpointer" name="callback_data" />
         </parameters>
       </method>
       <method name="PixbufNewFromUriCancel" cname="gnome_gdk_pixbuf_new_from_uri_cancel" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeGdkPixbufAsyncHandle*" name="handle"/>
+          <parameter type="GnomeGdkPixbufAsyncHandle*" name="handle" />
         </parameters>
       </method>
     </class>
-    <class name="GtkHelper" cname="GnomeGtk_">
+    <class cname="GnomeGtk_" name="GtkHelper">
       <method name="ModuleInfoGet" cname="gnome_gtk_module_info_get" shared="true">
-        <return-type type="const-GnomeModuleInfo*"/>
+        <return-type type="const-GnomeModuleInfo*" />
       </method>
       <method name="WidgetAddPopupItems" cname="gnome_gtk_widget_add_popup_items" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GnomeUIInfo*" name="uiinfo"/>
-          <parameter type="gpointer" name="user_data"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GnomeUIInfo*" name="uiinfo" />
+          <parameter type="gpointer" name="user_data" />
         </parameters>
       </method>
     </class>
     <class name="Icon" cname="GnomeIcon_">
       <method name="DataDup" cname="gnome_icon_data_dup" shared="true">
-        <return-type type="GnomeIconData*"/>
+        <return-type type="GnomeIconData*" />
         <parameters>
-          <parameter type="const-GnomeIconData*" name="icon_data"/>
+          <parameter type="const-GnomeIconData*" name="icon_data" />
         </parameters>
       </method>
       <method name="DataFree" cname="gnome_icon_data_free" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeIconData*" name="icon_data"/>
+          <parameter type="GnomeIconData*" name="icon_data" />
         </parameters>
       </method>
       <method name="Lookup" cname="gnome_icon_lookup" shared="true">
-        <return-type type="char*"/>
+        <return-type type="char*" />
         <parameters>
-          <parameter type="GnomeIconTheme*" name="icon_theme"/>
-          <parameter type="GnomeThumbnailFactory*" name="thumbnail_factory"/>
-          <parameter type="const-char*" name="file_uri"/>
-          <parameter type="const-char*" name="custom_icon"/>
-          <parameter type="GnomeVFSFileInfo*" name="file_info"/>
-          <parameter type="const-char*" name="mime_type"/>
-          <parameter type="GnomeIconLookupFlags" name="flags"/>
-          <parameter type="GnomeIconLookupResultFlags*" name="result"/>
+          <parameter type="GnomeIconTheme*" name="icon_theme" />
+          <parameter type="GnomeThumbnailFactory*" name="thumbnail_factory" />
+          <parameter type="const-char*" name="file_uri" />
+          <parameter type="const-char*" name="custom_icon" />
+          <parameter type="GnomeVFSFileInfo*" name="file_info" />
+          <parameter type="const-char*" name="mime_type" />
+          <parameter type="GnomeIconLookupFlags" name="flags" />
+          <parameter type="GnomeIconLookupResultFlags*" name="result" />
         </parameters>
       </method>
       <method name="LookupSync" cname="gnome_icon_lookup_sync" shared="true">
-        <return-type type="char*"/>
+        <return-type type="char*" />
         <parameters>
-          <parameter type="GnomeIconTheme*" name="icon_theme"/>
-          <parameter type="GnomeThumbnailFactory*" name="thumbnail_factory"/>
-          <parameter type="const-char*" name="file_uri"/>
-          <parameter type="const-char*" name="custom_icon"/>
-          <parameter type="GnomeIconLookupFlags" name="flags"/>
-          <parameter type="GnomeIconLookupResultFlags*" name="result"/>
+          <parameter type="GnomeIconTheme*" name="icon_theme" />
+          <parameter type="GnomeThumbnailFactory*" name="thumbnail_factory" />
+          <parameter type="const-char*" name="file_uri" />
+          <parameter type="const-char*" name="custom_icon" />
+          <parameter type="GnomeIconLookupFlags" name="flags" />
+          <parameter type="GnomeIconLookupResultFlags*" name="result" />
         </parameters>
       </method>
     </class>
     <class name="Popup" cname="GnomePopup_">
       <method name="MenuAppend" cname="gnome_popup_menu_append" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="popup"/>
-          <parameter type="GnomeUIInfo*" name="uiinfo"/>
+          <parameter type="GtkWidget*" name="popup" />
+          <parameter type="GnomeUIInfo*" name="uiinfo" />
         </parameters>
       </method>
       <method name="MenuAttach" cname="gnome_popup_menu_attach" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="popup"/>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="gpointer" name="user_data"/>
+          <parameter type="GtkWidget*" name="popup" />
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="gpointer" name="user_data" />
         </parameters>
       </method>
       <method name="MenuDoPopup" cname="gnome_popup_menu_do_popup" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="popup"/>
-          <parameter type="GtkMenuPositionFunc" name="pos_func"/>
-          <parameter type="gpointer" name="pos_data"/>
-          <parameter type="GdkEventButton*" name="event"/>
-          <parameter type="gpointer" name="user_data"/>
-          <parameter type="GtkWidget*" name="for_widget"/>
+          <parameter type="GtkWidget*" name="popup" />
+          <parameter type="GtkMenuPositionFunc" name="pos_func" />
+          <parameter type="gpointer" name="pos_data" />
+          <parameter type="GdkEventButton*" name="event" />
+          <parameter type="gpointer" name="user_data" />
+          <parameter type="GtkWidget*" name="for_widget" />
         </parameters>
       </method>
       <method name="MenuDoPopupModal" cname="gnome_popup_menu_do_popup_modal" shared="true">
-        <return-type type="int"/>
+        <return-type type="int" />
         <parameters>
-          <parameter type="GtkWidget*" name="popup"/>
-          <parameter type="GtkMenuPositionFunc" name="pos_func"/>
-          <parameter type="gpointer" name="pos_data"/>
-          <parameter type="GdkEventButton*" name="event"/>
-          <parameter type="gpointer" name="user_data"/>
-          <parameter type="GtkWidget*" name="for_widget"/>
+          <parameter type="GtkWidget*" name="popup" />
+          <parameter type="GtkMenuPositionFunc" name="pos_func" />
+          <parameter type="gpointer" name="pos_data" />
+          <parameter type="GdkEventButton*" name="event" />
+          <parameter type="gpointer" name="user_data" />
+          <parameter type="GtkWidget*" name="for_widget" />
         </parameters>
       </method>
       <method name="MenuGetAccelGroup" cname="gnome_popup_menu_get_accel_group" shared="true">
-        <return-type type="GtkAccelGroup*"/>
+        <return-type type="GtkAccelGroup*" />
         <parameters>
-          <parameter type="GtkMenu*" name="menu"/>
+          <parameter type="GtkMenu*" name="menu" />
         </parameters>
       </method>
       <method name="MenuNew" cname="gnome_popup_menu_new" shared="true">
-        <return-type type="GtkWidget*"/>
+        <return-type type="GtkWidget*" />
         <parameters>
-          <parameter type="GnomeUIInfo*" name="uiinfo"/>
+          <parameter type="GnomeUIInfo*" name="uiinfo" />
         </parameters>
       </method>
       <method name="MenuNewWithAccelgroup" cname="gnome_popup_menu_new_with_accelgroup" shared="true">
-        <return-type type="GtkWidget*"/>
+        <return-type type="GtkWidget*" />
         <parameters>
-          <parameter type="GnomeUIInfo*" name="uiinfo"/>
-          <parameter type="GtkAccelGroup*" name="accelgroup"/>
+          <parameter type="GnomeUIInfo*" name="uiinfo" />
+          <parameter type="GtkAccelGroup*" name="accelgroup" />
         </parameters>
       </method>
     </class>
     <class name="Thumbnail" cname="GnomeThumbnail_">
       <method name="HasUri" cname="gnome_thumbnail_has_uri" shared="true">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GdkPixbuf*" name="pixbuf"/>
-          <parameter type="const-char*" name="uri"/>
+          <parameter type="GdkPixbuf*" name="pixbuf" />
+          <parameter type="const-char*" name="uri" />
         </parameters>
       </method>
       <method name="IsValid" cname="gnome_thumbnail_is_valid" shared="true">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GdkPixbuf*" name="pixbuf"/>
-          <parameter type="const-char*" name="uri"/>
-          <parameter type="time_t" name="mtime"/>
+          <parameter type="GdkPixbuf*" name="pixbuf" />
+          <parameter type="const-char*" name="uri" />
+          <parameter type="time_t" name="mtime" />
         </parameters>
       </method>
       <method name="Md5" cname="gnome_thumbnail_md5" shared="true">
-        <return-type type="char*"/>
+        <return-type type="char*" />
         <parameters>
-          <parameter type="const-char*" name="uri"/>
+          <parameter type="const-char*" name="uri" />
         </parameters>
       </method>
       <method name="PathForUri" cname="gnome_thumbnail_path_for_uri" shared="true">
-        <return-type type="char*"/>
+        <return-type type="char*" />
         <parameters>
-          <parameter type="const-char*" name="uri"/>
-          <parameter type="GnomeThumbnailSize" name="size"/>
+          <parameter type="const-char*" name="uri" />
+          <parameter type="GnomeThumbnailSize" name="size" />
         </parameters>
       </method>
       <method name="ScaleDownPixbuf" cname="gnome_thumbnail_scale_down_pixbuf" shared="true">
-        <return-type type="GdkPixbuf*"/>
+        <return-type type="GdkPixbuf*" />
         <parameters>
-          <parameter type="GdkPixbuf*" name="pixbuf"/>
-          <parameter type="int" name="dest_width"/>
-          <parameter type="int" name="dest_height"/>
+          <parameter type="GdkPixbuf*" name="pixbuf" />
+          <parameter type="int" name="dest_width" />
+          <parameter type="int" name="dest_height" />
         </parameters>
       </method>
     </class>
     <class name="Window" cname="GnomeWindow_">
       <method name="IconInit" cname="gnome_window_icon_init" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="IconSetDefaultFromFile" cname="gnome_window_icon_set_default_from_file" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-char*" name="filename"/>
+          <parameter type="const-char*" name="filename" />
         </parameters>
       </method>
       <method name="IconSetDefaultFromFileList" cname="gnome_window_icon_set_default_from_file_list" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-char**" name="filenames"/>
+          <parameter type="const-char**" name="filenames" />
         </parameters>
       </method>
       <method name="IconSetFromDefault" cname="gnome_window_icon_set_from_default" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWindow*" name="w"/>
+          <parameter type="GtkWindow*" name="w" />
         </parameters>
       </method>
       <method name="IconSetFromFile" cname="gnome_window_icon_set_from_file" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWindow*" name="w"/>
-          <parameter type="const-char*" name="filename"/>
+          <parameter type="GtkWindow*" name="w" />
+          <parameter type="const-char*" name="filename" />
         </parameters>
       </method>
       <method name="IconSetFromFileList" cname="gnome_window_icon_set_from_file_list" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWindow*" name="w"/>
-          <parameter type="const-char**" name="filenames"/>
+          <parameter type="GtkWindow*" name="w" />
+          <parameter type="const-char**" name="filenames" />
         </parameters>
       </method>
       <method name="ToplevelSetTitle" cname="gnome_window_toplevel_set_title" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWindow*" name="window"/>
-          <parameter type="const-gchar*" name="doc_name"/>
-          <parameter type="const-gchar*" name="app_name"/>
-          <parameter type="const-gchar*" name="extension"/>
+          <parameter type="GtkWindow*" name="window" />
+          <parameter type="const-gchar*" name="doc_name" />
+          <parameter type="const-gchar*" name="app_name" />
+          <parameter type="const-gchar*" name="extension" />
         </parameters>
       </method>
     </class>
     <object name="Stock" cname="GnomeStock">
-      <static-string cname="GNOME_STOCK_ABOUT" name="About" value="gnome-stock-about"/>
-      <static-string cname="GNOME_STOCK_ATTACH" name="Attach" value="gnome-stock-attach"/>
-      <static-string cname="GNOME_STOCK_BLANK" name="Blank" value="gnome-stock-blank"/>
-      <static-string cname="GNOME_STOCK_BOOK_BLUE" name="BookBlue" value="gnome-stock-book-blue"/>
-      <static-string cname="GNOME_STOCK_BOOK_GREEN" name="BookGreen" value="gnome-stock-book-green"/>
-      <static-string cname="GNOME_STOCK_BOOK_OPEN" name="BookOpen" value="gnome-stock-book-open"/>
-      <static-string cname="GNOME_STOCK_BOOK_RED" name="BookRed" value="gnome-stock-book-red"/>
-      <static-string cname="GNOME_STOCK_BOOK_YELLOW" name="BookYellow" value="gnome-stock-book-yellow"/>
-      <static-string cname="GNOME_STOCK_LINE_IN" name="LineIn" value="gnome-stock-line-in"/>
-      <static-string cname="GNOME_STOCK_MAIL" name="Mail" value="gnome-stock-mail"/>
-      <static-string cname="GNOME_STOCK_MAIL_FWD" name="MailFwd" value="gnome-stock-mail-fwd"/>
-      <static-string cname="GNOME_STOCK_MAIL_NEW" name="MailNew" value="gnome-stock-mail-new"/>
-      <static-string cname="GNOME_STOCK_MAIL_RCV" name="MailRcv" value="gnome-stock-mail-rcv"/>
-      <static-string cname="GNOME_STOCK_MAIL_RPL" name="MailRpl" value="gnome-stock-mail-rpl"/>
-      <static-string cname="GNOME_STOCK_MAIL_SND" name="MailSnd" value="gnome-stock-mail-snd"/>
-      <static-string cname="GNOME_STOCK_MIC" name="Mic" value="gnome-stock-mic"/>
-      <static-string cname="GNOME_STOCK_MIDI" name="Midi" value="gnome-stock-midi"/>
-      <static-string cname="GNOME_STOCK_MULTIPLE_FILE" name="MultipleFile" value="gnome-stock-multiple-file"/>
-      <static-string cname="GNOME_STOCK_NOT" name="Not" value="gnome-stock-not"/>
-      <static-string cname="GNOME_STOCK_SCORES" name="Scores" value="gnome-stock-scores"/>
-      <static-string cname="GNOME_STOCK_TABLE_BORDERS" name="TableBorders" value="gnome-stock-table-borders"/>
-      <static-string cname="GNOME_STOCK_TABLE_FILL" name="TableFill" value="gnome-stock-table-fill"/>
-      <static-string cname="GNOME_STOCK_TEXT_BULLETED_LIST" name="TextBulletedList" value="gnome-stock-text-bulleted-list"/>
-      <static-string cname="GNOME_STOCK_TEXT_INDENT" name="TextIndent" value="gnome-stock-text-indent"/>
-      <static-string cname="GNOME_STOCK_TEXT_NUMBERED_LIST" name="TextNumberedList" value="gnome-stock-text-numbered-list"/>
-      <static-string cname="GNOME_STOCK_TEXT_UNINDENT" name="TextUnindent" value="gnome-stock-text-unindent"/>
-      <static-string cname="GNOME_STOCK_TIMER" name="Timer" value="gnome-stock-timer"/>
-      <static-string cname="GNOME_STOCK_TIMER_STOP" name="TimerStop" value="gnome-stock-timer-stop"/>
-      <static-string cname="GNOME_STOCK_TRASH" name="Trash" value="gnome-stock-trash"/>
-      <static-string cname="GNOME_STOCK_TRASH_FULL" name="TrashFull" value="gnome-stock-trash-full"/>
-      <static-string cname="GNOME_STOCK_VOLUME" name="Volume" value="gnome-stock-volume"/>
+      <static-string cname="GNOME_STOCK_ABOUT" name="About" value="gnome-stock-about" />
+      <static-string cname="GNOME_STOCK_ATTACH" name="Attach" value="gnome-stock-attach" />
+      <static-string cname="GNOME_STOCK_BLANK" name="Blank" value="gnome-stock-blank" />
+      <static-string cname="GNOME_STOCK_BOOK_BLUE" name="BookBlue" value="gnome-stock-book-blue" />
+      <static-string cname="GNOME_STOCK_BOOK_GREEN" name="BookGreen" value="gnome-stock-book-green" />
+      <static-string cname="GNOME_STOCK_BOOK_OPEN" name="BookOpen" value="gnome-stock-book-open" />
+      <static-string cname="GNOME_STOCK_BOOK_RED" name="BookRed" value="gnome-stock-book-red" />
+      <static-string cname="GNOME_STOCK_BOOK_YELLOW" name="BookYellow" value="gnome-stock-book-yellow" />
+      <static-string cname="GNOME_STOCK_LINE_IN" name="LineIn" value="gnome-stock-line-in" />
+      <static-string cname="GNOME_STOCK_MAIL" name="Mail" value="gnome-stock-mail" />
+      <static-string cname="GNOME_STOCK_MAIL_FWD" name="MailFwd" value="gnome-stock-mail-fwd" />
+      <static-string cname="GNOME_STOCK_MAIL_NEW" name="MailNew" value="gnome-stock-mail-new" />
+      <static-string cname="GNOME_STOCK_MAIL_RCV" name="MailRcv" value="gnome-stock-mail-rcv" />
+      <static-string cname="GNOME_STOCK_MAIL_RPL" name="MailRpl" value="gnome-stock-mail-rpl" />
+      <static-string cname="GNOME_STOCK_MAIL_SND" name="MailSnd" value="gnome-stock-mail-snd" />
+      <static-string cname="GNOME_STOCK_MIC" name="Mic" value="gnome-stock-mic" />
+      <static-string cname="GNOME_STOCK_MIDI" name="Midi" value="gnome-stock-midi" />
+      <static-string cname="GNOME_STOCK_MULTIPLE_FILE" name="MultipleFile" value="gnome-stock-multiple-file" />
+      <static-string cname="GNOME_STOCK_NOT" name="Not" value="gnome-stock-not" />
+      <static-string cname="GNOME_STOCK_SCORES" name="Scores" value="gnome-stock-scores" />
+      <static-string cname="GNOME_STOCK_TABLE_BORDERS" name="TableBorders" value="gnome-stock-table-borders" />
+      <static-string cname="GNOME_STOCK_TABLE_FILL" name="TableFill" value="gnome-stock-table-fill" />
+      <static-string cname="GNOME_STOCK_TEXT_BULLETED_LIST" name="TextBulletedList" value="gnome-stock-text-bulleted-list" />
+      <static-string cname="GNOME_STOCK_TEXT_INDENT" name="TextIndent" value="gnome-stock-text-indent" />
+      <static-string cname="GNOME_STOCK_TEXT_NUMBERED_LIST" name="TextNumberedList" value="gnome-stock-text-numbered-list" />
+      <static-string cname="GNOME_STOCK_TEXT_UNINDENT" name="TextUnindent" value="gnome-stock-text-unindent" />
+      <static-string cname="GNOME_STOCK_TIMER" name="Timer" value="gnome-stock-timer" />
+      <static-string cname="GNOME_STOCK_TIMER_STOP" name="TimerStop" value="gnome-stock-timer-stop" />
+      <static-string cname="GNOME_STOCK_TRASH" name="Trash" value="gnome-stock-trash" />
+      <static-string cname="GNOME_STOCK_TRASH_FULL" name="TrashFull" value="gnome-stock-trash-full" />
+      <static-string cname="GNOME_STOCK_VOLUME" name="Volume" value="gnome-stock-volume" />
     </object>
   </namespace>
   <namespace name="Gnome" library="gnomeprint-2-2">
     <enum name="GPFontEntryType" cname="GPFontEntryType" type="enum">
-      <member cname="GP_FONT_ENTRY_UNKNOWN" name="Unknown"/>
-      <member cname="GP_FONT_ENTRY_TYPE1" name="Type1"/>
-      <member cname="GP_FONT_ENTRY_TRUETYPE" name="Truetype"/>
-      <member cname="GP_FONT_ENTRY_ALIAS" name="Alias"/>
+      <member cname="GP_FONT_ENTRY_UNKNOWN" name="Unknown" />
+      <member cname="GP_FONT_ENTRY_TYPE1" name="Type1" />
+      <member cname="GP_FONT_ENTRY_TRUETYPE" name="Truetype" />
+      <member cname="GP_FONT_ENTRY_ALIAS" name="Alias" />
     </enum>
     <enum name="FontWeight" cname="GnomeFontWeight" type="enum">
-      <member cname="GNOME_FONT_LIGHTEST" name="Lightest" value="100"/>
-      <member cname="GNOME_FONT_EXTRA_LIGHT" name="ExtraLight" value="100"/>
-      <member cname="GNOME_FONT_THIN" name="Thin" value="200"/>
-      <member cname="GNOME_FONT_LIGHT" name="Light" value="300"/>
-      <member cname="GNOME_FONT_BOOK" name="Book" value="400"/>
-      <member cname="GNOME_FONT_REGULAR" name="Regular" value="400"/>
-      <member cname="GNOME_FONT_MEDIUM" name="Medium" value="500"/>
-      <member cname="GNOME_FONT_SEMI" name="Semi" value="600"/>
-      <member cname="GNOME_FONT_DEMI" name="Demi" value="600"/>
-      <member cname="GNOME_FONT_BOLD" name="Bold" value="700"/>
-      <member cname="GNOME_FONT_HEAVY" name="Heavy" value="900"/>
-      <member cname="GNOME_FONT_EXTRABOLD" name="Extrabold" value="900"/>
-      <member cname="GNOME_FONT_BLACK" name="Black" value="1000"/>
-      <member cname="GNOME_FONT_EXTRABLACK" name="Extrablack" value="1100"/>
-      <member cname="GNOME_FONT_HEAVIEST" name="Heaviest" value="1100"/>
+      <member cname="GNOME_FONT_LIGHTEST" name="Lightest" value="100" />
+      <member cname="GNOME_FONT_EXTRA_LIGHT" name="ExtraLight" value="100" />
+      <member cname="GNOME_FONT_THIN" name="Thin" value="200" />
+      <member cname="GNOME_FONT_LIGHT" name="Light" value="300" />
+      <member cname="GNOME_FONT_BOOK" name="Book" value="400" />
+      <member cname="GNOME_FONT_REGULAR" name="Regular" value="400" />
+      <member cname="GNOME_FONT_MEDIUM" name="Medium" value="500" />
+      <member cname="GNOME_FONT_SEMI" name="Semi" value="600" />
+      <member cname="GNOME_FONT_DEMI" name="Demi" value="600" />
+      <member cname="GNOME_FONT_BOLD" name="Bold" value="700" />
+      <member cname="GNOME_FONT_HEAVY" name="Heavy" value="900" />
+      <member cname="GNOME_FONT_EXTRABOLD" name="Extrabold" value="900" />
+      <member cname="GNOME_FONT_BLACK" name="Black" value="1000" />
+      <member cname="GNOME_FONT_EXTRABLACK" name="Extrablack" value="1100" />
+      <member cname="GNOME_FONT_HEAVIEST" name="Heaviest" value="1100" />
     </enum>
     <enum name="PrintModuleFlags" cname="GnomePrintModuleFlags" type="enum">
-      <member cname="GNOME_PRINT_MODULE_TRANSPORT" name="Transport" value="1 &gt;&gt; 0"/>
-      <member cname="GNOME_PRINT_MODULE_PRINTER_SOURCE" name="PrinterSource" value="1 &gt;&gt; 1"/>
-      <member cname="GNOME_PRINT_MODULE_QUEUE" name="Queue" value="1 &gt;&gt; 2"/>
+      <member cname="GNOME_PRINT_MODULE_TRANSPORT" name="Transport" value="1 &gt;&gt; 0" />
+      <member cname="GNOME_PRINT_MODULE_PRINTER_SOURCE" name="PrinterSource" value="1 &gt;&gt; 1" />
+      <member cname="GNOME_PRINT_MODULE_QUEUE" name="Queue" value="1 &gt;&gt; 2" />
     </enum>
     <enum name="PrintReturnCode" cname="GnomePrintReturnCode" type="enum">
-      <member cname="GNOME_PRINT_OK" name="Ok"/>
-      <member cname="GNOME_PRINT_ERROR_UNKNOWN" name="ErrorUnknown" value="-1"/>
-      <member cname="GNOME_PRINT_ERROR_BADVALUE" name="ErrorBadvalue" value="-2"/>
-      <member cname="GNOME_PRINT_ERROR_NOCURRENTPOINT" name="ErrorNocurrentpoint" value="-3"/>
-      <member cname="GNOME_PRINT_ERROR_NOCURRENTPATH" name="ErrorNocurrentpath" value="-4"/>
-      <member cname="GNOME_PRINT_ERROR_TEXTCORRUPT" name="ErrorTextcorrupt" value="-5"/>
-      <member cname="GNOME_PRINT_ERROR_BADCONTEXT" name="ErrorBadcontext" value="-6"/>
-      <member cname="GNOME_PRINT_ERROR_NOPAGE" name="ErrorNopage" value="-7"/>
-      <member cname="GNOME_PRINT_ERROR_NOMATCH" name="ErrorNomatch" value="-8"/>
+      <member cname="GNOME_PRINT_OK" name="Ok" />
+      <member cname="GNOME_PRINT_ERROR_UNKNOWN" name="ErrorUnknown" value="-1" />
+      <member cname="GNOME_PRINT_ERROR_BADVALUE" name="ErrorBadvalue" value="-2" />
+      <member cname="GNOME_PRINT_ERROR_NOCURRENTPOINT" name="ErrorNocurrentpoint" value="-3" />
+      <member cname="GNOME_PRINT_ERROR_NOCURRENTPATH" name="ErrorNocurrentpath" value="-4" />
+      <member cname="GNOME_PRINT_ERROR_TEXTCORRUPT" name="ErrorTextcorrupt" value="-5" />
+      <member cname="GNOME_PRINT_ERROR_BADCONTEXT" name="ErrorBadcontext" value="-6" />
+      <member cname="GNOME_PRINT_ERROR_NOPAGE" name="ErrorNopage" value="-7" />
+      <member cname="GNOME_PRINT_ERROR_NOMATCH" name="ErrorNomatch" value="-8" />
     </enum>
     <enum name="PrintUnitBase" cname="GnomePrintUnitBase" type="enum">
-      <member cname="GNOME_PRINT_UNIT_DIMENSIONLESS" name="Dimensionless"/>
-      <member cname="GNOME_PRINT_UNIT_ABSOLUTE" name="Absolute"/>
-      <member cname="GNOME_PRINT_UNIT_DEVICE" name="Device"/>
-      <member cname="GNOME_PRINT_UNIT_USERSPACE" name="Userspace"/>
+      <member cname="GNOME_PRINT_UNIT_DIMENSIONLESS" name="Dimensionless" />
+      <member cname="GNOME_PRINT_UNIT_ABSOLUTE" name="Absolute" />
+      <member cname="GNOME_PRINT_UNIT_DEVICE" name="Device" />
+      <member cname="GNOME_PRINT_UNIT_USERSPACE" name="Userspace" />
     </enum>
     <object name="Font" cname="GnomeFont" parent="GObject">
-      <property name="FontName" cname="FontName" type="gchar*" readable="true"/>
-      <property name="FullName" cname="FullName" type="gchar*" readable="true"/>
-      <property name="FamilyName" cname="FamilyName" type="gchar*" readable="true"/>
-      <property name="Weight" cname="Weight" type="gchar*" readable="true"/>
-      <property name="ItalicAngle" cname="ItalicAngle" type="gdouble" readable="true"/>
-      <property name="IsFixedPitch" cname="IsFixedPitch" type="gboolean" readable="true"/>
-      <property name="FontBBox" cname="FontBBox" type="gpointer" readable="true"/>
-      <property name="UnderlinePosition" cname="UnderlinePosition" type="gdouble" readable="true"/>
-      <property name="UnderlineThickness" cname="UnderlineThickness" type="gdouble" readable="true"/>
-      <property name="Version" cname="Version" type="gchar*" readable="true"/>
-      <property name="CapHeight" cname="CapHeight" type="gdouble" readable="true"/>
-      <property name="XHeight" cname="XHeight" type="gdouble" readable="true"/>
-      <property name="Ascender" cname="Ascender" type="gdouble" readable="true"/>
-      <property name="Descender" cname="Descender" type="gdouble" readable="true"/>
-      <property name="Size" cname="Size" type="gdouble" readable="true"/>
+      <property name="FontName" cname="FontName" type="gchar*" readable="true" />
+      <property name="FullName" cname="FullName" type="gchar*" readable="true" />
+      <property name="FamilyName" cname="FamilyName" type="gchar*" readable="true" />
+      <property name="Weight" cname="Weight" type="gchar*" readable="true" />
+      <property name="ItalicAngle" cname="ItalicAngle" type="gdouble" readable="true" />
+      <property name="IsFixedPitch" cname="IsFixedPitch" type="gboolean" readable="true" />
+      <property name="FontBBox" cname="FontBBox" type="gpointer" readable="true" />
+      <property name="UnderlinePosition" cname="UnderlinePosition" type="gdouble" readable="true" />
+      <property name="UnderlineThickness" cname="UnderlineThickness" type="gdouble" readable="true" />
+      <property name="Version" cname="Version" type="gchar*" readable="true" />
+      <property name="CapHeight" cname="CapHeight" type="gdouble" readable="true" />
+      <property name="XHeight" cname="XHeight" type="gdouble" readable="true" />
+      <property name="Ascender" cname="Ascender" type="gdouble" readable="true" />
+      <property name="Descender" cname="Descender" type="gdouble" readable="true" />
+      <property name="Size" cname="Size" type="gdouble" readable="true" />
       <method name="Find" cname="gnome_font_find" shared="true">
-        <return-type type="GnomeFont*"/>
+        <return-type type="GnomeFont*" />
         <parameters>
-          <parameter type="const-gchar*" name="name"/>
-          <parameter type="gdouble" name="size"/>
+          <parameter name="name" type="const-gchar*" />
+          <parameter type="gdouble" name="size" />
         </parameters>
       </method>
       <method name="FindClosest" cname="gnome_font_find_closest" shared="true">
-        <return-type type="GnomeFont*"/>
+        <return-type type="GnomeFont*" />
         <parameters>
-          <parameter type="const-gchar*" name="name"/>
-          <parameter type="gdouble" name="size"/>
+          <parameter name="name" type="const-gchar*" />
+          <parameter type="gdouble" name="size" />
         </parameters>
       </method>
       <method name="FindClosestFromFullName" cname="gnome_font_find_closest_from_full_name" shared="true">
-        <return-type type="GnomeFont*"/>
+        <return-type type="GnomeFont*" />
         <parameters>
-          <parameter type="const-gchar*" name="string"/>
+          <parameter name="string" type="const-gchar*" />
         </parameters>
       </method>
       <method name="FindClosestFromWeightSlant" cname="gnome_font_find_closest_from_weight_slant" shared="true">
-        <return-type type="GnomeFont*"/>
+        <return-type type="GnomeFont*" />
         <parameters>
-          <parameter type="const-gchar*" name="family"/>
-          <parameter type="GnomeFontWeight" name="weight"/>
-          <parameter type="gboolean" name="italic"/>
-          <parameter type="gdouble" name="size"/>
+          <parameter name="family" type="const-gchar*" />
+          <parameter type="GnomeFontWeight" name="weight" />
+          <parameter type="gboolean" name="italic" />
+          <parameter type="gdouble" name="size" />
         </parameters>
       </method>
       <method name="FindFromFullName" cname="gnome_font_find_from_full_name" shared="true">
-        <return-type type="GnomeFont*"/>
+        <return-type type="GnomeFont*" />
         <parameters>
-          <parameter type="const-gchar*" name="string"/>
+          <parameter name="string" type="const-gchar*" />
         </parameters>
       </method>
       <method name="GetAscender" cname="gnome_font_get_ascender">
-        <return-type type="gdouble"/>
+        <return-type type="gdouble" />
       </method>
       <method name="GetClosestPangoFont" cname="gnome_font_get_closest_pango_font">
-        <return-type type="PangoFont*"/>
+        <return-type type="PangoFont*" />
         <parameters>
-          <parameter type="PangoFontMap*" name="map"/>
-          <parameter type="gdouble" name="dpi"/>
+          <parameter type="PangoFontMap*" name="map" />
+          <parameter type="gdouble" name="dpi" />
         </parameters>
       </method>
       <method name="GetDescender" cname="gnome_font_get_descender">
-        <return-type type="gdouble"/>
+        <return-type type="gdouble" />
       </method>
       <method name="GetFace" cname="gnome_font_get_face">
-        <return-type type="GnomeFontFace*"/>
+        <return-type type="GnomeFontFace*" />
       </method>
       <method name="GetFamilyName" cname="gnome_font_get_family_name">
-        <return-type type="const-gchar*"/>
+        <return-type type="const-gchar*" />
       </method>
       <method name="GetFullName" cname="gnome_font_get_full_name">
-        <return-type type="guchar*"/>
+        <return-type type="guchar*" />
       </method>
       <method name="GetGlyphKerning" cname="gnome_font_get_glyph_kerning">
-        <return-type type="gdouble"/>
+        <return-type type="gdouble" />
         <parameters>
-          <parameter type="gint" name="glyph1"/>
-          <parameter type="gint" name="glyph2"/>
+          <parameter type="gint" name="glyph1" />
+          <parameter type="gint" name="glyph2" />
         </parameters>
       </method>
       <method name="GetGlyphStdadvance" cname="gnome_font_get_glyph_stdadvance">
-        <return-type type="ArtPoint*"/>
+        <return-type type="ArtPoint*" />
         <parameters>
-          <parameter type="gint" name="glyph"/>
-          <parameter type="ArtPoint*" name="advance"/>
+          <parameter type="gint" name="glyph" />
+          <parameter type="ArtPoint*" name="advance" />
         </parameters>
       </method>
       <method name="GetGlyphStdbbox" cname="gnome_font_get_glyph_stdbbox">
-        <return-type type="ArtDRect*"/>
+        <return-type type="ArtDRect*" />
         <parameters>
-          <parameter type="gint" name="glyph"/>
-          <parameter type="ArtDRect*" name="bbox"/>
+          <parameter type="gint" name="glyph" />
+          <parameter type="ArtDRect*" name="bbox" />
         </parameters>
       </method>
       <method name="GetGlyphStdkerning" cname="gnome_font_get_glyph_stdkerning">
-        <return-type type="ArtPoint*"/>
+        <return-type type="ArtPoint*" />
         <parameters>
-          <parameter type="gint" name="glyph0"/>
-          <parameter type="gint" name="glyph1"/>
-          <parameter type="ArtPoint*" name="kerning"/>
+          <parameter type="gint" name="glyph0" />
+          <parameter type="gint" name="glyph1" />
+          <parameter type="ArtPoint*" name="kerning" />
         </parameters>
       </method>
       <method name="GetGlyphStdoutline" cname="gnome_font_get_glyph_stdoutline">
-        <return-type type="const-ArtBpath*"/>
+        <return-type type="const-ArtBpath*" />
         <parameters>
-          <parameter type="gint" name="glyph"/>
+          <parameter type="gint" name="glyph" />
         </parameters>
       </method>
       <method name="GetGlyphWidth" cname="gnome_font_get_glyph_width">
-        <return-type type="gdouble"/>
+        <return-type type="gdouble" />
         <parameters>
-          <parameter type="gint" name="glyph"/>
+          <parameter type="gint" name="glyph" />
         </parameters>
       </method>
       <method name="GetName" cname="gnome_font_get_name">
-        <return-type type="const-gchar*"/>
+        <return-type type="const-gchar*" />
       </method>
       <method name="GetPangoDescription" cname="gnome_font_get_pango_description">
-        <return-type type="PangoFontDescription*"/>
+        <return-type type="PangoFontDescription*" />
         <parameters>
-          <parameter type="gdouble" name="dpi"/>
+          <parameter type="gdouble" name="dpi" />
         </parameters>
       </method>
       <method name="GetPsName" cname="gnome_font_get_ps_name">
-        <return-type type="const-gchar*"/>
+        <return-type type="const-gchar*" />
       </method>
       <method name="GetRfont" cname="gnome_font_get_rfont">
-        <return-type type="GnomeRFont*"/>
+        <return-type type="GnomeRFont*" />
         <parameters>
-          <parameter type="const-gdouble*" name="t"/>
+          <parameter type="const-gdouble*" name="t" />
         </parameters>
       </method>
       <method name="GetSize" cname="gnome_font_get_size">
-        <return-type type="gdouble"/>
+        <return-type type="gdouble" />
       </method>
       <method name="GetSpeciesName" cname="gnome_font_get_species_name">
-        <return-type type="const-gchar*"/>
+        <return-type type="const-gchar*" />
       </method>
       <method name="GetType" cname="gnome_font_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="GetUnderlinePosition" cname="gnome_font_get_underline_position">
-        <return-type type="gdouble"/>
+        <return-type type="gdouble" />
       </method>
       <method name="GetUnderlineThickness" cname="gnome_font_get_underline_thickness">
-        <return-type type="gdouble"/>
+        <return-type type="gdouble" />
       </method>
       <method name="GetWidthUtf8" cname="gnome_font_get_width_utf8">
-        <return-type type="double"/>
+        <return-type type="double" />
         <parameters>
-          <parameter type="const-char*" name="s"/>
+          <parameter type="const-char*" name="s" />
         </parameters>
       </method>
       <method name="GetWidthUtf8Sized" cname="gnome_font_get_width_utf8_sized">
-        <return-type type="double"/>
+        <return-type type="double" />
         <parameters>
-          <parameter type="const-char*" name="s"/>
-          <parameter type="int" name="n"/>
+          <parameter type="const-char*" name="s" />
+          <parameter type="int" name="n" />
         </parameters>
       </method>
       <method name="List" cname="gnome_font_list" shared="true">
-        <return-type type="GList*"/>
+        <return-type type="GList*" />
       </method>
       <method name="ListFree" cname="gnome_font_list_free" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GList*" name="fontlist"/>
+          <parameter type="GList*" name="fontlist" />
         </parameters>
       </method>
       <method name="LookupDefault" cname="gnome_font_lookup_default">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="gint" name="unicode"/>
+          <parameter type="gint" name="unicode" />
         </parameters>
       </method>
       <method name="StyleList" cname="gnome_font_style_list" shared="true">
-        <return-type type="GList*"/>
+        <return-type type="GList*" />
         <parameters>
-          <parameter type="const-gchar*" name="family"/>
+          <parameter name="family" type="const-gchar*" />
         </parameters>
       </method>
       <method name="StyleListFree" cname="gnome_font_style_list_free" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GList*" name="styles"/>
+          <parameter type="GList*" name="styles" />
         </parameters>
       </method>
     </object>
     <object name="FontFace" cname="GnomeFontFace" parent="GObject">
-      <property name="FontName" cname="FontName" type="gchar*" readable="true"/>
-      <property name="FullName" cname="FullName" type="gchar*" readable="true"/>
-      <property name="FamilyName" cname="FamilyName" type="gchar*" readable="true"/>
-      <property name="Weight" cname="Weight" type="gchar*" readable="true"/>
-      <property name="ItalicAngle" cname="ItalicAngle" type="gdouble" readable="true"/>
-      <property name="IsFixedPitch" cname="IsFixedPitch" type="gboolean" readable="true"/>
-      <property name="FontBBox" cname="FontBBox" type="gpointer" readable="true"/>
-      <property name="UnderlinePosition" cname="UnderlinePosition" type="gdouble" readable="true"/>
-      <property name="UnderlineThickness" cname="UnderlineThickness" type="gdouble" readable="true"/>
-      <property name="Version" cname="Version" type="gchar*" readable="true"/>
-      <property name="CapHeight" cname="CapHeight" type="gdouble" readable="true"/>
-      <property name="XHeight" cname="XHeight" type="gdouble" readable="true"/>
-      <property name="Ascender" cname="Ascender" type="gdouble" readable="true"/>
-      <property name="Descender" cname="Descender" type="gdouble" readable="true"/>
+      <property name="FontName" cname="FontName" type="gchar*" readable="true" />
+      <property name="FullName" cname="FullName" type="gchar*" readable="true" />
+      <property name="FamilyName" cname="FamilyName" type="gchar*" readable="true" />
+      <property name="Weight" cname="Weight" type="gchar*" readable="true" />
+      <property name="ItalicAngle" cname="ItalicAngle" type="gdouble" readable="true" />
+      <property name="IsFixedPitch" cname="IsFixedPitch" type="gboolean" readable="true" />
+      <property name="FontBBox" cname="FontBBox" type="gpointer" readable="true" />
+      <property name="UnderlinePosition" cname="UnderlinePosition" type="gdouble" readable="true" />
+      <property name="UnderlineThickness" cname="UnderlineThickness" type="gdouble" readable="true" />
+      <property name="Version" cname="Version" type="gchar*" readable="true" />
+      <property name="CapHeight" cname="CapHeight" type="gdouble" readable="true" />
+      <property name="XHeight" cname="XHeight" type="gdouble" readable="true" />
+      <property name="Ascender" cname="Ascender" type="gdouble" readable="true" />
+      <property name="Descender" cname="Descender" type="gdouble" readable="true" />
       <method name="Find" cname="gnome_font_face_find" shared="true">
-        <return-type type="GnomeFontFace*"/>
+        <return-type type="GnomeFontFace*" />
         <parameters>
-          <parameter type="const-gchar*" name="name"/>
+          <parameter name="name" type="const-gchar*" />
         </parameters>
       </method>
       <method name="FindClosest" cname="gnome_font_face_find_closest" shared="true">
-        <return-type type="GnomeFontFace*"/>
+        <return-type type="GnomeFontFace*" />
         <parameters>
-          <parameter type="const-gchar*" name="name"/>
+          <parameter name="name" type="const-gchar*" />
         </parameters>
       </method>
       <method name="FindClosestFromPangoDescription" cname="gnome_font_face_find_closest_from_pango_description" shared="true">
-        <return-type type="GnomeFontFace*"/>
+        <return-type type="GnomeFontFace*" />
         <parameters>
-          <parameter type="const-PangoFontDescription*" name="desc"/>
+          <parameter type="const-PangoFontDescription*" name="desc" />
         </parameters>
       </method>
       <method name="FindClosestFromPangoFont" cname="gnome_font_face_find_closest_from_pango_font" shared="true">
-        <return-type type="GnomeFontFace*"/>
+        <return-type type="GnomeFontFace*" />
         <parameters>
-          <parameter type="PangoFont*" name="pfont"/>
+          <parameter type="PangoFont*" name="pfont" />
         </parameters>
       </method>
       <method name="FindClosestFromWeightSlant" cname="gnome_font_face_find_closest_from_weight_slant" shared="true">
-        <return-type type="GnomeFontFace*"/>
+        <return-type type="GnomeFontFace*" />
         <parameters>
-          <parameter type="const-gchar*" name="family"/>
-          <parameter type="GnomeFontWeight" name="weight"/>
-          <parameter type="gboolean" name="italic"/>
+          <parameter name="family" type="const-gchar*" />
+          <parameter type="GnomeFontWeight" name="weight" />
+          <parameter type="gboolean" name="italic" />
         </parameters>
       </method>
       <method name="FindFromFamilyAndStyle" cname="gnome_font_face_find_from_family_and_style" shared="true">
-        <return-type type="GnomeFontFace*"/>
+        <return-type type="GnomeFontFace*" />
         <parameters>
-          <parameter type="const-gchar*" name="family"/>
-          <parameter type="const-gchar*" name="style"/>
+          <parameter name="family" type="const-gchar*" />
+          <parameter name="style" type="const-gchar*" />
         </parameters>
       </method>
       <method name="GetAscender" cname="gnome_font_face_get_ascender">
-        <return-type type="gdouble"/>
+        <return-type type="gdouble" />
       </method>
       <method name="GetDescender" cname="gnome_font_face_get_descender">
-        <return-type type="gdouble"/>
+        <return-type type="gdouble" />
       </method>
       <method name="GetFamilyName" cname="gnome_font_face_get_family_name">
-        <return-type type="const-gchar*"/>
+        <return-type type="const-gchar*" />
       </method>
       <method name="GetFont" cname="gnome_font_face_get_font">
-        <return-type type="GnomeFont*"/>
+        <return-type type="GnomeFont*" />
         <parameters>
-          <parameter type="gdouble" name="size"/>
-          <parameter type="gdouble" name="xres"/>
-          <parameter type="gdouble" name="yres"/>
+          <parameter type="gdouble" name="size" />
+          <parameter type="gdouble" name="xres" />
+          <parameter type="gdouble" name="yres" />
         </parameters>
       </method>
       <method name="GetFontDefault" cname="gnome_font_face_get_font_default">
-        <return-type type="GnomeFont*"/>
+        <return-type type="GnomeFont*" />
         <parameters>
-          <parameter type="gdouble" name="size"/>
+          <parameter type="gdouble" name="size" />
         </parameters>
       </method>
       <method name="GetGlyphKerning" cname="gnome_font_face_get_glyph_kerning">
-        <return-type type="gdouble"/>
+        <return-type type="gdouble" />
         <parameters>
-          <parameter type="gint" name="glyph1"/>
-          <parameter type="gint" name="glyph2"/>
+          <parameter type="gint" name="glyph1" />
+          <parameter type="gint" name="glyph2" />
         </parameters>
       </method>
       <method name="GetGlyphPsName" cname="gnome_font_face_get_glyph_ps_name">
-        <return-type type="const-gchar*"/>
+        <return-type type="const-gchar*" />
         <parameters>
-          <parameter type="gint" name="glyph"/>
+          <parameter type="gint" name="glyph" />
         </parameters>
       </method>
       <method name="GetGlyphStdadvance" cname="gnome_font_face_get_glyph_stdadvance">
-        <return-type type="ArtPoint*"/>
+        <return-type type="ArtPoint*" />
         <parameters>
-          <parameter type="gint" name="glyph"/>
-          <parameter type="ArtPoint*" name="advance"/>
+          <parameter type="gint" name="glyph" />
+          <parameter type="ArtPoint*" name="advance" />
         </parameters>
       </method>
       <method name="GetGlyphStdbbox" cname="gnome_font_face_get_glyph_stdbbox">
-        <return-type type="ArtDRect*"/>
+        <return-type type="ArtDRect*" />
         <parameters>
-          <parameter type="gint" name="glyph"/>
-          <parameter type="ArtDRect*" name="bbox"/>
+          <parameter type="gint" name="glyph" />
+          <parameter type="ArtDRect*" name="bbox" />
         </parameters>
       </method>
       <method name="GetGlyphStdkerning" cname="gnome_font_face_get_glyph_stdkerning">
-        <return-type type="ArtPoint*"/>
+        <return-type type="ArtPoint*" />
         <parameters>
-          <parameter type="gint" name="glyph0"/>
-          <parameter type="gint" name="glyph1"/>
-          <parameter type="ArtPoint*" name="kerning"/>
+          <parameter type="gint" name="glyph0" />
+          <parameter type="gint" name="glyph1" />
+          <parameter type="ArtPoint*" name="kerning" />
         </parameters>
       </method>
       <method name="GetGlyphStdoutline" cname="gnome_font_face_get_glyph_stdoutline">
-        <return-type type="const-ArtBpath*"/>
+        <return-type type="const-ArtBpath*" />
         <parameters>
-          <parameter type="gint" name="glyph"/>
+          <parameter type="gint" name="glyph" />
         </parameters>
       </method>
       <method name="GetGlyphWidth" cname="gnome_font_face_get_glyph_width">
-        <return-type type="gdouble"/>
+        <return-type type="gdouble" />
         <parameters>
-          <parameter type="gint" name="glyph"/>
+          <parameter type="gint" name="glyph" />
         </parameters>
       </method>
       <method name="GetName" cname="gnome_font_face_get_name">
-        <return-type type="const-gchar*"/>
+        <return-type type="const-gchar*" />
       </method>
       <method name="GetNumGlyphs" cname="gnome_font_face_get_num_glyphs">
-        <return-type type="gint"/>
+        <return-type type="gint" />
       </method>
       <method name="GetPsName" cname="gnome_font_face_get_ps_name">
-        <return-type type="const-gchar*"/>
+        <return-type type="const-gchar*" />
       </method>
       <method name="GetSample" cname="gnome_font_face_get_sample">
-        <return-type type="const-gchar*"/>
+        <return-type type="const-gchar*" />
       </method>
       <method name="GetSpeciesName" cname="gnome_font_face_get_species_name">
-        <return-type type="const-gchar*"/>
+        <return-type type="const-gchar*" />
       </method>
       <method name="GetStdbbox" cname="gnome_font_face_get_stdbbox">
-        <return-type type="const-ArtDRect*"/>
+        <return-type type="const-ArtDRect*" />
       </method>
       <method name="GetType" cname="gnome_font_face_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="GetUnderlinePosition" cname="gnome_font_face_get_underline_position">
-        <return-type type="gdouble"/>
+        <return-type type="gdouble" />
       </method>
       <method name="GetUnderlineThickness" cname="gnome_font_face_get_underline_thickness">
-        <return-type type="gdouble"/>
+        <return-type type="gdouble" />
       </method>
       <method name="GetWeightCode" cname="gnome_font_face_get_weight_code">
-        <return-type type="GnomeFontWeight"/>
+        <return-type type="GnomeFontWeight" />
       </method>
       <method name="IsFixedWidth" cname="gnome_font_face_is_fixed_width">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="IsItalic" cname="gnome_font_face_is_italic">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="LookupDefault" cname="gnome_font_face_lookup_default">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="gint" name="unicode"/>
+          <parameter type="gint" name="unicode" />
         </parameters>
       </method>
     </object>
     <object name="FontFamily" cname="GnomeFontFamily" parent="GObject">
       <method name="GetFaceByStylename" cname="gnome_font_family_get_face_by_stylename">
-        <return-type type="GnomeFontFace*"/>
+        <return-type type="GnomeFontFace*" />
         <parameters>
-          <parameter type="const-gchar*" name="style"/>
+          <parameter type="const-gchar*" name="style" />
         </parameters>
       </method>
       <method name="GetType" cname="gnome_font_family_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="List" cname="gnome_font_family_list" shared="true">
-        <return-type type="GList*"/>
+        <return-type type="GList*" />
       </method>
       <method name="ListFree" cname="gnome_font_family_list_free" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GList*" name="fontlist"/>
+          <parameter type="GList*" name="fontlist" />
         </parameters>
       </method>
       <constructor cname="gnome_font_family_new">
         <parameters>
-          <parameter type="const-gchar*" name="name"/>
+          <parameter type="const-gchar*" name="name" />
         </parameters>
       </constructor>
       <method name="StyleList" cname="gnome_font_family_style_list">
-        <return-type type="GList*"/>
+        <return-type type="GList*" />
       </method>
       <method name="StyleListFree" cname="gnome_font_family_style_list_free" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GList*" name="list"/>
+          <parameter type="GList*" name="list" />
         </parameters>
       </method>
     </object>
     <object name="PrintConfig" cname="GnomePrintConfig" parent="GObject">
       <method name="Default" cname="gnome_print_config_default" shared="true">
-        <return-type type="GnomePrintConfig*"/>
+        <return-type type="GnomePrintConfig*" />
       </method>
       <method name="Dump" cname="gnome_print_config_dump">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="Dup" cname="gnome_print_config_dup">
-        <return-type type="GnomePrintConfig*"/>
+        <return-type type="GnomePrintConfig*" />
       </method>
       <method name="FromString" cname="gnome_print_config_from_string" shared="true">
-        <return-type type="GnomePrintConfig*"/>
+        <return-type type="GnomePrintConfig*" />
         <parameters>
-          <parameter type="const-gchar*" name="str"/>
-          <parameter type="guint" name="flags"/>
+          <parameter type="const-gchar*" name="str" />
+          <parameter type="guint" name="flags" />
         </parameters>
       </method>
       <method name="Get" cname="gnome_print_config_get">
-        <return-type type="gchar*"/>
+        <return-type type="gchar*" />
         <parameters>
-          <parameter type="const-gchar*" name="key"/>
+          <parameter name="key" type="const-gchar*" />
         </parameters>
       </method>
       <method name="GetBoolean" cname="gnome_print_config_get_boolean">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="const-gchar*" name="key"/>
-          <parameter type="gboolean*" name="val"/>
+          <parameter name="key" type="const-gchar*" />
+          <parameter type="gboolean*" name="val" />
         </parameters>
       </method>
       <method name="GetDouble" cname="gnome_print_config_get_double">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="const-gchar*" name="key"/>
-          <parameter type="gdouble*" name="val"/>
+          <parameter name="key" type="const-gchar*" />
+          <parameter type="gdouble*" name="val" />
         </parameters>
       </method>
       <method name="GetInt" cname="gnome_print_config_get_int">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="const-gchar*" name="key"/>
-          <parameter type="gint*" name="val"/>
+          <parameter name="key" type="const-gchar*" />
+          <parameter type="gint*" name="val" />
         </parameters>
       </method>
       <method name="GetLength" cname="gnome_print_config_get_length">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="const-gchar*" name="key"/>
-          <parameter type="gdouble*" name="val"/>
-          <parameter type="const-GnomePrintUnit**" name="unit"/>
+          <parameter name="key" type="const-gchar*" />
+          <parameter type="gdouble*" name="val" />
+          <parameter type="const-GnomePrintUnit**" name="unit" />
         </parameters>
       </method>
       <method name="GetPageSize" cname="gnome_print_config_get_page_size">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="gdouble*" name="width"/>
-          <parameter type="gdouble*" name="height"/>
+          <parameter type="gdouble*" name="width" />
+          <parameter type="gdouble*" name="height" />
         </parameters>
       </method>
       <method name="GetType" cname="gnome_print_config_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="Ref" cname="gnome_print_config_ref">
-        <return-type type="GnomePrintConfig*"/>
+        <return-type type="GnomePrintConfig*" />
       </method>
       <method name="Set" cname="gnome_print_config_set">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="const-gchar*" name="key"/>
-          <parameter type="const-gchar*" name="value"/>
+          <parameter name="key" type="const-gchar*" />
+          <parameter name="value" type="const-gchar*" />
         </parameters>
       </method>
       <method name="SetBoolean" cname="gnome_print_config_set_boolean">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="const-gchar*" name="key"/>
-          <parameter type="gboolean" name="val"/>
+          <parameter name="key" type="const-gchar*" />
+          <parameter type="gboolean" name="val" />
         </parameters>
       </method>
       <method name="SetDouble" cname="gnome_print_config_set_double">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="const-gchar*" name="key"/>
-          <parameter type="gdouble" name="val"/>
+          <parameter name="key" type="const-gchar*" />
+          <parameter type="gdouble" name="val" />
         </parameters>
       </method>
       <method name="SetInt" cname="gnome_print_config_set_int">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="const-gchar*" name="key"/>
-          <parameter type="gint" name="val"/>
+          <parameter name="key" type="const-gchar*" />
+          <parameter type="gint" name="val" />
         </parameters>
       </method>
       <method name="SetLength" cname="gnome_print_config_set_length">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="const-gchar*" name="key"/>
-          <parameter type="gdouble" name="val"/>
-          <parameter type="const-GnomePrintUnit*" name="unit"/>
+          <parameter name="key" type="const-gchar*" />
+          <parameter type="gdouble" name="val" />
+          <parameter type="const-GnomePrintUnit*" name="unit" />
         </parameters>
       </method>
       <method name="ToString" cname="gnome_print_config_to_string">
-        <return-type type="gchar*"/>
+        <return-type type="gchar*" />
         <parameters>
-          <parameter type="guint" name="flags"/>
+          <parameter type="guint" name="flags" />
         </parameters>
       </method>
       <method name="Unref" cname="gnome_print_config_unref">
-        <return-type type="GnomePrintConfig*"/>
+        <return-type type="GnomePrintConfig*" />
       </method>
     </object>
     <object name="PrintContext" cname="GnomePrintContext" parent="GObject">
       <method name="Close" cname="gnome_print_context_close">
-        <return-type type="gint"/>
+        <return-type type="gint" />
       </method>
       <method name="CreateTransport" cname="gnome_print_context_create_transport">
-        <return-type type="gint"/>
+        <return-type type="gint" />
       </method>
       <method name="GetType" cname="gnome_print_context_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <constructor cname="gnome_print_context_new">
         <parameters>
-          <parameter type="GnomePrintConfig*" name="config"/>
+          <parameter type="GnomePrintConfig*" name="config" />
         </parameters>
       </constructor>
     </object>
     <object name="PrintFRGBA" cname="GnomePrintFRGBA" parent="GnomePrintContext">
       <method name="GetType" cname="gnome_print_frgba_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <constructor cname="gnome_print_frgba_new">
         <parameters>
-          <parameter type="GnomePrintContext*" name="context"/>
+          <parameter type="GnomePrintContext*" name="context" />
         </parameters>
       </constructor>
     </object>
     <object name="PrintJob" cname="GnomePrintJob" parent="GObject" disabledefaultconstructor="1">
       <method name="Close" cname="gnome_print_job_close">
-        <return-type type="gint"/>
+        <return-type type="gint" />
       </method>
       <method name="GetConfig" cname="gnome_print_job_get_config">
-        <return-type type="GnomePrintConfig*"/>
+        <return-type type="GnomePrintConfig*" />
       </method>
       <method name="GetContext" cname="gnome_print_job_get_context">
-        <return-type type="GnomePrintContext*"/>
+        <return-type type="GnomePrintContext*" />
       </method>
       <method name="GetPageSize" cname="gnome_print_job_get_page_size">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="gdouble*" name="width"/>
-          <parameter type="gdouble*" name="height"/>
+          <parameter type="gdouble*" name="width" />
+          <parameter type="gdouble*" name="height" />
         </parameters>
       </method>
       <method name="GetPageSizeFromConfig" cname="gnome_print_job_get_page_size_from_config" shared="true">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GnomePrintConfig*" name="config"/>
-          <parameter type="gdouble*" name="width"/>
-          <parameter type="gdouble*" name="height"/>
+          <parameter type="GnomePrintConfig*" name="config" />
+          <parameter type="gdouble*" name="width" />
+          <parameter type="gdouble*" name="height" />
         </parameters>
       </method>
       <method name="GetPages" cname="gnome_print_job_get_pages">
-        <return-type type="gint"/>
+        <return-type type="gint" />
       </method>
       <method name="GetType" cname="gnome_print_job_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <constructor cname="gnome_print_job_new">
         <parameters>
-          <parameter type="GnomePrintConfig*" name="config"/>
+          <parameter type="GnomePrintConfig*" name="config" />
         </parameters>
       </constructor>
       <method name="Print" cname="gnome_print_job_print">
-        <return-type type="gint"/>
+        <return-type type="gint" />
       </method>
       <method name="PrintToFile" cname="gnome_print_job_print_to_file">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="gchar*" name="output"/>
+          <parameter type="gchar*" name="output" />
         </parameters>
       </method>
       <method name="Render" cname="gnome_print_job_render">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="GnomePrintContext*" name="ctx"/>
+          <parameter type="GnomePrintContext*" name="ctx" />
         </parameters>
       </method>
       <method name="RenderPage" cname="gnome_print_job_render_page">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="GnomePrintContext*" name="ctx"/>
-          <parameter type="gint" name="page"/>
-          <parameter type="gboolean" name="pageops"/>
+          <parameter type="GnomePrintContext*" name="ctx" />
+          <parameter type="gint" name="page" />
+          <parameter type="gboolean" name="pageops" />
         </parameters>
       </method>
     </object>
     <object name="PrintMeta" cname="GnomePrintMeta" parent="GnomePrintContext">
       <method name="GetBuffer" cname="gnome_print_meta_get_buffer">
-        <return-type type="const-guchar*"/>
+        <return-type type="const-guchar*" />
       </method>
       <method name="GetLength" cname="gnome_print_meta_get_length">
-        <return-type type="gint"/>
+        <return-type type="gint" />
       </method>
       <method name="GetPages" cname="gnome_print_meta_get_pages">
-        <return-type type="int"/>
+        <return-type type="int" />
       </method>
       <method name="GetType" cname="gnome_print_meta_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
-      <constructor cname="gnome_print_meta_new"/>
+      <constructor cname="gnome_print_meta_new" />
       <method name="RenderData" cname="gnome_print_meta_render_data" shared="true">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="GnomePrintContext*" name="ctx"/>
-          <parameter type="const-guchar*" name="data"/>
-          <parameter type="gint" name="length"/>
+          <parameter type="GnomePrintContext*" name="ctx" />
+          <parameter type="const-guchar*" name="data" />
+          <parameter type="gint" name="length" />
         </parameters>
       </method>
       <method name="RenderDataPage" cname="gnome_print_meta_render_data_page" shared="true">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="GnomePrintContext*" name="ctx"/>
-          <parameter type="const-guchar*" name="data"/>
-          <parameter type="gint" name="length"/>
-          <parameter type="gint" name="page"/>
-          <parameter type="gboolean" name="pageops"/>
+          <parameter type="GnomePrintContext*" name="ctx" />
+          <parameter type="const-guchar*" name="data" />
+          <parameter type="gint" name="length" />
+          <parameter type="gint" name="page" />
+          <parameter type="gboolean" name="pageops" />
         </parameters>
       </method>
       <method name="RenderFile" cname="gnome_print_meta_render_file" shared="true">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="GnomePrintContext*" name="ctx"/>
-          <parameter type="const-gchar*" name="filename"/>
+          <parameter type="GnomePrintContext*" name="ctx" />
+          <parameter name="filename" type="const-gchar*" />
         </parameters>
       </method>
       <method name="RenderFilePage" cname="gnome_print_meta_render_file_page" shared="true">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="GnomePrintContext*" name="ctx"/>
-          <parameter type="const-gchar*" name="filename"/>
-          <parameter type="gint" name="page"/>
-          <parameter type="gboolean" name="pageops"/>
+          <parameter type="GnomePrintContext*" name="ctx" />
+          <parameter name="filename" type="const-gchar*" />
+          <parameter type="gint" name="page" />
+          <parameter type="gboolean" name="pageops" />
         </parameters>
       </method>
     </object>
     <object name="PrintMultipage" cname="GnomePrintMultipage" parent="GnomePrintContext">
       <method name="FinishPage" cname="gnome_print_multipage_finish_page">
-        <return-type type="gint"/>
+        <return-type type="gint" />
       </method>
       <method name="GetType" cname="gnome_print_multipage_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <constructor cname="gnome_print_multipage_new">
         <parameters>
-          <parameter type="GnomePrintContext*" name="subpc"/>
-          <parameter type="GList*" name="affines"/>
+          <parameter type="GnomePrintContext*" name="subpc" />
+          <parameter type="GList*" name="affines" />
         </parameters>
       </constructor>
     </object>
     <object name="PrintPdf" cname="GnomePrintPdf" parent="GObject">
       <method name="GetType" cname="gnome_print_pdf_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <constructor cname="gnome_print_pdf_new">
         <parameters>
-          <parameter type="GnomePrintConfig*" name="config"/>
+          <parameter type="GnomePrintConfig*" name="config" />
         </parameters>
       </constructor>
     </object>
     <object name="PrintPs2" cname="GnomePrintPs2" parent="GnomePrintContext">
       <method name="GetType" cname="gnome_print_ps2_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <constructor cname="gnome_print_ps2_new">
         <parameters>
-          <parameter type="GnomePrintConfig*" name="config"/>
+          <parameter type="GnomePrintConfig*" name="config" />
         </parameters>
       </constructor>
     </object>
     <object name="PrintRBuf" cname="GnomePrintRBuf" parent="GnomePrintContext">
       <method name="GetType" cname="gnome_print_rbuf_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <constructor cname="gnome_print_rbuf_new">
         <parameters>
-          <parameter type="guchar*" name="pixels"/>
-          <parameter type="gint" name="width"/>
-          <parameter type="gint" name="height"/>
-          <parameter type="gint" name="rowstride"/>
-          <parameter type="gdouble" array="true" name="page2buf"/>
-          <parameter type="gboolean" name="alpha"/>
+          <parameter type="guchar*" name="pixels" />
+          <parameter type="gint" name="width" />
+          <parameter type="gint" name="height" />
+          <parameter type="gint" name="rowstride" />
+          <parameter type="gdouble" array="true" name="page2buf" />
+          <parameter type="gboolean" name="alpha" />
         </parameters>
       </constructor>
     </object>
     <object name="PrintRGBP" cname="GnomePrintRGBP" parent="GnomePrintContext">
-      <field cname="margins" type="ArtDRect"/>
-      <field cname="dpix" type="gdouble"/>
-      <field cname="dpiy" type="gdouble"/>
-      <field cname="band_height" type="gint"/>
-      <field cname="meta" type="GnomePrintContext*"/>
+      <field cname="margins" type="ArtDRect" />
+      <field cname="dpix" type="gdouble" />
+      <field cname="dpiy" type="gdouble" />
+      <field cname="band_height" type="gint" />
+      <field cname="meta" type="GnomePrintContext*" />
       <method name="Construct" cname="gnome_print_rgbp_construct">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="ArtDRect*" name="margins"/>
-          <parameter type="gdouble" name="dpix"/>
-          <parameter type="gdouble" name="dpiy"/>
-          <parameter type="gint" name="band_height"/>
+          <parameter type="ArtDRect*" name="margins" />
+          <parameter type="gdouble" name="dpix" />
+          <parameter type="gdouble" name="dpiy" />
+          <parameter type="gint" name="band_height" />
         </parameters>
       </method>
       <method name="GetType" cname="gnome_print_rgbp_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <constructor cname="gnome_print_rgbp_new">
         <parameters>
-          <parameter type="ArtDRect*" name="margins"/>
-          <parameter type="gdouble" name="dpix"/>
-          <parameter type="gdouble" name="dpiy"/>
-          <parameter type="gint" name="band_height"/>
+          <parameter type="ArtDRect*" name="margins" />
+          <parameter type="gdouble" name="dpix" />
+          <parameter type="gdouble" name="dpiy" />
+          <parameter type="gint" name="band_height" />
         </parameters>
       </constructor>
     </object>
     <object name="PrintTransport" cname="GnomePrintTransport" parent="GObject">
       <method name="Close" cname="gnome_print_transport_close">
-        <return-type type="gint"/>
+        <return-type type="gint" />
       </method>
       <method name="Construct" cname="gnome_print_transport_construct">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="GnomePrintConfig*" name="config"/>
+          <parameter type="GnomePrintConfig*" name="config" />
         </parameters>
       </method>
       <method name="GetType" cname="gnome_print_transport_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <constructor cname="gnome_print_transport_new">
         <parameters>
-          <parameter type="GnomePrintConfig*" name="config"/>
+          <parameter type="GnomePrintConfig*" name="config" />
         </parameters>
       </constructor>
       <method name="Open" cname="gnome_print_transport_open">
-        <return-type type="gint"/>
+        <return-type type="gint" />
       </method>
       <method name="Printf" cname="gnome_print_transport_printf">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="const-char*" name="fmt"/>
-          <parameter ellipsis="true"/>
+          <parameter type="const-char*" name="fmt" />
+          <parameter ellipsis="true" />
         </parameters>
       </method>
       <method name="Write" cname="gnome_print_transport_write">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="const-guchar*" name="buf"/>
-          <parameter type="gint" name="len"/>
+          <parameter type="const-guchar*" name="buf" />
+          <parameter type="gint" name="len" />
         </parameters>
       </method>
     </object>
     <object name="RFont" cname="GnomeRFont" parent="GObject">
       <method name="GetClosestPangoFont" cname="gnome_rfont_get_closest_pango_font">
-        <return-type type="PangoFont*"/>
+        <return-type type="PangoFont*" />
         <parameters>
-          <parameter type="PangoFontMap*" name="map"/>
+          <parameter type="PangoFontMap*" name="map" />
         </parameters>
       </method>
       <method name="GetFace" cname="gnome_rfont_get_face">
-        <return-type type="GnomeFontFace*"/>
+        <return-type type="GnomeFontFace*" />
       </method>
       <method name="GetFont" cname="gnome_rfont_get_font">
-        <return-type type="GnomeFont*"/>
+        <return-type type="GnomeFont*" />
       </method>
       <method name="GetGlyphBpath" cname="gnome_rfont_get_glyph_bpath">
-        <return-type type="const-ArtBpath*"/>
+        <return-type type="const-ArtBpath*" />
         <parameters>
-          <parameter type="gint" name="glyph"/>
+          <parameter type="gint" name="glyph" />
         </parameters>
       </method>
       <method name="GetGlyphStdadvance" cname="gnome_rfont_get_glyph_stdadvance">
-        <return-type type="ArtPoint*"/>
+        <return-type type="ArtPoint*" />
         <parameters>
-          <parameter type="gint" name="glyph"/>
-          <parameter type="ArtPoint*" name="advance"/>
+          <parameter type="gint" name="glyph" />
+          <parameter type="ArtPoint*" name="advance" />
         </parameters>
       </method>
       <method name="GetGlyphStdbbox" cname="gnome_rfont_get_glyph_stdbbox">
-        <return-type type="ArtDRect*"/>
+        <return-type type="ArtDRect*" />
         <parameters>
-          <parameter type="gint" name="glyph"/>
-          <parameter type="ArtDRect*" name="bbox"/>
+          <parameter type="gint" name="glyph" />
+          <parameter type="ArtDRect*" name="bbox" />
         </parameters>
       </method>
       <method name="GetGlyphStdkerning" cname="gnome_rfont_get_glyph_stdkerning">
-        <return-type type="ArtPoint*"/>
+        <return-type type="ArtPoint*" />
         <parameters>
-          <parameter type="gint" name="glyph0"/>
-          <parameter type="gint" name="glyph1"/>
-          <parameter type="ArtPoint*" name="kerning"/>
+          <parameter type="gint" name="glyph0" />
+          <parameter type="gint" name="glyph1" />
+          <parameter type="ArtPoint*" name="kerning" />
         </parameters>
       </method>
       <method name="GetGlyphSvp" cname="gnome_rfont_get_glyph_svp">
-        <return-type type="const-ArtSVP*"/>
+        <return-type type="const-ArtSVP*" />
         <parameters>
-          <parameter type="gint" name="glyph"/>
+          <parameter type="gint" name="glyph" />
         </parameters>
       </method>
       <method name="GetMatrix" cname="gnome_rfont_get_matrix">
-        <return-type type="gdouble*"/>
+        <return-type type="gdouble*" />
         <parameters>
-          <parameter type="gdouble*" name="matrix"/>
+          <parameter type="gdouble*" name="matrix" />
         </parameters>
       </method>
       <method name="GetPangoDescription" cname="gnome_rfont_get_pango_description">
-        <return-type type="PangoFontDescription*"/>
+        <return-type type="PangoFontDescription*" />
       </method>
       <method name="GetType" cname="gnome_rfont_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
     </object>
     <struct name="GPFamilyEntry" cname="GPFamilyEntry">
-      <field cname="refcount" type="gint"/>
-      <field cname="name" type="gchar*"/>
-      <field cname="fonts" type="GSList*"/>
-      <field cname="is_alias" type="gboolean"/>
+      <field cname="refcount" type="gint" />
+      <field cname="name" type="gchar*" />
+      <field cname="fonts" type="GSList*" />
+      <field cname="is_alias" type="gboolean" />
     </struct>
     <struct name="GPFontEntry" cname="GPFontEntry">
-      <field cname="type" type="GPFontEntryType"/>
-      <field cname="refcount" type="gint"/>
-      <field cname="face" type="GnomeFontFace*"/>
-      <field cname="name" type="gchar*"/>
-      <field cname="familyname" type="gchar*"/>
-      <field cname="speciesname" type="gchar*"/>
-      <field cname="file" type="gchar*"/>
-      <field cname="weight" type="gchar*"/>
-      <field cname="italic_angle" type="gint"/>
-      <field cname="Weight" type="GnomeFontWeight"/>
-      <field cname="is_alias" type="gboolean"/>
+      <field cname="type" type="GPFontEntryType" />
+      <field cname="refcount" type="gint" />
+      <field cname="face" type="GnomeFontFace*" />
+      <field cname="name" type="gchar*" />
+      <field cname="familyname" type="gchar*" />
+      <field cname="speciesname" type="gchar*" />
+      <field cname="file" type="gchar*" />
+      <field cname="weight" type="gchar*" />
+      <field cname="italic_angle" type="gint" />
+      <field cname="Weight" type="GnomeFontWeight" />
+      <field cname="is_alias" type="gboolean" />
       <method name="Ref" cname="gp_font_entry_ref">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="Unref" cname="gp_font_entry_unref">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
     </struct>
     <struct name="GPFontEntryAlias" cname="GPFontEntryAlias">
-      <field cname="entry" type="GPFontEntry"/>
-      <field cname="ref" type="GPFontEntry*"/>
+      <field cname="entry" type="GPFontEntry" />
+      <field cname="ref" type="GPFontEntry*" />
     </struct>
     <struct name="GPFontMap" cname="GPFontMap">
-      <field cname="refcount" type="gint"/>
-      <field cname="num_fonts" type="gint"/>
-      <field cname="fontdict" type="GHashTable*"/>
-      <field cname="familydict" type="GHashTable*"/>
-      <field cname="fonts" type="GSList*"/>
-      <field cname="families" type="GSList*"/>
-      <field cname="fontlist" type="GList*"/>
-      <field cname="familylist" type="GList*"/>
+      <field cname="refcount" type="gint" />
+      <field cname="num_fonts" type="gint" />
+      <field cname="fontdict" type="GHashTable*" />
+      <field cname="familydict" type="GHashTable*" />
+      <field cname="fonts" type="GSList*" />
+      <field cname="families" type="GSList*" />
+      <field cname="fontlist" type="GList*" />
+      <field cname="familylist" type="GList*" />
       <method name="Get" cname="gp_fontmap_get" shared="true">
-        <return-type type="GPFontMap*"/>
+        <return-type type="GPFontMap*" />
       </method>
       <method name="LookupWeight" cname="gp_fontmap_lookup_weight" shared="true">
-        <return-type type="GnomeFontWeight"/>
+        <return-type type="GnomeFontWeight" />
         <parameters>
-          <parameter type="const-gchar*" name="weight"/>
+          <parameter type="const-gchar*" name="weight" />
         </parameters>
       </method>
       <method name="Release" cname="gp_fontmap_release">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
     </struct>
-    <struct name="GPGC" cname="GPGC" opaque="true"/>
+    <struct name="GPGC" cname="GPGC" opaque="true" />
     <struct name="GPPath" cname="GPPath" opaque="true">
       <method name="AllClosed" cname="gp_path_all_closed">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="AllOpen" cname="gp_path_all_open">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="AnyClosed" cname="gp_path_any_closed">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="AnyOpen" cname="gp_path_any_open">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="Bpath" cname="gp_path_bpath">
-        <return-type type="ArtBpath*"/>
+        <return-type type="ArtBpath*" />
       </method>
       <method name="CloseAll" cname="gp_path_close_all">
-        <return-type type="GPPath*"/>
+        <return-type type="GPPath*" />
       </method>
       <method name="ClosedParts" cname="gp_path_closed_parts">
-        <return-type type="GPPath*"/>
+        <return-type type="GPPath*" />
       </method>
       <method name="Closepath" cname="gp_path_closepath">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="ClosepathCurrent" cname="gp_path_closepath_current">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="Concat" cname="gp_path_concat" shared="true">
-        <return-type type="GPPath*"/>
+        <return-type type="GPPath*" />
         <parameters>
-          <parameter type="const-GSList*" name="list"/>
+          <parameter type="const-GSList*" name="list" />
         </parameters>
       </method>
       <method name="Copy" cname="gp_path_copy">
-        <return-type type="GPPath*"/>
+        <return-type type="GPPath*" />
         <parameters>
-          <parameter type="const-GPPath*" name="src"/>
+          <parameter type="const-GPPath*" name="src" />
         </parameters>
       </method>
       <method name="Currentpoint" cname="gp_path_currentpoint">
-        <return-type type="ArtPoint*"/>
+        <return-type type="ArtPoint*" />
         <parameters>
-          <parameter type="ArtPoint*" name="p"/>
+          <parameter type="ArtPoint*" name="p" />
         </parameters>
       </method>
       <method name="Curveto" cname="gp_path_curveto">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gdouble" name="x0"/>
-          <parameter type="gdouble" name="y0"/>
-          <parameter type="gdouble" name="x1"/>
-          <parameter type="gdouble" name="y1"/>
-          <parameter type="gdouble" name="x2"/>
-          <parameter type="gdouble" name="y2"/>
+          <parameter type="gdouble" name="x0" />
+          <parameter type="gdouble" name="y0" />
+          <parameter type="gdouble" name="x1" />
+          <parameter type="gdouble" name="y1" />
+          <parameter type="gdouble" name="x2" />
+          <parameter type="gdouble" name="y2" />
         </parameters>
       </method>
       <method name="Duplicate" cname="gp_path_duplicate">
-        <return-type type="GPPath*"/>
+        <return-type type="GPPath*" />
       </method>
       <method name="EnsureSpace" cname="gp_path_ensure_space">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="space"/>
+          <parameter type="gint" name="space" />
         </parameters>
       </method>
       <method name="Finish" cname="gp_path_finish">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="FirstBpath" cname="gp_path_first_bpath">
-        <return-type type="ArtBpath*"/>
+        <return-type type="ArtBpath*" />
       </method>
       <method name="HasCurrentpoint" cname="gp_path_has_currentpoint">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="IsEmpty" cname="gp_path_is_empty">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="LastBpath" cname="gp_path_last_bpath">
-        <return-type type="ArtBpath*"/>
+        <return-type type="ArtBpath*" />
       </method>
       <method name="Length" cname="gp_path_length">
-        <return-type type="gint"/>
+        <return-type type="gint" />
       </method>
       <method name="Lineto" cname="gp_path_lineto">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gdouble" name="x"/>
-          <parameter type="gdouble" name="y"/>
+          <parameter type="gdouble" name="x" />
+          <parameter type="gdouble" name="y" />
         </parameters>
       </method>
       <method name="LinetoMoving" cname="gp_path_lineto_moving">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gdouble" name="x"/>
-          <parameter type="gdouble" name="y"/>
+          <parameter type="gdouble" name="x" />
+          <parameter type="gdouble" name="y" />
         </parameters>
       </method>
       <method name="Moveto" cname="gp_path_moveto">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gdouble" name="x"/>
-          <parameter type="gdouble" name="y"/>
+          <parameter type="gdouble" name="x" />
+          <parameter type="gdouble" name="y" />
         </parameters>
       </method>
-      <constructor cname="gp_path_new"/>
+      <constructor cname="gp_path_new" />
       <constructor cname="gp_path_new_from_bpath">
         <parameters>
-          <parameter type="ArtBpath*" name="bpath"/>
+          <parameter type="ArtBpath*" name="bpath" />
         </parameters>
       </constructor>
       <constructor cname="gp_path_new_from_foreign_bpath">
         <parameters>
-          <parameter type="const-ArtBpath*" name="bpath"/>
+          <parameter type="const-ArtBpath*" name="bpath" />
         </parameters>
       </constructor>
       <constructor cname="gp_path_new_from_static_bpath">
         <parameters>
-          <parameter type="ArtBpath*" name="bpath"/>
+          <parameter type="ArtBpath*" name="bpath" />
         </parameters>
       </constructor>
       <constructor cname="gp_path_new_sized">
         <parameters>
-          <parameter type="gint" name="length"/>
+          <parameter type="gint" name="length" />
         </parameters>
       </constructor>
       <method name="OpenParts" cname="gp_path_open_parts">
-        <return-type type="GPPath*"/>
+        <return-type type="GPPath*" />
       </method>
       <method name="Ref" cname="gp_path_ref">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="Reset" cname="gp_path_reset">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="Split" cname="gp_path_split">
-        <return-type type="GSList*"/>
+        <return-type type="GSList*" />
       </method>
       <method name="Unref" cname="gp_path_unref">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
     </struct>
     <boxed name="GlyphList" cname="GnomeGlyphList" opaque="true">
       <method name="Advance" cname="gnome_glyphlist_advance">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="advance"/>
+          <parameter type="gboolean" name="advance" />
         </parameters>
       </method>
       <method name="Bbox" cname="gnome_glyphlist_bbox">
-        <return-type type="ArtDRect*"/>
+        <return-type type="ArtDRect*" />
         <parameters>
-          <parameter type="const-gdouble*" name="transform"/>
-          <parameter type="gint" name="flags"/>
-          <parameter type="ArtDRect*" name="bbox"/>
+          <parameter type="const-gdouble*" name="transform" />
+          <parameter type="gint" name="flags" />
+          <parameter type="ArtDRect*" name="bbox" />
         </parameters>
       </method>
       <method name="Check" cname="gnome_glyphlist_check">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="gboolean" name="rules"/>
+          <parameter type="gboolean" name="rules" />
         </parameters>
       </method>
       <method name="Color" cname="gnome_glyphlist_color">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="guint32" name="color"/>
+          <parameter type="guint32" name="color" />
         </parameters>
       </method>
       <method name="Duplicate" cname="gnome_glyphlist_duplicate">
-        <return-type type="GnomeGlyphList*"/>
+        <return-type type="GnomeGlyphList*" />
       </method>
       <method name="Font" cname="gnome_glyphlist_font">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeFont*" name="font"/>
+          <parameter type="GnomeFont*" name="font" />
         </parameters>
       </method>
       <method name="FromTextDumb" cname="gnome_glyphlist_from_text_dumb" shared="true">
-        <return-type type="GnomeGlyphList*"/>
+        <return-type type="GnomeGlyphList*" />
         <parameters>
-          <parameter type="GnomeFont*" name="font"/>
-          <parameter type="guint32" name="color"/>
-          <parameter type="gdouble" name="kerning"/>
-          <parameter type="gdouble" name="letterspace"/>
-          <parameter type="const-gchar*" name="text"/>
+          <parameter type="GnomeFont*" name="font" />
+          <parameter type="guint32" name="color" />
+          <parameter type="gdouble" name="kerning" />
+          <parameter type="gdouble" name="letterspace" />
+          <parameter name="text" type="const-gchar*" />
         </parameters>
       </method>
       <method name="FromTextSizedDumb" cname="gnome_glyphlist_from_text_sized_dumb" shared="true">
-        <return-type type="GnomeGlyphList*"/>
+        <return-type type="GnomeGlyphList*" />
         <parameters>
-          <parameter type="GnomeFont*" name="font"/>
-          <parameter type="guint32" name="color"/>
-          <parameter type="gdouble" name="kerning"/>
-          <parameter type="gdouble" name="letterspace"/>
-          <parameter type="const-gchar*" name="text"/>
-          <parameter type="gint" name="length"/>
+          <parameter type="GnomeFont*" name="font" />
+          <parameter type="guint32" name="color" />
+          <parameter type="gdouble" name="kerning" />
+          <parameter type="gdouble" name="letterspace" />
+          <parameter name="text" type="const-gchar*" />
+          <parameter type="gint" name="length" />
         </parameters>
       </method>
       <method name="GetType" cname="gnome_glyphlist_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="Glyph" cname="gnome_glyphlist_glyph">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="glyph"/>
+          <parameter type="gint" name="glyph" />
         </parameters>
       </method>
       <method name="Glyphs" cname="gnome_glyphlist_glyphs">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint*" name="glyphs"/>
-          <parameter type="gint" name="num_glyphs"/>
+          <parameter type="gint*" name="glyphs" />
+          <parameter type="gint" name="num_glyphs" />
         </parameters>
       </method>
       <method name="Kerning" cname="gnome_glyphlist_kerning">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gdouble" name="kerning"/>
+          <parameter type="gdouble" name="kerning" />
         </parameters>
       </method>
       <method name="Letterspace" cname="gnome_glyphlist_letterspace">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gdouble" name="letterspace"/>
+          <parameter type="gdouble" name="letterspace" />
         </parameters>
       </method>
       <method name="Moveto" cname="gnome_glyphlist_moveto">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gdouble" name="x"/>
-          <parameter type="gdouble" name="y"/>
+          <parameter type="gdouble" name="x" />
+          <parameter type="gdouble" name="y" />
         </parameters>
       </method>
-      <constructor cname="gnome_glyphlist_new"/>
+      <constructor cname="gnome_glyphlist_new" />
       <method name="Ref" cname="gnome_glyphlist_ref">
-        <return-type type="GnomeGlyphList*"/>
+        <return-type type="GnomeGlyphList*" />
       </method>
       <method name="Rmoveto" cname="gnome_glyphlist_rmoveto">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gdouble" name="x"/>
-          <parameter type="gdouble" name="y"/>
+          <parameter type="gdouble" name="x" />
+          <parameter type="gdouble" name="y" />
         </parameters>
       </method>
       <method name="TextDumb" cname="gnome_glyphlist_text_dumb">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="text"/>
+          <parameter name="text" type="const-gchar*" />
         </parameters>
       </method>
       <method name="TextSizedDumb" cname="gnome_glyphlist_text_sized_dumb">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="text"/>
-          <parameter type="gint" name="length"/>
+          <parameter name="text" type="const-gchar*" />
+          <parameter type="gint" name="length" />
         </parameters>
       </method>
       <method name="Unref" cname="gnome_glyphlist_unref">
-        <return-type type="GnomeGlyphList*"/>
+        <return-type type="GnomeGlyphList*" />
       </method>
     </boxed>
-    <struct name="PosGlyphList" cname="GnomePosGlyphList" opaque="true"/>
+    <struct name="PosGlyphList" cname="GnomePosGlyphList" opaque="true" />
     <struct name="PrintModule" cname="GnomePrintModule">
-      <field cname="flags" type="gint"/>
+      <field cname="flags" type="gint" />
       <method name="Init" cname="gnome_print_module_init" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
     </struct>
     <struct name="PrintPaper" cname="GnomePrintPaper">
-      <field cname="version" bits="8" type="guint"/>
-      <field cname="name" type="guchar*"/>
-      <field cname="width" type="gdouble"/>
-      <field cname="height" type="gdouble"/>
+      <field cname="version" bits="8" type="guint" />
+      <field cname="name" type="guchar*" />
+      <field cname="width" type="gdouble" />
+      <field cname="height" type="gdouble" />
       <method name="FreeList" cname="gnome_print_paper_free_list" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GList*" name="papers"/>
+          <parameter type="GList*" name="papers" />
         </parameters>
       </method>
       <method name="GetByName" cname="gnome_print_paper_get_by_name" shared="true">
-        <return-type type="const-GnomePrintPaper*"/>
+        <return-type type="const-GnomePrintPaper*" />
         <parameters>
-          <parameter type="const-gchar*" name="name"/>
+          <parameter name="name" type="const-gchar*" />
         </parameters>
       </method>
       <method name="GetBySize" cname="gnome_print_paper_get_by_size" shared="true">
-        <return-type type="const-GnomePrintPaper*"/>
+        <return-type type="const-GnomePrintPaper*" />
         <parameters>
-          <parameter type="gdouble" name="width"/>
-          <parameter type="gdouble" name="height"/>
+          <parameter type="gdouble" name="width" />
+          <parameter type="gdouble" name="height" />
         </parameters>
       </method>
       <method name="GetClosestBySize" cname="gnome_print_paper_get_closest_by_size" shared="true">
-        <return-type type="const-GnomePrintPaper*"/>
+        <return-type type="const-GnomePrintPaper*" />
         <parameters>
-          <parameter type="gdouble" name="width"/>
-          <parameter type="gdouble" name="height"/>
-          <parameter type="gboolean" name="mustfit"/>
+          <parameter type="gdouble" name="width" />
+          <parameter type="gdouble" name="height" />
+          <parameter type="gboolean" name="mustfit" />
         </parameters>
       </method>
       <method name="GetDefault" cname="gnome_print_paper_get_default" shared="true">
-        <return-type type="const-GnomePrintPaper*"/>
+        <return-type type="const-GnomePrintPaper*" />
       </method>
       <method name="GetList" cname="gnome_print_paper_get_list" shared="true">
-        <return-type type="GList*"/>
+        <return-type type="GList*" />
       </method>
     </struct>
     <boxed name="PrintUnit" cname="GnomePrintUnit">
-      <field cname="version" bits="8" type="guint"/>
-      <field cname="base" bits="8" type="guint"/>
-      <field cname="unittobase" type="gdouble"/>
-      <field cname="name" type="guchar*"/>
-      <field cname="abbr" type="guchar*"/>
-      <field cname="plural" type="guchar*"/>
-      <field cname="abbr_plural" type="guchar*"/>
+      <field cname="version" bits="8" type="guint" />
+      <field cname="base" bits="8" type="guint" />
+      <field cname="unittobase" type="gdouble" />
+      <field cname="name" type="guchar*" />
+      <field cname="abbr" type="guchar*" />
+      <field cname="plural" type="guchar*" />
+      <field cname="abbr_plural" type="guchar*" />
       <method name="FreeList" cname="gnome_print_unit_free_list" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GList*" name="units"/>
+          <parameter type="GList*" name="units" />
         </parameters>
       </method>
       <method name="GetByAbbreviation" cname="gnome_print_unit_get_by_abbreviation" shared="true">
-        <return-type type="const-GnomePrintUnit*"/>
+        <return-type type="const-GnomePrintUnit*" />
         <parameters>
-          <parameter type="const-gchar*" name="abbreviation"/>
+          <parameter name="abbreviation" type="const-gchar*" />
         </parameters>
       </method>
       <method name="GetByName" cname="gnome_print_unit_get_by_name" shared="true">
-        <return-type type="const-GnomePrintUnit*"/>
+        <return-type type="const-GnomePrintUnit*" />
         <parameters>
-          <parameter type="const-gchar*" name="name"/>
+          <parameter name="name" type="const-gchar*" />
         </parameters>
       </method>
       <method name="GetDefault" cname="gnome_print_unit_get_default" shared="true">
-        <return-type type="const-GnomePrintUnit*"/>
+        <return-type type="const-GnomePrintUnit*" />
       </method>
       <method name="GetIdentity" cname="gnome_print_unit_get_identity" shared="true">
-        <return-type type="const-GnomePrintUnit*"/>
+        <return-type type="const-GnomePrintUnit*" />
         <parameters>
-          <parameter type="guint" name="Base"/>
+          <parameter type="guint" name="Base" />
         </parameters>
       </method>
       <method name="GetList" cname="gnome_print_unit_get_list" shared="true">
-        <return-type type="GList*"/>
+        <return-type type="GList*" />
         <parameters>
-          <parameter type="guint" name="bases"/>
+          <parameter type="guint" name="bases" />
         </parameters>
       </method>
       <method name="GetName" cname="gnome_print_unit_get_name">
-        <return-type type="gchar*"/>
+        <return-type type="gchar*" />
         <parameters>
-          <parameter type="gboolean" name="plural"/>
-          <parameter type="gboolean" name="abbreviation"/>
-          <parameter type="gint" name="flags"/>
+          <parameter type="gboolean" name="plural" />
+          <parameter type="gboolean" name="abbreviation" />
+          <parameter type="gint" name="flags" />
         </parameters>
       </method>
       <method name="GetType" cname="gnome_print_unit_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
     </boxed>
     <struct name="GpaModuleInfo" cname="GpaModuleInfo">
       <callback cname="printer_list_append">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gpointer" name="printers"/>
+          <parameter type="gpointer" name="printers" />
         </parameters>
       </callback>
     </struct>
     <class name="Pgl" cname="GnomePgl_">
       <method name="Bbox" cname="gnome_pgl_bbox" shared="true">
-        <return-type type="ArtDRect*"/>
+        <return-type type="ArtDRect*" />
         <parameters>
-          <parameter type="const-GnomePosGlyphList*" name="pgl"/>
-          <parameter type="ArtDRect*" name="bbox"/>
+          <parameter type="const-GnomePosGlyphList*" name="pgl" />
+          <parameter type="ArtDRect*" name="bbox" />
         </parameters>
       </method>
       <method name="Destroy" cname="gnome_pgl_destroy" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomePosGlyphList*" name="pgl"/>
+          <parameter type="GnomePosGlyphList*" name="pgl" />
         </parameters>
       </method>
       <method name="FromGl" cname="gnome_pgl_from_gl" shared="true">
-        <return-type type="GnomePosGlyphList*"/>
+        <return-type type="GnomePosGlyphList*" />
         <parameters>
-          <parameter type="const-GnomeGlyphList*" name="gl"/>
-          <parameter type="const-gdouble*" name="transform"/>
-          <parameter type="guint" name="flags"/>
+          <parameter type="const-GnomeGlyphList*" name="gl" />
+          <parameter type="const-gdouble*" name="transform" />
+          <parameter type="guint" name="flags" />
         </parameters>
       </method>
       <method name="RenderRgb8" cname="gnome_pgl_render_rgb8" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-GnomePosGlyphList*" name="pgl"/>
-          <parameter type="gdouble" name="x"/>
-          <parameter type="gdouble" name="y"/>
-          <parameter type="guchar*" name="buf"/>
-          <parameter type="gint" name="width"/>
-          <parameter type="gint" name="height"/>
-          <parameter type="gint" name="rowstride"/>
-          <parameter type="guint" name="flags"/>
+          <parameter type="const-GnomePosGlyphList*" name="pgl" />
+          <parameter type="gdouble" name="x" />
+          <parameter type="gdouble" name="y" />
+          <parameter type="guchar*" name="buf" />
+          <parameter type="gint" name="width" />
+          <parameter type="gint" name="height" />
+          <parameter type="gint" name="rowstride" />
+          <parameter type="guint" name="flags" />
         </parameters>
       </method>
       <method name="RenderRgba8" cname="gnome_pgl_render_rgba8" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-GnomePosGlyphList*" name="pgl"/>
-          <parameter type="gdouble" name="x"/>
-          <parameter type="gdouble" name="y"/>
-          <parameter type="guchar*" name="buf"/>
-          <parameter type="gint" name="width"/>
-          <parameter type="gint" name="height"/>
-          <parameter type="gint" name="rowstride"/>
-          <parameter type="guint" name="flags"/>
+          <parameter type="const-GnomePosGlyphList*" name="pgl" />
+          <parameter type="gdouble" name="x" />
+          <parameter type="gdouble" name="y" />
+          <parameter type="guchar*" name="buf" />
+          <parameter type="gint" name="width" />
+          <parameter type="gint" name="height" />
+          <parameter type="gint" name="rowstride" />
+          <parameter type="guint" name="flags" />
         </parameters>
       </method>
       <method name="TestPoint" cname="gnome_pgl_test_point" shared="true">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="const-GnomePosGlyphList*" name="pgl"/>
-          <parameter type="gdouble" name="x"/>
-          <parameter type="gdouble" name="y"/>
+          <parameter type="const-GnomePosGlyphList*" name="pgl" />
+          <parameter type="gdouble" name="x" />
+          <parameter type="gdouble" name="y" />
         </parameters>
       </method>
     </class>
     <class name="Print" cname="GnomePrint_">
       <method name="Arcto" cname="gnome_print_arcto" shared="true">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="GnomePrintContext*" name="pc"/>
-          <parameter type="gdouble" name="x"/>
-          <parameter type="gdouble" name="y"/>
-          <parameter type="gdouble" name="radius"/>
-          <parameter type="gdouble" name="angle1"/>
-          <parameter type="gdouble" name="angle2"/>
-          <parameter type="gint" name="direction"/>
+          <parameter type="GnomePrintContext*" name="pc" />
+          <parameter type="gdouble" name="x" />
+          <parameter type="gdouble" name="y" />
+          <parameter type="gdouble" name="radius" />
+          <parameter type="gdouble" name="angle1" />
+          <parameter type="gdouble" name="angle2" />
+          <parameter type="gint" name="direction" />
         </parameters>
       </method>
       <method name="Beginpage" cname="gnome_print_beginpage" shared="true">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="GnomePrintContext*" name="pc"/>
-          <parameter type="const-gchar*" name="name"/>
+          <parameter type="GnomePrintContext*" name="pc" />
+          <parameter name="name" type="const-gchar*" />
         </parameters>
       </method>
       <method name="Bpath" cname="gnome_print_bpath" shared="true">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="GnomePrintContext*" name="pc"/>
-          <parameter type="const-ArtBpath*" name="bpath"/>
-          <parameter type="gboolean" name="append"/>
+          <parameter type="GnomePrintContext*" name="pc" />
+          <parameter type="const-ArtBpath*" name="bpath" />
+          <parameter type="gboolean" name="append" />
         </parameters>
       </method>
       <method name="Clip" cname="gnome_print_clip" shared="true">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="GnomePrintContext*" name="pc"/>
+          <parameter type="GnomePrintContext*" name="pc" />
         </parameters>
       </method>
       <method name="Closepath" cname="gnome_print_closepath" shared="true">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="GnomePrintContext*" name="pc"/>
+          <parameter type="GnomePrintContext*" name="pc" />
         </parameters>
       </method>
       <method name="Concat" cname="gnome_print_concat" shared="true">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="GnomePrintContext*" name="pc"/>
-          <parameter type="const-gdouble*" name="matrix"/>
+          <parameter type="GnomePrintContext*" name="pc" />
+          <parameter type="const-gdouble*" name="matrix" />
         </parameters>
       </method>
       <method name="ConvertDistance" cname="gnome_print_convert_distance" shared="true">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="gdouble*" name="distance"/>
-          <parameter type="const-GnomePrintUnit*" name="from"/>
-          <parameter type="const-GnomePrintUnit*" name="to"/>
+          <parameter type="gdouble*" name="distance" />
+          <parameter type="const-GnomePrintUnit*" name="from" />
+          <parameter type="const-GnomePrintUnit*" name="to" />
         </parameters>
       </method>
       <method name="ConvertDistanceFull" cname="gnome_print_convert_distance_full" shared="true">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="gdouble*" name="distance"/>
-          <parameter type="const-GnomePrintUnit*" name="from"/>
-          <parameter type="const-GnomePrintUnit*" name="to"/>
-          <parameter type="gdouble" name="ctmscale"/>
-          <parameter type="gdouble" name="devicescale"/>
+          <parameter type="gdouble*" name="distance" />
+          <parameter type="const-GnomePrintUnit*" name="from" />
+          <parameter type="const-GnomePrintUnit*" name="to" />
+          <parameter type="gdouble" name="ctmscale" />
+          <parameter type="gdouble" name="devicescale" />
         </parameters>
       </method>
       <method name="Curveto" cname="gnome_print_curveto" shared="true">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="GnomePrintContext*" name="pc"/>
-          <parameter type="gdouble" name="x1"/>
-          <parameter type="gdouble" name="y1"/>
-          <parameter type="gdouble" name="x2"/>
-          <parameter type="gdouble" name="y2"/>
-          <parameter type="gdouble" name="x3"/>
-          <parameter type="gdouble" name="y3"/>
+          <parameter type="GnomePrintContext*" name="pc" />
+          <parameter type="gdouble" name="x1" />
+          <parameter type="gdouble" name="y1" />
+          <parameter type="gdouble" name="x2" />
+          <parameter type="gdouble" name="y2" />
+          <parameter type="gdouble" name="x3" />
+          <parameter type="gdouble" name="y3" />
         </parameters>
       </method>
       <method name="DecodeAscii85" cname="gnome_print_decode_ascii85" shared="true">
-        <return-type type="int"/>
+        <return-type type="int" />
         <parameters>
-          <parameter type="const-gchar*" name="in"/>
-          <parameter type="guchar*" name="out"/>
-          <parameter type="gint" name="in_size"/>
+          <parameter name="in" type="const-gchar*" />
+          <parameter type="guchar*" name="out" />
+          <parameter type="gint" name="in_size" />
         </parameters>
       </method>
       <method name="DecodeAscii85Wcs" cname="gnome_print_decode_ascii85_wcs" shared="true">
-        <return-type type="int"/>
+        <return-type type="int" />
         <parameters>
-          <parameter type="gint" name="size"/>
+          <parameter type="gint" name="size" />
         </parameters>
       </method>
       <method name="DecodeHex" cname="gnome_print_decode_hex" shared="true">
-        <return-type type="int"/>
+        <return-type type="int" />
         <parameters>
-          <parameter type="const-gchar*" name="in"/>
-          <parameter type="guchar*" name="out"/>
-          <parameter type="gint*" name="in_size"/>
+          <parameter name="in" type="const-gchar*" />
+          <parameter type="guchar*" name="out" />
+          <parameter type="gint*" name="in_size" />
         </parameters>
       </method>
       <method name="DecodeHexWcs" cname="gnome_print_decode_hex_wcs" shared="true">
-        <return-type type="int"/>
+        <return-type type="int" />
         <parameters>
-          <parameter type="gint" name="size"/>
+          <parameter type="gint" name="size" />
         </parameters>
       </method>
       <method name="EncodeAscii85" cname="gnome_print_encode_ascii85" shared="true">
-        <return-type type="int"/>
+        <return-type type="int" />
         <parameters>
-          <parameter type="const-gchar*" name="in"/>
-          <parameter type="guchar*" name="out"/>
-          <parameter type="gint" name="in_size"/>
+          <parameter name="in" type="const-gchar*" />
+          <parameter type="guchar*" name="out" />
+          <parameter type="gint" name="in_size" />
         </parameters>
       </method>
       <method name="EncodeAscii85Wcs" cname="gnome_print_encode_ascii85_wcs" shared="true">
-        <return-type type="int"/>
+        <return-type type="int" />
         <parameters>
-          <parameter type="gint" name="size"/>
+          <parameter type="gint" name="size" />
         </parameters>
       </method>
       <method name="EncodeBlank" cname="gnome_print_encode_blank" shared="true">
-        <return-type type="int"/>
+        <return-type type="int" />
         <parameters>
-          <parameter type="const-gchar*" name="in"/>
-          <parameter type="gint" name="in_size"/>
+          <parameter name="in" type="const-gchar*" />
+          <parameter type="gint" name="in_size" />
         </parameters>
       </method>
       <method name="EncodeDeflate" cname="gnome_print_encode_deflate" shared="true">
-        <return-type type="int"/>
+        <return-type type="int" />
         <parameters>
-          <parameter type="const-gchar*" name="in"/>
-          <parameter type="guchar*" name="out"/>
-          <parameter type="gint" name="in_size"/>
-          <parameter type="gint" name="out_size"/>
+          <parameter name="in" type="const-gchar*" />
+          <parameter type="guchar*" name="out" />
+          <parameter type="gint" name="in_size" />
+          <parameter type="gint" name="out_size" />
         </parameters>
       </method>
       <method name="EncodeDeflateWcs" cname="gnome_print_encode_deflate_wcs" shared="true">
-        <return-type type="int"/>
+        <return-type type="int" />
         <parameters>
-          <parameter type="gint" name="size"/>
+          <parameter type="gint" name="size" />
         </parameters>
       </method>
       <method name="EncodeDrow" cname="gnome_print_encode_drow" shared="true">
-        <return-type type="int"/>
+        <return-type type="int" />
         <parameters>
-          <parameter type="const-gchar*" name="in"/>
-          <parameter type="guchar*" name="out"/>
-          <parameter type="gint" name="in_size"/>
-          <parameter type="guchar*" name="seed"/>
+          <parameter name="in" type="const-gchar*" />
+          <parameter type="guchar*" name="out" />
+          <parameter type="gint" name="in_size" />
+          <parameter type="guchar*" name="seed" />
         </parameters>
       </method>
       <method name="EncodeDrowWcs" cname="gnome_print_encode_drow_wcs" shared="true">
-        <return-type type="int"/>
+        <return-type type="int" />
         <parameters>
-          <parameter type="gint" name="size"/>
+          <parameter type="gint" name="size" />
         </parameters>
       </method>
       <method name="EncodeHex" cname="gnome_print_encode_hex" shared="true">
-        <return-type type="int"/>
+        <return-type type="int" />
         <parameters>
-          <parameter type="const-gchar*" name="in"/>
-          <parameter type="guchar*" name="out"/>
-          <parameter type="gint" name="in_size"/>
+          <parameter name="in" type="const-gchar*" />
+          <parameter type="guchar*" name="out" />
+          <parameter type="gint" name="in_size" />
         </parameters>
       </method>
       <method name="EncodeHexWcs" cname="gnome_print_encode_hex_wcs" shared="true">
-        <return-type type="int"/>
+        <return-type type="int" />
         <parameters>
-          <parameter type="gint" name="size"/>
+          <parameter type="gint" name="size" />
         </parameters>
       </method>
       <method name="EncodeRlc" cname="gnome_print_encode_rlc" shared="true">
-        <return-type type="int"/>
+        <return-type type="int" />
         <parameters>
-          <parameter type="const-gchar*" name="in"/>
-          <parameter type="guchar*" name="out"/>
-          <parameter type="gint" name="in_size"/>
+          <parameter name="in" type="const-gchar*" />
+          <parameter type="guchar*" name="out" />
+          <parameter type="gint" name="in_size" />
         </parameters>
       </method>
       <method name="EncodeRlcWcs" cname="gnome_print_encode_rlc_wcs" shared="true">
-        <return-type type="int"/>
+        <return-type type="int" />
         <parameters>
-          <parameter type="gint" name="size"/>
+          <parameter type="gint" name="size" />
         </parameters>
       </method>
       <method name="EncodeTiff" cname="gnome_print_encode_tiff" shared="true">
-        <return-type type="int"/>
+        <return-type type="int" />
         <parameters>
-          <parameter type="const-gchar*" name="in"/>
-          <parameter type="guchar*" name="out"/>
-          <parameter type="gint" name="in_size"/>
+          <parameter name="in" type="const-gchar*" />
+          <parameter type="guchar*" name="out" />
+          <parameter type="gint" name="in_size" />
         </parameters>
       </method>
       <method name="EncodeTiffWcs" cname="gnome_print_encode_tiff_wcs" shared="true">
-        <return-type type="int"/>
+        <return-type type="int" />
         <parameters>
-          <parameter type="gint" name="size"/>
+          <parameter type="gint" name="size" />
         </parameters>
       </method>
       <method name="Eoclip" cname="gnome_print_eoclip" shared="true">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="GnomePrintContext*" name="pc"/>
+          <parameter type="GnomePrintContext*" name="pc" />
         </parameters>
       </method>
       <method name="Eofill" cname="gnome_print_eofill" shared="true">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="GnomePrintContext*" name="pc"/>
+          <parameter type="GnomePrintContext*" name="pc" />
         </parameters>
       </method>
       <method name="Fill" cname="gnome_print_fill" shared="true">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="GnomePrintContext*" name="pc"/>
+          <parameter type="GnomePrintContext*" name="pc" />
         </parameters>
       </method>
       <method name="Glyphlist" cname="gnome_print_glyphlist" shared="true">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="GnomePrintContext*" name="pc"/>
-          <parameter type="GnomeGlyphList*" name="glyphlist"/>
+          <parameter type="GnomePrintContext*" name="pc" />
+          <parameter type="GnomeGlyphList*" name="glyphlist" />
         </parameters>
       </method>
       <method name="Grayimage" cname="gnome_print_grayimage" shared="true">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="GnomePrintContext*" name="pc"/>
-          <parameter type="const-guchar*" name="data"/>
-          <parameter type="gint" name="width"/>
-          <parameter type="gint" name="height"/>
-          <parameter type="gint" name="rowstride"/>
+          <parameter type="GnomePrintContext*" name="pc" />
+          <parameter type="const-guchar*" name="data" />
+          <parameter type="gint" name="width" />
+          <parameter type="gint" name="height" />
+          <parameter type="gint" name="rowstride" />
         </parameters>
       </method>
       <method name="Grestore" cname="gnome_print_grestore" shared="true">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="GnomePrintContext*" name="pc"/>
+          <parameter type="GnomePrintContext*" name="pc" />
         </parameters>
       </method>
       <method name="Gsave" cname="gnome_print_gsave" shared="true">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="GnomePrintContext*" name="pc"/>
+          <parameter type="GnomePrintContext*" name="pc" />
         </parameters>
       </method>
       <method name="LineStroked" cname="gnome_print_line_stroked" shared="true">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="GnomePrintContext*" name="pc"/>
-          <parameter type="gdouble" name="x0"/>
-          <parameter type="gdouble" name="y0"/>
-          <parameter type="gdouble" name="x1"/>
-          <parameter type="gdouble" name="y1"/>
+          <parameter type="GnomePrintContext*" name="pc" />
+          <parameter type="gdouble" name="x0" />
+          <parameter type="gdouble" name="y0" />
+          <parameter type="gdouble" name="x1" />
+          <parameter type="gdouble" name="y1" />
         </parameters>
       </method>
       <method name="Lineto" cname="gnome_print_lineto" shared="true">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="GnomePrintContext*" name="pc"/>
-          <parameter type="gdouble" name="x"/>
-          <parameter type="gdouble" name="y"/>
+          <parameter type="GnomePrintContext*" name="pc" />
+          <parameter type="gdouble" name="x" />
+          <parameter type="gdouble" name="y" />
         </parameters>
       </method>
       <method name="Moveto" cname="gnome_print_moveto" shared="true">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="GnomePrintContext*" name="pc"/>
-          <parameter type="gdouble" name="x"/>
-          <parameter type="gdouble" name="y"/>
+          <parameter type="GnomePrintContext*" name="pc" />
+          <parameter type="gdouble" name="x" />
+          <parameter type="gdouble" name="y" />
         </parameters>
       </method>
       <method name="Newpath" cname="gnome_print_newpath" shared="true">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="GnomePrintContext*" name="pc"/>
+          <parameter type="GnomePrintContext*" name="pc" />
         </parameters>
       </method>
       <method name="RectFilled" cname="gnome_print_rect_filled" shared="true">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="GnomePrintContext*" name="pc"/>
-          <parameter type="gdouble" name="x"/>
-          <parameter type="gdouble" name="y"/>
-          <parameter type="gdouble" name="width"/>
-          <parameter type="gdouble" name="height"/>
+          <parameter type="GnomePrintContext*" name="pc" />
+          <parameter type="gdouble" name="x" />
+          <parameter type="gdouble" name="y" />
+          <parameter type="gdouble" name="width" />
+          <parameter type="gdouble" name="height" />
         </parameters>
       </method>
       <method name="RectStroked" cname="gnome_print_rect_stroked" shared="true">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="GnomePrintContext*" name="pc"/>
-          <parameter type="gdouble" name="x"/>
-          <parameter type="gdouble" name="y"/>
-          <parameter type="gdouble" name="width"/>
-          <parameter type="gdouble" name="height"/>
+          <parameter type="GnomePrintContext*" name="pc" />
+          <parameter type="gdouble" name="x" />
+          <parameter type="gdouble" name="y" />
+          <parameter type="gdouble" name="width" />
+          <parameter type="gdouble" name="height" />
         </parameters>
       </method>
       <method name="Rgbaimage" cname="gnome_print_rgbaimage" shared="true">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="GnomePrintContext*" name="pc"/>
-          <parameter type="const-guchar*" name="data"/>
-          <parameter type="gint" name="width"/>
-          <parameter type="gint" name="height"/>
-          <parameter type="gint" name="rowstride"/>
+          <parameter type="GnomePrintContext*" name="pc" />
+          <parameter type="const-guchar*" name="data" />
+          <parameter type="gint" name="width" />
+          <parameter type="gint" name="height" />
+          <parameter type="gint" name="rowstride" />
         </parameters>
       </method>
       <method name="Rgbimage" cname="gnome_print_rgbimage" shared="true">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="GnomePrintContext*" name="pc"/>
-          <parameter type="const-guchar*" name="data"/>
-          <parameter type="gint" name="width"/>
-          <parameter type="gint" name="height"/>
-          <parameter type="gint" name="rowstride"/>
+          <parameter type="GnomePrintContext*" name="pc" />
+          <parameter type="const-guchar*" name="data" />
+          <parameter type="gint" name="width" />
+          <parameter type="gint" name="height" />
+          <parameter type="gint" name="rowstride" />
         </parameters>
       </method>
       <method name="Rotate" cname="gnome_print_rotate" shared="true">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="GnomePrintContext*" name="pc"/>
-          <parameter type="gdouble" name="theta"/>
+          <parameter type="GnomePrintContext*" name="pc" />
+          <parameter type="gdouble" name="theta" />
         </parameters>
       </method>
       <method name="Scale" cname="gnome_print_scale" shared="true">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="GnomePrintContext*" name="pc"/>
-          <parameter type="gdouble" name="sx"/>
-          <parameter type="gdouble" name="sy"/>
+          <parameter type="GnomePrintContext*" name="pc" />
+          <parameter type="gdouble" name="sx" />
+          <parameter type="gdouble" name="sy" />
         </parameters>
       </method>
       <method name="Setdash" cname="gnome_print_setdash" shared="true">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="GnomePrintContext*" name="pc"/>
-          <parameter type="gint" name="n_values"/>
-          <parameter type="const-gdouble*" name="values"/>
-          <parameter type="gdouble" name="offset"/>
+          <parameter type="GnomePrintContext*" name="pc" />
+          <parameter type="gint" name="n_values" />
+          <parameter type="const-gdouble*" name="values" />
+          <parameter type="gdouble" name="offset" />
         </parameters>
       </method>
       <method name="Setfont" cname="gnome_print_setfont" shared="true">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="GnomePrintContext*" name="pc"/>
-          <parameter type="const-GnomeFont*" name="font"/>
+          <parameter type="GnomePrintContext*" name="pc" />
+          <parameter type="const-GnomeFont*" name="font" />
         </parameters>
       </method>
       <method name="Setlinecap" cname="gnome_print_setlinecap" shared="true">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="GnomePrintContext*" name="pc"/>
-          <parameter type="gint" name="captype"/>
+          <parameter type="GnomePrintContext*" name="pc" />
+          <parameter type="gint" name="captype" />
         </parameters>
       </method>
       <method name="Setlinejoin" cname="gnome_print_setlinejoin" shared="true">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="GnomePrintContext*" name="pc"/>
-          <parameter type="gint" name="jointype"/>
+          <parameter type="GnomePrintContext*" name="pc" />
+          <parameter type="gint" name="jointype" />
         </parameters>
       </method>
       <method name="Setlinewidth" cname="gnome_print_setlinewidth" shared="true">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="GnomePrintContext*" name="pc"/>
-          <parameter type="gdouble" name="width"/>
+          <parameter type="GnomePrintContext*" name="pc" />
+          <parameter type="gdouble" name="width" />
         </parameters>
       </method>
       <method name="Setmiterlimit" cname="gnome_print_setmiterlimit" shared="true">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="GnomePrintContext*" name="pc"/>
-          <parameter type="gdouble" name="limit"/>
+          <parameter type="GnomePrintContext*" name="pc" />
+          <parameter type="gdouble" name="limit" />
         </parameters>
       </method>
       <method name="Setopacity" cname="gnome_print_setopacity" shared="true">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="GnomePrintContext*" name="pc"/>
-          <parameter type="gdouble" name="opacity"/>
+          <parameter type="GnomePrintContext*" name="pc" />
+          <parameter type="gdouble" name="opacity" />
         </parameters>
       </method>
       <method name="Setrgbcolor" cname="gnome_print_setrgbcolor" shared="true">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="GnomePrintContext*" name="pc"/>
-          <parameter type="gdouble" name="r"/>
-          <parameter type="gdouble" name="g"/>
-          <parameter type="gdouble" name="b"/>
+          <parameter type="GnomePrintContext*" name="pc" />
+          <parameter type="gdouble" name="r" />
+          <parameter type="gdouble" name="g" />
+          <parameter type="gdouble" name="b" />
         </parameters>
       </method>
       <method name="Show" cname="gnome_print_show" shared="true">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="GnomePrintContext*" name="pc"/>
-          <parameter type="const-gchar*" name="text"/>
+          <parameter type="GnomePrintContext*" name="pc" />
+          <parameter name="text" type="const-gchar*" />
         </parameters>
       </method>
       <method name="ShowSized" cname="gnome_print_show_sized" shared="true">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="GnomePrintContext*" name="pc"/>
-          <parameter type="const-gchar*" name="text"/>
-          <parameter type="gint" name="bytes"/>
+          <parameter type="GnomePrintContext*" name="pc" />
+          <parameter name="text" type="const-gchar*" />
+          <parameter type="gint" name="bytes" />
         </parameters>
       </method>
       <method name="Showpage" cname="gnome_print_showpage" shared="true">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="GnomePrintContext*" name="pc"/>
+          <parameter type="GnomePrintContext*" name="pc" />
         </parameters>
       </method>
       <method name="Stroke" cname="gnome_print_stroke" shared="true">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="GnomePrintContext*" name="pc"/>
+          <parameter type="GnomePrintContext*" name="pc" />
         </parameters>
       </method>
       <method name="Strokepath" cname="gnome_print_strokepath" shared="true">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="GnomePrintContext*" name="pc"/>
+          <parameter type="GnomePrintContext*" name="pc" />
         </parameters>
       </method>
       <method name="Translate" cname="gnome_print_translate" shared="true">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="GnomePrintContext*" name="pc"/>
-          <parameter type="gdouble" name="x"/>
-          <parameter type="gdouble" name="y"/>
+          <parameter type="GnomePrintContext*" name="pc" />
+          <parameter type="gdouble" name="x" />
+          <parameter type="gdouble" name="y" />
         </parameters>
       </method>
       <method name="Vpath" cname="gnome_print_vpath" shared="true">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="GnomePrintContext*" name="pc"/>
-          <parameter type="const-ArtVpath*" name="vpath"/>
-          <parameter type="gboolean" name="append"/>
+          <parameter type="GnomePrintContext*" name="pc" />
+          <parameter type="const-ArtVpath*" name="vpath" />
+          <parameter type="gboolean" name="append" />
         </parameters>
       </method>
     </class>
   </namespace>
   <namespace name="Gnome" library="gnomeprintui-2-2">
     <enum name="PaperSelectorFlags" cname="GnomePaperSelectorFlags" type="enum">
-      <member cname="GNOME_PAPER_SELECTOR_MARGINS" name="Margins"/>
-      <member cname="GNOME_PAPER_SELECTOR_FEED_ORIENTATION" name="FeedOrientation"/>
+      <member cname="GNOME_PAPER_SELECTOR_MARGINS" name="Margins" />
+      <member cname="GNOME_PAPER_SELECTOR_FEED_ORIENTATION" name="FeedOrientation" />
     </enum>
     <enum name="PrintButtons" cname="GnomePrintButtons" type="enum">
-      <member cname="GNOME_PRINT_DIALOG_RESPONSE_PRINT" name="Print" value="1"/>
-      <member cname="GNOME_PRINT_DIALOG_RESPONSE_PREVIEW" name="Preview"/>
-      <member cname="GNOME_PRINT_DIALOG_RESPONSE_CANCEL" name="Cancel"/>
+      <member cname="GNOME_PRINT_DIALOG_RESPONSE_PRINT" name="Print" value="1" />
+      <member cname="GNOME_PRINT_DIALOG_RESPONSE_PREVIEW" name="Preview" />
+      <member cname="GNOME_PRINT_DIALOG_RESPONSE_CANCEL" name="Cancel" />
     </enum>
     <enum name="PrintDialogFlags" cname="GnomePrintDialogFlags" type="enum">
-      <member cname="GNOME_PRINT_DIALOG_RANGE" name="Range"/>
-      <member cname="GNOME_PRINT_DIALOG_COPIES" name="Copies"/>
+      <member cname="GNOME_PRINT_DIALOG_RANGE" name="Range" />
+      <member cname="GNOME_PRINT_DIALOG_COPIES" name="Copies" />
     </enum>
     <enum name="PrintDialogRangeFlags" cname="GnomePrintDialogRangeFlags" type="enum">
-      <member cname="GNOME_PRINT_RANGE_CURRENT" name="Current"/>
-      <member cname="GNOME_PRINT_RANGE_ALL" name="All"/>
-      <member cname="GNOME_PRINT_RANGE_RANGE" name="Range"/>
-      <member cname="GNOME_PRINT_RANGE_SELECTION" name="Selection"/>
-      <member cname="GNOME_PRINT_RANGE_SELECTION_UNSENSITIVE" name="SelectionUnsensitive"/>
+      <member cname="GNOME_PRINT_RANGE_CURRENT" name="Current" />
+      <member cname="GNOME_PRINT_RANGE_ALL" name="All" />
+      <member cname="GNOME_PRINT_RANGE_RANGE" name="Range" />
+      <member cname="GNOME_PRINT_RANGE_SELECTION" name="Selection" />
+      <member cname="GNOME_PRINT_RANGE_SELECTION_UNSENSITIVE" name="SelectionUnsensitive" />
     </enum>
     <enum name="PrintRangeType" cname="GnomePrintRangeType" type="enum">
-      <member cname="GNOME_PRINT_RANGETYPE_NONE" name="None"/>
-      <member cname="GNOME_PRINT_RANGETYPE_CUSTOM" name="Custom"/>
-      <member cname="GNOME_PRINT_RANGETYPE_PAGES" name="Pages"/>
+      <member cname="GNOME_PRINT_RANGETYPE_NONE" name="None" />
+      <member cname="GNOME_PRINT_RANGETYPE_CUSTOM" name="Custom" />
+      <member cname="GNOME_PRINT_RANGETYPE_PAGES" name="Pages" />
     </enum>
     <object name="CanvasHacktext" cname="GnomeCanvasHacktext" parent="GnomeCanvasItem">
-      <field cname="text" type="char*"/>
-      <field cname="fill_color" type="guint"/>
-      <field cname="fill_pixel" type="gulong"/>
-      <field cname="fill_set" bits="1" type="guint"/>
-      <field cname="size" type="double"/>
-      <field cname="x" type="double"/>
-      <field cname="y" type="double"/>
-      <field cname="fill_rgba" type="guint32"/>
-      <field cname="priv" type="GnomeCanvasHacktextPriv*"/>
-      <property name="Text" cname="text" type="gchar*" readable="true" writeable="true"/>
-      <property name="X" cname="x" type="gdouble" readable="true" writeable="true"/>
-      <property name="Y" cname="y" type="gdouble" readable="true" writeable="true"/>
-      <property name="Glyphlist" cname="glyphlist" type="gpointer" readable="true" writeable="true"/>
-      <property name="FillColor" cname="fill_color" type="gchar*" writeable="true"/>
-      <property name="FillColorRgba" cname="fill_color_rgba" type="guint" readable="true" writeable="true"/>
-      <property name="Font" cname="font" type="GnomeFont" readable="true" writeable="true"/>
+      <field cname="text" type="char*" />
+      <field cname="fill_color" type="guint" />
+      <field cname="fill_pixel" type="gulong" />
+      <field cname="fill_set" bits="1" type="guint" />
+      <field cname="size" type="double" />
+      <field cname="x" type="double" />
+      <field cname="y" type="double" />
+      <field cname="fill_rgba" type="guint32" />
+      <field cname="priv" type="GnomeCanvasHacktextPriv*" />
+      <property name="Text" cname="text" type="gchar*" readable="true" writeable="true" />
+      <property name="X" cname="x" type="gdouble" readable="true" writeable="true" />
+      <property name="Y" cname="y" type="gdouble" readable="true" writeable="true" />
+      <property name="Glyphlist" cname="glyphlist" type="gpointer" readable="true" writeable="true" />
+      <property name="FillColor" cname="fill_color" type="gchar*" writeable="true" />
+      <property name="FillColorRgba" cname="fill_color_rgba" type="guint" readable="true" writeable="true" />
+      <property name="Font" cname="font" type="GnomeFont" readable="true" writeable="true" />
       <method name="GetType" cname="gnome_canvas_hacktext_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
     </object>
     <object name="FontDialog" cname="GnomeFontDialog" parent="GtkDialog">
       <method name="GetFontsel" cname="gnome_font_dialog_get_fontsel">
-        <return-type type="GtkWidget*"/>
+        <return-type type="GtkWidget*" />
       </method>
       <method name="GetPreview" cname="gnome_font_dialog_get_preview">
-        <return-type type="GtkWidget*"/>
+        <return-type type="GtkWidget*" />
       </method>
       <method name="GetType" cname="gnome_font_dialog_get_type" shared="true">
-        <return-type type="GtkType"/>
+        <return-type type="GtkType" />
       </method>
       <constructor cname="gnome_font_dialog_new">
         <parameters>
-          <parameter type="const-gchar*" name="title"/>
+          <parameter type="const-gchar*" name="title" />
         </parameters>
       </constructor>
     </object>
     <object name="FontPreview" cname="GnomeFontPreview" parent="GtkImage">
       <method name="GetType" cname="gnome_font_preview_get_type" shared="true">
-        <return-type type="GtkType"/>
+        <return-type type="GtkType" />
       </method>
-      <constructor cname="gnome_font_preview_new"/>
+      <constructor cname="gnome_font_preview_new" />
       <method name="SetColor" cname="gnome_font_preview_set_color">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="guint32" name="color"/>
+          <parameter type="guint32" name="color" />
         </parameters>
       </method>
       <method name="SetFont" cname="gnome_font_preview_set_font">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeFont*" name="font"/>
+          <parameter type="GnomeFont*" name="font" />
         </parameters>
       </method>
       <method name="SetPhrase" cname="gnome_font_preview_set_phrase">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="phrase"/>
+          <parameter name="phrase" type="const-gchar*" />
         </parameters>
       </method>
     </object>
     <object name="FontSelection" cname="GnomeFontSelection" parent="GtkHBox">
       <signal name="FontSet" cname="font_set" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeFontSelection*" name="fontsel"/>
-          <parameter type="GnomeFont*" name="font"/>
+          <parameter type="GnomeFontSelection*" name="fontsel" />
+          <parameter type="GnomeFont*" name="font" />
         </parameters>
       </signal>
       <method name="GetFace" cname="gnome_font_selection_get_face">
-        <return-type type="GnomeFontFace*"/>
+        <return-type type="GnomeFontFace*" />
       </method>
       <method name="GetFont" cname="gnome_font_selection_get_font">
-        <return-type type="GnomeFont*"/>
+        <return-type type="GnomeFont*" />
       </method>
       <method name="GetSize" cname="gnome_font_selection_get_size">
-        <return-type type="gdouble"/>
+        <return-type type="gdouble" />
       </method>
       <method name="GetType" cname="gnome_font_selection_get_type" shared="true">
-        <return-type type="GtkType"/>
+        <return-type type="GtkType" />
       </method>
-      <constructor cname="gnome_font_selection_new"/>
+      <constructor cname="gnome_font_selection_new" />
       <method name="SetFont" cname="gnome_font_selection_set_font">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomeFont*" name="font"/>
+          <parameter type="GnomeFont*" name="font" />
         </parameters>
       </method>
     </object>
     <object name="PaperPreview" cname="GnomePaperPreview" parent="GtkHBox">
-      <field cname="canvas" type="GtkWidget*"/>
-      <field cname="item" type="GnomeCanvasItem*"/>
-      <field cname="config" type="GnomePrintConfig*"/>
+      <field cname="canvas" type="GtkWidget*" />
+      <field cname="item" type="GnomeCanvasItem*" />
+      <field cname="config" type="GnomePrintConfig*" />
       <method name="GetType" cname="gnome_paper_preview_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <constructor cname="gnome_paper_preview_new">
         <parameters>
-          <parameter type="GnomePrintConfig*" name="config"/>
+          <parameter type="GnomePrintConfig*" name="config" />
         </parameters>
       </constructor>
     </object>
     <object name="PaperSelector" cname="GnomePaperSelector" parent="GtkHBox">
       <method name="GetType" cname="gnome_paper_selector_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <constructor cname="gnome_paper_selector_new">
         <parameters>
-          <parameter type="GnomePrintConfig*" name="config"/>
+          <parameter type="GnomePrintConfig*" name="config" />
         </parameters>
       </constructor>
       <constructor cname="gnome_paper_selector_new_with_flags">
         <parameters>
-          <parameter type="GnomePrintConfig*" name="config"/>
-          <parameter type="gint" name="flags"/>
+          <parameter type="GnomePrintConfig*" name="config" />
+          <parameter type="gint" name="flags" />
         </parameters>
       </constructor>
     </object>
     <object name="PrinterSelector" cname="GnomePrinterSelector" parent="GPAWidget">
-      <field cname="accel_group" type="GtkAccelGroup*"/>
-      <field cname="printers" type="GtkWidget*"/>
-      <field cname="settings" type="GtkWidget*"/>
-      <field cname="transport" type="GtkWidget*"/>
-      <field cname="state" type="GtkWidget*"/>
-      <field cname="* type" type="GtkWidget*"/>
-      <field cname="* location" type="GtkWidget*"/>
-      <field cname="* comment" type="GtkWidget*"/>
+      <field cname="accel_group" type="GtkAccelGroup*" />
+      <field cname="printers" type="GtkWidget*" />
+      <field cname="settings" type="GtkWidget*" />
+      <field cname="transport" type="GtkWidget*" />
+      <field cname="state" type="GtkWidget*" />
+      <field cname="* type" type="GtkWidget*" />
+      <field cname="* location" type="GtkWidget*" />
+      <field cname="* comment" type="GtkWidget*" />
       <method name="GetConfig" cname="gnome_printer_selector_get_config">
-        <return-type type="GnomePrintConfig*"/>
+        <return-type type="GnomePrintConfig*" />
       </method>
       <method name="GetType" cname="gnome_printer_selector_get_type" shared="true">
-        <return-type type="GtkType"/>
+        <return-type type="GtkType" />
       </method>
       <constructor cname="gnome_printer_selector_new">
         <parameters>
-          <parameter type="GnomePrintConfig*" name="config"/>
+          <parameter type="GnomePrintConfig*" name="config" />
         </parameters>
       </constructor>
-      <constructor cname="gnome_printer_selector_new_default"/>
+      <constructor cname="gnome_printer_selector_new_default" />
     </object>
     <object name="PrintCopiesSelector" cname="GnomePrintCopiesSelector" parent="GtkVBox">
       <signal name="CopiesSet" cname="copies_set" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomePrintCopiesSelector*" name="gpc"/>
-          <parameter type="gint" name="copies"/>
-          <parameter type="gboolean" name="collate"/>
+          <parameter type="GnomePrintCopiesSelector*" name="gpc" />
+          <parameter type="gint" name="copies" />
+          <parameter type="gboolean" name="collate" />
         </parameters>
       </signal>
       <method name="GetCollate" cname="gnome_print_copies_selector_get_collate">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetCopies" cname="gnome_print_copies_selector_get_copies">
-        <return-type type="gint"/>
+        <return-type type="gint" />
       </method>
       <method name="GetType" cname="gnome_print_copies_selector_get_type" shared="true">
-        <return-type type="GtkType"/>
+        <return-type type="GtkType" />
       </method>
-      <constructor cname="gnome_print_copies_selector_new"/>
+      <constructor cname="gnome_print_copies_selector_new" />
       <method name="SetCopies" cname="gnome_print_copies_selector_set_copies">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="copies"/>
-          <parameter type="gboolean" name="collate"/>
+          <parameter type="gint" name="copies" />
+          <parameter type="gboolean" name="collate" />
         </parameters>
       </method>
     </object>
     <object name="PrintDialog" cname="GnomePrintDialog" parent="GtkDialog">
-      <property name="PrintConfig" cname="print_config" type="gpointer" writeable="true" construct-only="true"/>
+      <property name="PrintConfig" cname="print_config" type="gpointer" writeable="true" construct-only="true" />
       <method name="Construct" cname="gnome_print_dialog_construct">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="title"/>
-          <parameter type="gint" name="flags"/>
+          <parameter name="title" type="const-gchar*" />
+          <parameter type="gint" name="flags" />
         </parameters>
       </method>
       <method name="ConstructRangeAny" cname="gnome_print_dialog_construct_range_any">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="flags"/>
-          <parameter type="GtkWidget*" name="range_widget"/>
-          <parameter type="const-gchar*" name="currentlabel"/>
-          <parameter type="const-gchar*" name="rangelabel"/>
+          <parameter type="gint" name="flags" />
+          <parameter type="GtkWidget*" name="range_widget" />
+          <parameter name="currentlabel" type="const-gchar*" />
+          <parameter name="rangelabel" type="const-gchar*" />
         </parameters>
       </method>
       <method name="ConstructRangeCustom" cname="gnome_print_dialog_construct_range_custom">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="custom"/>
+          <parameter type="GtkWidget*" name="custom" />
         </parameters>
       </method>
       <method name="ConstructRangePage" cname="gnome_print_dialog_construct_range_page">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="flags"/>
-          <parameter type="gint" name="start"/>
-          <parameter type="gint" name="end"/>
-          <parameter type="const-gchar*" name="currentlabel"/>
-          <parameter type="const-gchar*" name="rangelabel"/>
+          <parameter type="gint" name="flags" />
+          <parameter type="gint" name="start" />
+          <parameter type="gint" name="end" />
+          <parameter name="currentlabel" type="const-gchar*" />
+          <parameter name="rangelabel" type="const-gchar*" />
         </parameters>
       </method>
       <method name="GetConfig" cname="gnome_print_dialog_get_config">
-        <return-type type="GnomePrintConfig*"/>
+        <return-type type="GnomePrintConfig*" />
       </method>
       <method name="GetCopies" cname="gnome_print_dialog_get_copies">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint*" name="copies"/>
-          <parameter type="gint*" name="collate"/>
+          <parameter type="gint*" name="copies" />
+          <parameter type="gint*" name="collate" />
         </parameters>
       </method>
       <method name="GetRange" cname="gnome_print_dialog_get_range">
-        <return-type type="GnomePrintRangeType"/>
+        <return-type type="GnomePrintRangeType" />
       </method>
       <method name="GetRangePage" cname="gnome_print_dialog_get_range_page">
-        <return-type type="int"/>
+        <return-type type="int" />
         <parameters>
-          <parameter type="gint*" name="start"/>
-          <parameter type="gint*" name="end"/>
+          <parameter type="gint*" name="start" />
+          <parameter type="gint*" name="end" />
         </parameters>
       </method>
       <method name="GetType" cname="gnome_print_dialog_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <constructor cname="gnome_print_dialog_new">
         <parameters>
-          <parameter type="GnomePrintJob*" name="gpj"/>
-          <parameter type="const-gchar*" name="title"/>
-          <parameter type="GnomePrintDialogFlags" name="flags"/>
+          <parameter type="GnomePrintJob*" name="gpj" />
+          <parameter name="title" type="const-gchar*" />
+          <parameter name="flags" type="GnomePrintDialogFlags" />
         </parameters>
       </constructor>
       <method name="SetCopies" cname="gnome_print_dialog_set_copies">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="copies"/>
-          <parameter type="gint" name="collate"/>
+          <parameter type="gint" name="copies" />
+          <parameter type="gint" name="collate" />
         </parameters>
       </method>
     </object>
     <object name="PrintJobPreview" cname="GnomePrintJobPreview" parent="GtkWindow">
       <method name="GetType" cname="gnome_print_job_preview_get_type" shared="true">
-        <return-type type="GtkType"/>
+        <return-type type="GtkType" />
       </method>
       <constructor cname="gnome_print_job_preview_new">
         <parameters>
-          <parameter type="GnomePrintJob*" name="gpm"/>
-          <parameter type="const-gchar*" name="title"/>
+          <parameter type="GnomePrintJob*" name="gpm" />
+          <parameter name="title" type="const-gchar*" />
         </parameters>
       </constructor>
     </object>
     <object name="PrintPreview" cname="GnomePrintPreview" parent="GnomePrintContext">
       <method name="GetType" cname="gnome_print_preview_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <constructor cname="gnome_print_preview_new">
         <parameters>
-          <parameter type="GnomePrintConfig*" name="config"/>
-          <parameter type="GnomeCanvas*" name="canvas"/>
+          <parameter type="GnomePrintConfig*" name="config" />
+          <parameter type="GnomeCanvas*" name="canvas" />
         </parameters>
       </constructor>
       <constructor cname="gnome_print_preview_new_full">
         <parameters>
-          <parameter type="GnomePrintConfig*" name="config"/>
-          <parameter type="GnomeCanvas*" name="canvas"/>
-          <parameter type="const-gdouble*" name="transform"/>
-          <parameter type="const-ArtDRect*" name="region"/>
+          <parameter type="GnomePrintConfig*" name="config" />
+          <parameter type="GnomeCanvas*" name="canvas" />
+          <parameter type="const-gdouble*" name="transform" />
+          <parameter type="const-ArtDRect*" name="region" />
         </parameters>
       </constructor>
     </object>
     <object name="PrintUnitSelector" cname="GnomePrintUnitSelector" parent="GtkHBox">
       <signal name="Modified" cname="modified" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomePrintUnitSelector*" name="selector"/>
+          <parameter type="GnomePrintUnitSelector*" name="selector" />
         </parameters>
       </signal>
       <method name="AddAdjustment" cname="gnome_print_unit_selector_add_adjustment">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkAdjustment*" name="adjustment"/>
+          <parameter type="GtkAdjustment*" name="adjustment" />
         </parameters>
       </method>
       <method name="GetType" cname="gnome_print_unit_selector_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="GetUnit" cname="gnome_print_unit_selector_get_unit">
-        <return-type type="const-GnomePrintUnit*"/>
+        <return-type type="const-GnomePrintUnit*" />
       </method>
       <constructor cname="gnome_print_unit_selector_new">
         <parameters>
-          <parameter type="guint" name="bases"/>
+          <parameter type="guint" name="bases" />
         </parameters>
       </constructor>
       <method name="RemoveAdjustment" cname="gnome_print_unit_selector_remove_adjustment">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkAdjustment*" name="adjustment"/>
+          <parameter type="GtkAdjustment*" name="adjustment" />
         </parameters>
       </method>
       <method name="SetBases" cname="gnome_print_unit_selector_set_bases">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="guint" name="bases"/>
+          <parameter type="guint" name="bases" />
         </parameters>
       </method>
       <method name="SetUnit" cname="gnome_print_unit_selector_set_unit">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-GnomePrintUnit*" name="unit"/>
+          <parameter type="const-GnomePrintUnit*" name="unit" />
         </parameters>
       </method>
     </object>
-    <struct name="CanvasHacktextPriv" cname="GnomeCanvasHacktextPriv" opaque="true"/>
+    <struct name="CanvasHacktextPriv" cname="GnomeCanvasHacktextPriv" opaque="true" />
   </namespace>
   <namespace name="Gnome" library="gnomeprintui-2-2">
     <object name="GPAOptionMenu" cname="GPAOptionMenu" parent="GPAWidget">
-      <field cname="menu" type="GtkWidget*"/>
-      <field cname="node" type="GPANode*"/>
-      <field cname="config" type="GPANode*"/>
-      <field cname="key" type="gchar*"/>
-      <field cname="handler" type="gulong"/>
-      <field cname="handler_config" type="gulong"/>
-      <field cname="updating" type="gboolean"/>
+      <field cname="menu" type="GtkWidget*" />
+      <field cname="node" type="GPANode*" />
+      <field cname="config" type="GPANode*" />
+      <field cname="key" type="gchar*" />
+      <field cname="handler" type="gulong" />
+      <field cname="handler_config" type="gulong" />
+      <field cname="updating" type="gboolean" />
       <method name="GetType" cname="gpa_option_menu_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <constructor cname="gpa_option_menu_new">
         <parameters>
-          <parameter type="GnomePrintConfig*" name="config"/>
-          <parameter type="const-gchar*" name="key"/>
+          <parameter type="GnomePrintConfig*" name="config" />
+          <parameter name="key" type="const-gchar*" />
         </parameters>
       </constructor>
     </object>
     <object name="GpaPaperPreviewItem" cname="GpaPaperPreviewItem" parent="GnomeCanvasItem">
       <method name="GetType" cname="gpa_paper_preview_item_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <constructor cname="gpa_paper_preview_item_new">
         <parameters>
-          <parameter type="GnomePrintConfig*" name="config"/>
-          <parameter type="GtkWidget*" name="widget"/>
+          <parameter type="GnomePrintConfig*" name="config" />
+          <parameter type="GtkWidget*" name="widget" />
         </parameters>
       </constructor>
       <method name="SetLmHighlights" cname="gpa_paper_preview_item_set_lm_highlights">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="mt"/>
-          <parameter type="gboolean" name="mb"/>
-          <parameter type="gboolean" name="ml"/>
-          <parameter type="gboolean" name="mr"/>
+          <parameter type="gboolean" name="mt" />
+          <parameter type="gboolean" name="mb" />
+          <parameter type="gboolean" name="ml" />
+          <parameter type="gboolean" name="mr" />
         </parameters>
       </method>
     </object>
     <object name="GPAPrinterSelector" cname="GPAPrinterSelector" parent="GPAWidget">
-      <field cname="menu" type="GtkWidget*"/>
-      <field cname="node" type="GPANode*"/>
-      <field cname="config" type="GPANode*"/>
-      <field cname="handler_config" type="gulong"/>
-      <field cname="updating" type="gboolean"/>
+      <field cname="menu" type="GtkWidget*" />
+      <field cname="node" type="GPANode*" />
+      <field cname="config" type="GPANode*" />
+      <field cname="handler_config" type="gulong" />
+      <field cname="updating" type="gboolean" />
       <method name="GetType" cname="gpa_printer_selector_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <constructor cname="gpa_printer_selector_new">
         <parameters>
-          <parameter type="GnomePrintConfig*" name="gpc"/>
+          <parameter type="GnomePrintConfig*" name="gpc" />
         </parameters>
       </constructor>
     </object>
     <object name="GPASettingsSelector" cname="GPASettingsSelector" parent="GPAWidget">
-      <field cname="menu" type="GtkWidget*"/>
-      <field cname="printer" type="GPANode*"/>
-      <field cname="settings" type="GPANode*"/>
-      <field cname="settingslist" type="GSList*"/>
-      <field cname="handler" type="guint"/>
+      <field cname="menu" type="GtkWidget*" />
+      <field cname="printer" type="GPANode*" />
+      <field cname="settings" type="GPANode*" />
+      <field cname="settingslist" type="GSList*" />
+      <field cname="handler" type="guint" />
       <method name="GetType" cname="gpa_settings_selector_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
     </object>
     <object name="GPATransportSelector" cname="GPATransportSelector" parent="GPAWidget">
-      <field cname="menu" type="GtkWidget*"/>
-      <field cname="node" type="GPANode*"/>
-      <field cname="config" type="GPANode*"/>
-      <field cname="handler" type="gulong"/>
-      <field cname="handler_config" type="gulong"/>
-      <field cname="file_entry" type="GtkWidget*"/>
-      <field cname="custom_entry" type="GtkWidget*"/>
-      <field cname="updating" type="gboolean"/>
+      <field cname="menu" type="GtkWidget*" />
+      <field cname="node" type="GPANode*" />
+      <field cname="config" type="GPANode*" />
+      <field cname="handler" type="gulong" />
+      <field cname="handler_config" type="gulong" />
+      <field cname="file_entry" type="GtkWidget*" />
+      <field cname="custom_entry" type="GtkWidget*" />
+      <field cname="updating" type="gboolean" />
       <method name="GetType" cname="gpa_transport_selector_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
     </object>
     <object name="GPAWidget" cname="GPAWidget" parent="GtkBin">
-      <field cname="config" type="GnomePrintConfig*"/>
+      <field cname="config" type="GnomePrintConfig*" />
       <method name="Construct" cname="gpa_widget_construct">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GnomePrintConfig*" name="config"/>
+          <parameter type="GnomePrintConfig*" name="config" />
         </parameters>
       </method>
       <method name="GetType" cname="gpa_widget_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <constructor cname="gpa_widget_new">
         <parameters>
-          <parameter type="GType" name="type"/>
-          <parameter type="GnomePrintConfig*" name="config"/>
+          <parameter type="GType" name="type" />
+          <parameter type="GnomePrintConfig*" name="config" />
         </parameters>
       </constructor>
     </object>
   </namespace>
-</api>
+</api>
\ No newline at end of file
diff --git a/parser/gapi-fixup.cs b/parser/gapi-fixup.cs
index 54c08089d..4564f4d0e 100644
--- a/parser/gapi-fixup.cs
+++ b/parser/gapi-fixup.cs
@@ -74,9 +74,7 @@ namespace GtkSharp.Parsing {
 				}
 			}
 
-			Stream out_stream = File.OpenWrite (api_filename);
-			api_doc.Save (out_stream);
-			out_stream.Close ();
+			api_doc.Save (api_filename);
 			return 0;
 		}
 	}
diff --git a/sources/Gnome.metadata b/sources/Gnome.metadata
deleted file mode 100644
index 6245189b7..000000000
--- a/sources/Gnome.metadata
+++ /dev/null
@@ -1,817 +0,0 @@
-<?xml version="1.0"?>
-<metadata>
-
-<!-- renames -->
-<rule>
-  <class name="GnomeAppBar">
-    <signal>ClearPrompt</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>PromptCleared</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GnomeClient">
-    <signal>Connect</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>Connected</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GnomeClient">
-    <signal>Disconnect</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>Disconnected</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GnomeDruidPage">
-    <signal>Back</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>BackClicked</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GnomeDruidPage">
-    <signal>Finish</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>FinishClicked</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GnomeDruidPage">
-    <signal>Cancel</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>CancelClicked</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GnomeDruidPage">
-    <signal>Next</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>NextClicked</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GnomeDruidPage">
-    <signal>Prepare</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>Prepared</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GnomeIconList">
-    <signal>FocusIcon</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>IconFocused</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GnomeEntry">
-    <method>GtkEntry</method>
-  </class>
-  <data>
-    <attribute target="method">
-      <name>name</name>
-      <value>GetGtkEntry</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GnomeEntry">
-    <signal>Activate</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>Activated</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GnomeGdk_"/>
-  <data>
-    <attribute target="class">
-      <name>name</name>
-      <value>GdkHelper</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GnomeGtk_"/>
-  <data>
-    <attribute target="class">
-      <name>name</name>
-      <value>GtkHelper</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GnomeIconList">
-    <signal>SelectIcon</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>IconSelected</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GnomeIconList">
-    <signal>UnselectIcon</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>IconUnselected</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GnomeFileEntry">
-    <signal>Activate</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>Activated</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GnomeCanvasItem">
-    <signal>Event</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>CanvasEvent</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GnomeCanvasPathDef">
-    <method>Moveto</method>
-  </class>
-  <data>
-    <attribute target="method">
-      <name>name</name>
-      <value>MoveTo</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GnomePrintPdf" />
-  <data>
-    <attribute target="class">
-      <name>parent</name>
-      <value>GObject</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GnomePrintTransport" />
-  <data>
-    <attribute target="class">
-      <name>parent</name>
-      <value>GObject</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GnomePrintUnit">
-    <method>GetIdentity</method>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="name">base</filter>
-      <name>name</name>
-      <value>Base</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GnomeCanvasPathDef">
-    <method>Curveto</method>
-  </class>
-  <data>
-    <attribute target="method">
-      <name>name</name>
-      <value>CurveTo</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GnomeCanvasPathDef">
-    <method>Lineto</method>
-  </class>
-  <data>
-    <attribute target="method">
-      <name>name</name>
-      <value>LineTo</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GnomeCanvasPathDef">
-    <method>LinetoMoving</method>
-  </class>
-  <data>
-    <attribute target="method">
-      <name>name</name>
-      <value>LineToMoving</value>
-    </attribute>
-  </data>
-</rule>
-
-<!-- hides -->
-<rule>
-  <class name="GnomeFileEntry">
-    <method>GnomeEntry</method>
-    <method>GtkEntry</method>
-  </class>
-  <class name="GnomeIconEntry">
-    <method>PickDialog</method>
-  </class>
-  <class name="GnomeConfig_">
-    <method>SetSetHandler</method>
-    <method>SetSyncHandler</method>
-  </class>
-  <data>
-    <attribute target="method">
-      <name>hidden</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GnomeCanvas">
-    <method>W2cAffine</method>
-  </class>
-  <data>
-    <attribute target="method">
-      <name>hidden</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GnomeCanvasItem">
-    <method>AffineRelative</method>
-    <method>AffineAbsolute</method>
-    <method>I2wAffine</method>
-    <method>I2cAffine</method>
-    <method>SetValist</method>
-    <method>Construct</method>
-  </class>
-  <data>
-    <attribute target="method">
-      <name>hidden</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GnomeCanvasItem">
-    <constructor>gnome_canvas_item_new</constructor>
-  </class>
-  <data>
-    <attribute target="constructor">
-      <name>hidden</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-
-<!-- disable default constructor -->
-<rule>
-  <class name="GnomePrintJob"/>
-  <data>
-    <attribute target="class">
-      <name>disabledefaultconstructor</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-
-<!-- misc -->
-<rule>
-  <class name="GnomeAbout">
-    <constructor>gnome_about_new</constructor>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="type">const-gchar**</filter>
-        <name>array</name>
-     <value>1</value>
-    </attribute>
- </data>
-</rule>
-<rule>
-  <class name="GnomePrintDialog">
-    <method>gnome_print_dialog_new</method>
-  </class>
-  <data>
-    <attribute target="params">
-      <filter level="name">flags</filter>
-      <name>type</name>
-      <value>GnomePrintDialogFlags</value>
-    </attribute>
-  </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>
-
-<!-- Use gchar* instead of guchar*, when the value is realy a string -->
-<rule>
-  <class name="GnomePrintConfig">
-    <method>Get</method>
-  </class>
-  <data>
-    <attribute target="return">
-      <name>type</name>
-      <value>gchar*</value>
-    </attribute>
-  </data>
-</rule>
-
-<!-- null args -->
-<rule>
-  <class name="GnomeIconList">
-    <constructor>gnome_icon_list_new</constructor>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="type">GtkAdjustment*</filter>
-      <name>null_ok</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GnomeIconList">
-    <method>gnome_icon_list_set_hadjustment</method>
-    <method>gnome_icon_list_set_vadjustment</method>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="type">GtkAdjustment*</filter>
-      <name>null_ok</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-
-<!-- list types -->
-<rule>
-  <class name="GnomeCanvasPathDef">
-    <method>Split</method>
-  </class>
-  <data>
-    <attribute target="return">
-      <name>element_type</name>
-      <value>Gnome.CanvasPathDef</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GnomeIconList">
-    <method>GetSelection</method>
-  </class>
-  <data>
-    <attribute target="return">
-      <name>element_type</name>
-      <value>int</value>
-    </attribute>
-  </data>
-</rule>
-
-<!-- ref parameters -->
-<rule>
-  <class name="GnomeCanvasItem">
-    <method>W2i</method>
-    <method>I2w</method>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="type">double*</filter>
-      <name>pass_as</name>
-      <value>ref</value>
-    </attribute>
-  </data>
-</rule>
-
-<!-- out parameters -->
-<rule>
-  <class name="GnomeCanvas">
-    <method>GetScrollRegion</method>
-    <method>C2w</method>
-  </class>
-  <class name="GnomeCanvasItem">
-    <method>GetBounds</method>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="type">double*</filter>
-      <name>pass_as</name>
-      <value>out</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GnomeCanvas">
-    <method>GetScrollOffsets</method>
-    <method>W2c</method>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="type">int*</filter>
-      <name>pass_as</name>
-      <value>out</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GnomeCanvas">
-    <method>W2cD</method>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="name">cx</filter>
-      <name>pass_as</name>
-      <value>out</value>
-    </attribute>
-    <attribute target="param">
-      <filter level="name">cy</filter>
-      <name>pass_as</name>
-      <value>out</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GnomeCanvas">
-    <method>WindowToWorld</method>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="name">worldx</filter>
-      <name>pass_as</name>
-      <value>out</value>
-    </attribute>
-    <attribute target="param">
-      <filter level="name">worldy</filter>
-      <name>pass_as</name>
-      <value>out</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GnomeCanvas">
-    <method>WorldToWindow</method>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="name">winx</filter>
-      <name>pass_as</name>
-      <value>out</value>
-    </attribute>
-    <attribute target="param">
-      <filter level="name">winy</filter>
-      <name>pass_as</name>
-      <value>out</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GnomeCanvas">
-    <method>GetColor</method>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="type">GdkColor*</filter>
-      <name>pass_as</name>
-      <value>out</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GnomeCanvasRichText">
-    <method>GetIterLocation</method>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="name">location</filter>
-      <name>pass_as</name>
-      <value>out</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GnomeCanvasRichText">
-    <method>GetIterAtLocation</method>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="name">iter</filter>
-      <name>pass_as</name>
-      <value>out</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GnomeCanvas">
-    <method>GetMiterPoints</method>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="name">mx1</filter>
-      <name>pass_as</name>
-      <value>out</value>
-    </attribute>
-    <attribute target="param">
-      <filter level="name">my1</filter>
-      <name>pass_as</name>
-      <value>out</value>
-    </attribute>
-    <attribute target="param">
-      <filter level="name">mx2</filter>
-      <name>pass_as</name>
-      <value>out</value>
-    </attribute>
-    <attribute target="param">
-      <filter level="name">my2</filter>
-      <name>pass_as</name>
-      <value>out</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GnomeCanvas">
-    <method>GetButtPoints</method>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="name">bx1</filter>
-      <name>pass_as</name>
-      <value>out</value>
-    </attribute>
-    <attribute target="param">
-      <filter level="name">by1</filter>
-      <name>pass_as</name>
-      <value>out</value>
-    </attribute>
-    <attribute target="param">
-      <filter level="name">bx2</filter>
-      <name>pass_as</name>
-      <value>out</value>
-    </attribute>
-    <attribute target="param">
-      <filter level="name">by2</filter>
-      <name>pass_as</name>
-      <value>out</value>
-    </attribute>
-  </data>
-</rule>
-
-<!-- fix return values -->
-<rule>
-  <class name="GnomeCanvas">
-    <method>GetMiterPoints</method>
-    <method>GetColor</method>
-  </class>
-  <data>
-    <attribute target="return">
-      <name>type</name>
-      <value>gboolean</value>
-    </attribute>
-  </data>
-</rule>
-
-<!-- property types -->
-<rule>
-  <class name="GnomeCanvasClipgroup">
-    <property>Wind</property>
-  </class>
-  <data>
-    <attribute target="property">
-      <name>type</name>
-      <value>ArtWindRule</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GnomeCanvasShape">
-    <property>Dash</property>
-  </class>
-  <data>
-    <attribute target="property">
-      <name>type</name>
-      <value>ArtVpathDash</value>
-    </attribute>
-  </data>
-</rule>
-</metadata>