From 6abcf29dfa03367277b3a9a38b14f83d07f06065 Mon Sep 17 00:00:00 2001
From: Mike Kestner <mkestner@gmail.com>
Date: Fri, 28 Jul 2006 15:39:10 +0000
Subject: [PATCH] 2006-07-27  Mike Kestner  <mkestner@novell.com>

	* bootstrap*: kill the 2.4/2.6/2.8 straps, they are on a
	branch now. update 2.10 strap for new apis.
	* sources/Makefile.am : parse 2.16 sources for gnome libs.
	* sources/gtk-sharp-2.10-sources.xml : ditto.
	* parser/gapi-parser.cs : explicitly use an indented XML writer.
	* gnomevfs/gnome-vfs-api-2.16.raw: regen
	* gnomevfs/Gnomevfs.metadata: some build fixes
	* gnome/gnome-api-2.16.raw: regen
	* gnome/Gnome.metadata: some build fixes
	* sample/PrintSample.cs: remove new Gtk/Gnome ambiguities.

svn path=/trunk/gtk-sharp/; revision=63078
---
 ChangeLog                          |  18 ++
 bootstrap-2.10                     |   9 +-
 bootstrap-2.4                      |  14 -
 bootstrap-2.6                      |  14 -
 bootstrap-2.8                      |  14 -
 bootstrap-generic                  |   3 +
 configure.in.in                    |   6 +-
 gnome/Gnome.metadata               |   1 +
 gnome/PanelApplet.custom           |   1 +
 gnome/gnome-api-2.16.raw           |  91 +++---
 gnomevfs/Gnomevfs.metadata         |   1 +
 gnomevfs/gnome-vfs-api-2.16.raw    | 443 ++++++++++++++++++++++-------
 parser/gapi-parser.cs              |   4 +-
 sample/PrintSample.cs              |   8 +-
 sources/Makefile.am                |   4 +-
 sources/gtk-sharp-2.10-sources.xml |   4 +-
 16 files changed, 441 insertions(+), 194 deletions(-)
 delete mode 100755 bootstrap-2.4
 delete mode 100755 bootstrap-2.6
 delete mode 100755 bootstrap-2.8

diff --git a/ChangeLog b/ChangeLog
index dbb697356..752b071e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2006-07-27  Mike Kestner  <mkestner@novell.com>
+
+	* bootstrap*: kill the 2.4/2.6/2.8 straps, they are on a 
+	branch now. update 2.10 strap for new apis.
+	* sources/Makefile.am : parse 2.16 sources for gnome libs.
+	* sources/gtk-sharp-2.10-sources.xml : ditto.
+	* parser/gapi-parser.cs : explicitly use an indented XML writer.
+	* gnomevfs/gnome-vfs-api-2.16.raw: regen
+	* gnomevfs/Gnomevfs.metadata: some build fixes
+	* gnome/gnome-api-2.16.raw: regen
+	* gnome/Gnome.metadata: some build fixes
+	* sample/PrintSample.cs: remove new Gtk/Gnome ambiguities.
+
+2006-07-27  Mike Kestner  <mkestner@novell.com>
+
+	* gnome/PanelApplet.custom : hold UIVerbs in SetupMenu so the 
+	callback delegates don't get GC'd.
+
 2006-07-15  Mike Kestner  <mkestner@novell.com>
 
 	* parser/gapi2xml.pl : regex fix needed for vfs 2.15.3 parse.
diff --git a/bootstrap-2.10 b/bootstrap-2.10
index 19ac62804..594e175c0 100755
--- a/bootstrap-2.10
+++ b/bootstrap-2.10
@@ -4,11 +4,14 @@
 GTK_SHARP_VERSION=2.9.0
 ASSEMBLY_VERSION=2.10.0.0
 POLICY_VERSIONS="2.4 2.6 2.8"
-GTK_REQUIRED_VERSION=2.9.0
-GNOME_REQUIRED_VERSION=2.10.0
+GTK_REQUIRED_VERSION=2.10.0
+GNOME_REQUIRED_VERSION=2.15.0
+GNOMECANVAS_REQUIRED_VERSION=2.14.0
+GNOMEPANEL_REQUIRED_VERSION=2.14.0
+GNOMEPRINT_REQUIRED_VERSION=2.10.0
 VERSIONCSDEFINES="-define:GTK_SHARP_2_6 -define:GTK_SHARP_2_8 -define:GTK_SHARP_2_10"
 VERSIONCFLAGS="-DGTK_SHARP_2_6 -DGTK_SHARP_2_8 -DGTK_SHARP_2_10"
 GTK_API_TAG=2.10
-GNOME_API_TAG=2.10
+GNOME_API_TAG=2.16
 
 . ./bootstrap-generic "$@"
diff --git a/bootstrap-2.4 b/bootstrap-2.4
deleted file mode 100755
index f75be7b1c..000000000
--- a/bootstrap-2.4
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-# Run this to set configure.in up for an API version.
-
-GTK_SHARP_VERSION=2.4.3
-ASSEMBLY_VERSION=2.4.0.0
-POLICY_VERSIONS=
-GTK_REQUIRED_VERSION=2.4.0
-GNOME_REQUIRED_VERSION=2.6.0
-VERSIONCSDEFINES=
-VERSIONCFLAGS=
-GTK_API_TAG=2.4
-GNOME_API_TAG=2.6
-
-. ./bootstrap-generic "$@"
diff --git a/bootstrap-2.6 b/bootstrap-2.6
deleted file mode 100755
index a31507586..000000000
--- a/bootstrap-2.6
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-# Run this to set configure.in up for an API version.
-
-GTK_SHARP_VERSION=2.6.3
-ASSEMBLY_VERSION=2.6.0.0
-POLICY_VERSIONS=2.4
-GTK_REQUIRED_VERSION=2.6.0
-GNOME_REQUIRED_VERSION=2.10.0
-VERSIONCSDEFINES=-define:GTK_SHARP_2_6
-VERSIONCFLAGS=-DGTK_SHARP_2_6
-GTK_API_TAG=2.6
-GNOME_API_TAG=2.10
-
-. ./bootstrap-generic "$@"
diff --git a/bootstrap-2.8 b/bootstrap-2.8
deleted file mode 100755
index 7faee36ee..000000000
--- a/bootstrap-2.8
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-# Run this to set configure.in up for an API version.
-
-GTK_SHARP_VERSION=2.8.3
-ASSEMBLY_VERSION=2.8.0.0
-POLICY_VERSIONS="2.4 2.6"
-GTK_REQUIRED_VERSION=2.8.0
-GNOME_REQUIRED_VERSION=2.10.0
-VERSIONCSDEFINES="-define:GTK_SHARP_2_6 -define:GTK_SHARP_2_8"
-VERSIONCFLAGS="-DGTK_SHARP_2_6 -DGTK_SHARP_2_8"
-GTK_API_TAG=2.8
-GNOME_API_TAG=2.10
-
-. ./bootstrap-generic "$@"
diff --git a/bootstrap-generic b/bootstrap-generic
index 84fb6b6bc..982520b27 100755
--- a/bootstrap-generic
+++ b/bootstrap-generic
@@ -17,6 +17,9 @@ set -x
 sed -e "s/@GTK_SHARP_VERSION@/$GTK_SHARP_VERSION/" \
     -e "s/@GTK_REQUIRED_VERSION@/$GTK_REQUIRED_VERSION/" \
     -e "s/@GNOME_REQUIRED_VERSION@/$GNOME_REQUIRED_VERSION/" \
+    -e "s/@GNOMECANVAS_REQUIRED_VERSION@/$GNOMECANVAS_REQUIRED_VERSION/" \
+    -e "s/@GNOMEPANEL_REQUIRED_VERSION@/$GNOMEPANEL_REQUIRED_VERSION/" \
+    -e "s/@GNOMEPRINT_REQUIRED_VERSION@/$GNOMEPRINT_REQUIRED_VERSION/" \
     -e "s/@VERSIONCSDEFINES@/$VERSIONCSDEFINES/" \
     -e "s/@VERSIONCFLAGS@/$VERSIONCFLAGS/" \
     -e "s/@POLICY_VERSIONS@/$POLICY_VERSIONS/" \
diff --git a/configure.in.in b/configure.in.in
index 520268a49..b6bb03377 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -185,7 +185,11 @@ PKG_CHECK_MODULES(GNOMEVFS, gnome-vfs-2.0 >= $GNOME_REQUIRED_VERSION, enable_gno
 AC_SUBST(GNOMEVFS_CFLAGS)
 AC_SUBST(GNOMEVFS_LIBS)
 
-PKG_CHECK_MODULES(GNOME, libgnomecanvas-2.0 >= $GNOME_REQUIRED_VERSION libgnomeui-2.0 >= $GNOME_REQUIRED_VERSION gtk+-2.0 >= $GTK_REQUIRED_VERSION libgnomeprintui-2.2 >= $GNOME_REQUIRED_VERSION gmodule-2.0 >= $GTK_REQUIRED_VERSION libpanelapplet-2.0 >= $GNOME_REQUIRED_VERSION, enable_gnome=yes, enable_gnome=no)
+GNOMECANVAS_REQUIRED_VERSION=@GNOMECANVAS_REQUIRED_VERSION@
+GNOMEPANEL_REQUIRED_VERSION=@GNOMEPANEL_REQUIRED_VERSION@
+GNOMEPRINT_REQUIRED_VERSION=@GNOMEPRINT_REQUIRED_VERSION@
+
+PKG_CHECK_MODULES(GNOME, libgnomecanvas-2.0 >= $GNOMECANVAS_REQUIRED_VERSION libgnomeui-2.0 >= $GNOME_REQUIRED_VERSION gtk+-2.0 >= $GTK_REQUIRED_VERSION libgnomeprintui-2.2 >= $GNOMEPRINT_REQUIRED_VERSION gmodule-2.0 >= $GTK_REQUIRED_VERSION libpanelapplet-2.0 >= $GNOMEPANEL_REQUIRED_VERSION, enable_gnome=yes, enable_gnome=no)
 AC_SUBST(GNOME_CFLAGS)
 AC_SUBST(GNOME_LIBS)
 
diff --git a/gnome/Gnome.metadata b/gnome/Gnome.metadata
index 826ca45da..ec7ce4601 100644
--- a/gnome/Gnome.metadata
+++ b/gnome/Gnome.metadata
@@ -59,6 +59,7 @@
   <attr path="/api/namespace/object[@cname='GnomeCanvas']/method[@name='WindowToWorld']/*/*[@type='double*']" name="pass_as">out</attr>
   <attr path="/api/namespace/object[@cname='GnomeCanvas']/method[@name='WorldToWindow']/*/*[@type='double*']" name="pass_as">out</attr>
   <attr path="/api/namespace/object[@cname='GnomeCanvas']/method[@name='W2cAffine']" name="hidden">1</attr>
+  <attr path="/api/namespace/object[@cname='GnomeCanvasBpath']/property[@name='Bpath']" name="type">gpointer</attr>
   <attr path="/api/namespace/object[@cname='GnomeCanvasClipgroup']/property[@name='Wind']" name="type">ArtWindRule</attr>
   <attr path="/api/namespace/object[@cname='GnomeCanvasItem']/constructor[@cname='gnome_canvas_item_new']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GnomeCanvasItem']/field[@name='Canvas']" name="access">public</attr>
diff --git a/gnome/PanelApplet.custom b/gnome/PanelApplet.custom
index 3f1a50e6a..14eb96812 100644
--- a/gnome/PanelApplet.custom
+++ b/gnome/PanelApplet.custom
@@ -9,6 +9,7 @@ public void SetupMenu (string xml, BonoboUIVerb[] items)
 	IntPtr native = GLib.Marshaller.StringToPtrGStrdup (xml);
 	panel_applet_setup_menu (Handle, native, nulled_items, IntPtr.Zero);
 	GLib.Marshaller.Free (native);
+	PersistentData ["setup_menu_verbs"] = items;
 }
 
 public abstract void Creation ();
diff --git a/gnome/gnome-api-2.16.raw b/gnome/gnome-api-2.16.raw
index f46817f4b..99394c896 100644
--- a/gnome/gnome-api-2.16.raw
+++ b/gnome/gnome-api-2.16.raw
@@ -1,12 +1,11 @@
 <?xml version="1.0"?>
-<api>
-  <!--
+<api
+  ><!--
 
         This file was automatically generated.
         Please DO NOT MODIFY THIS FILE, modify .metadata files instead.
 
--->
-  <namespace name="Gnome" library="gnome-2">
+--><namespace name="Gnome" library="gnome-2">
     <enum name="FileDomain" cname="GnomeFileDomain" gtype="gnome_file_domain_get_type" type="enum">
       <member cname="GNOME_FILE_DOMAIN_UNKNOWN" name="Unknown" />
       <member cname="GNOME_FILE_DOMAIN_LIBDIR" name="Libdir" />
@@ -39,6 +38,7 @@
       <member cname="GNOME_URL_ERROR_NO_DEFAULT" name="NoDefault" />
       <member cname="GNOME_URL_ERROR_NOT_SUPPORTED" name="NotSupported" />
       <member cname="GNOME_URL_ERROR_VFS" name="Vfs" />
+      <member cname="GNOME_URL_ERROR_CANCELLED" name="Cancelled" />
     </enum>
     <callback name="ModuleClassInitHook" cname="GnomeModuleClassInitHook">
       <return-type type="void" />
@@ -47,6 +47,9 @@
         <parameter type="const-GnomeModuleInfo*" name="mod_info" />
       </parameters>
     </callback>
+    <callback name="ModuleGetGOptionGroupFunc" cname="GnomeModuleGetGOptionGroupFunc">
+      <return-type type="GOptionGroup*" />
+    </callback>
     <callback name="ModuleHook" cname="GnomeModuleHook">
       <return-type type="void" />
       <parameters>
@@ -73,6 +76,7 @@
       <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="GoptionContext" cname="goption-context" type="gpointer" readable="true" writeable="true" construct-only="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" />
@@ -201,11 +205,12 @@
       <field name="InstanceInit" cname="instance_init" type="GnomeModuleHook" />
       <field name="PreArgsParse" cname="pre_args_parse" type="GnomeModuleHook" />
       <field name="PostArgsParse" cname="post_args_parse" type="GnomeModuleHook" />
+      <field name="Options" cname="_options" type="struct-poptOption*" />
       <field name="Options" cname="options" type="struct-poptOption*" />
       <field name="InitPass" cname="init_pass" type="GnomeModuleInitHook" />
       <field name="ClassInit" cname="class_init" type="GnomeModuleClassInitHook" />
       <field name="OptPrefix" cname="opt_prefix" type="const-char*" />
-      <field name="Expansion1" cname="expansion1" type="gpointer" />
+      <field name="GetGoptionGroupFunc" cname="get_goption_group_func" type="GnomeModuleGetGOptionGroupFunc" />
       <method name="GetType" cname="gnome_module_info_get_type" shared="true">
         <return-type type="GType" />
       </method>
@@ -718,9 +723,7 @@
       <method name="PrivateDirGet" cname="gnome_user_private_dir_get" shared="true">
         <return-type type="const-char*" />
       </method>
-    </class>
-  </namespace>
-  <namespace name="Gnome" library="gnomecanvas-2">
+    </class></namespace><namespace name="Gnome" library="gnomecanvas-2">
     <object name="Canvas" cname="GnomeCanvas" parent="GtkLayout">
       <field name="Root" cname="root" type="GnomeCanvasItem*" />
       <field name="RedrawArea" cname="redraw_area" type="ArtUta*" />
@@ -1018,7 +1021,7 @@
       </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="GnomeCanvasPathDef" readable="true" writeable="true" />
       <method name="GetType" cname="gnome_canvas_bpath_get_type" shared="true">
         <return-type type="GType" />
       </method>
@@ -1479,7 +1482,7 @@
       <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="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="Wind" cname="wind" type="guint" readable="true" writeable="true" />
@@ -1563,8 +1566,8 @@
       <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" />
+      <property name="TextWidth" cname="text_width" type="gdouble" readable="true" />
+      <property name="TextHeight" cname="text_height" type="gdouble" readable="true" />
       <method name="GetType" cname="gnome_canvas_text_get_type" shared="true">
         <return-type type="GType" />
       </method>
@@ -1606,7 +1609,7 @@
         <return-type type="void" />
       </method>
     </struct>
-    <struct name="CanvasPathDef" cname="GnomeCanvasPathDef" opaque="true">
+    <boxed name="CanvasPathDef" cname="GnomeCanvasPathDef" opaque="true">
       <method name="AllClosed" cname="gnome_canvas_path_def_all_closed">
         <return-type type="gboolean" />
       </method>
@@ -1678,6 +1681,9 @@
       <method name="FirstBpath" cname="gnome_canvas_path_def_first_bpath">
         <return-type type="ArtBpath*" />
       </method>
+      <method name="GetType" cname="gnome_canvas_path_def_get_type" shared="true">
+        <return-type type="GType" />
+      </method>
       <method name="HasCurrentpoint" cname="gnome_canvas_path_def_has_currentpoint">
         <return-type type="gboolean" />
       </method>
@@ -1747,7 +1753,7 @@
       <method name="Unref" cname="gnome_canvas_path_def_unref">
         <return-type type="void" />
       </method>
-    </struct>
+    </boxed>
     <boxed name="CanvasPoints" cname="GnomeCanvasPoints" opaque="true">
       <field name="Coords" cname="coords" type="double*" access="public" writeable="true" />
       <field name="NumPoints" cname="num_points" type="int" access="public" writeable="true" />
@@ -1767,9 +1773,7 @@
         <return-type type="GnomeCanvasPoints*" />
       </method>
     </boxed>
-    <struct name="CanvasShapePriv" cname="GnomeCanvasShapePriv" opaque="true" />
-  </namespace>
-  <namespace name="Gnome" library="gnomeui-2">
+    <struct name="CanvasShapePriv" cname="GnomeCanvasShapePriv" opaque="true" /></namespace><namespace name="Gnome" library="gnomeui-2">
     <enum name="ClientFlags" cname="GnomeClientFlags" gtype="gnome_client_flags_get_type" 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" />
@@ -1846,7 +1850,7 @@
       <member cname="GNOME_SAVE_LOCAL" name="Local" />
       <member cname="GNOME_SAVE_BOTH" name="Both" />
     </enum>
-    <enum name="ThemeFileParseError" cname="GnomeThemeFileParseError" type="enum">
+    <enum name="ThemeFileParseError" cname="GnomeThemeFileParseError" deprecated="1" 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" />
@@ -4418,7 +4422,7 @@
     </struct>
     <struct name="PasswordDialogDetails" cname="GnomePasswordDialogDetails" opaque="true" />
     <struct name="ThemeFile" cname="GnomeThemeFile" opaque="true">
-      <method name="ForeachKey" cname="gnome_theme_file_foreach_key">
+      <method name="ForeachKey" cname="gnome_theme_file_foreach_key" deprecated="1">
         <return-type type="void" />
         <parameters>
           <parameter type="const-char*" name="section" />
@@ -4427,17 +4431,17 @@
           <parameter type="gpointer" name="user_data" />
         </parameters>
       </method>
-      <method name="ForeachSection" cname="gnome_theme_file_foreach_section">
+      <method name="ForeachSection" cname="gnome_theme_file_foreach_section" deprecated="1">
         <return-type type="void" />
         <parameters>
           <parameter type="GnomeThemeFileSectionFunc" name="func" />
           <parameter type="gpointer" name="user_data" />
         </parameters>
       </method>
-      <method name="Free" cname="gnome_theme_file_free">
+      <method name="Free" cname="gnome_theme_file_free" deprecated="1">
         <return-type type="void" />
       </method>
-      <method name="GetInteger" cname="gnome_theme_file_get_integer">
+      <method name="GetInteger" cname="gnome_theme_file_get_integer" deprecated="1">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="const-char*" name="section" />
@@ -4445,7 +4449,7 @@
           <parameter type="int*" name="val" />
         </parameters>
       </method>
-      <method name="GetLocaleString" cname="gnome_theme_file_get_locale_string">
+      <method name="GetLocaleString" cname="gnome_theme_file_get_locale_string" deprecated="1">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="const-char*" name="section" />
@@ -4453,7 +4457,7 @@
           <parameter type="char**" name="val" />
         </parameters>
       </method>
-      <method name="GetRaw" cname="gnome_theme_file_get_raw">
+      <method name="GetRaw" cname="gnome_theme_file_get_raw" deprecated="1">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="const-char*" name="section" />
@@ -4462,7 +4466,7 @@
           <parameter type="char**" name="val" />
         </parameters>
       </method>
-      <method name="GetString" cname="gnome_theme_file_get_string">
+      <method name="GetString" cname="gnome_theme_file_get_string" deprecated="1">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="const-char*" name="section" />
@@ -4470,16 +4474,16 @@
           <parameter type="char**" name="val" />
         </parameters>
       </method>
-      <constructor cname="gnome_theme_file_new_from_string">
+      <constructor cname="gnome_theme_file_new_from_string" deprecated="1">
         <parameters>
           <parameter type="char*" name="data" />
           <parameter type="GError**" name="error" />
         </parameters>
       </constructor>
-      <method name="ParseErrorQuark" cname="gnome_theme_file_parse_error_quark" shared="true">
+      <method name="ParseErrorQuark" cname="gnome_theme_file_parse_error_quark" deprecated="1" shared="true">
         <return-type type="GQuark" />
       </method>
-      <method name="ToString" cname="gnome_theme_file_to_string">
+      <method name="ToString" cname="gnome_theme_file_to_string" deprecated="1">
         <return-type type="char*" />
       </method>
     </struct>
@@ -4571,6 +4575,15 @@
           <parameter type="gpointer" name="callback_data" />
         </parameters>
       </method>
+      <method name="PixbufNewFromUriAtScale" cname="gnome_gdk_pixbuf_new_from_uri_at_scale" shared="true">
+        <return-type type="GdkPixbuf*" />
+        <parameters>
+          <parameter type="const-char*" name="uri" />
+          <parameter type="gint" name="width" />
+          <parameter type="gint" name="height" />
+          <parameter type="gboolean" name="preserve_aspect_ratio" />
+        </parameters>
+      </method>
       <method name="PixbufNewFromUriCancel" cname="gnome_gdk_pixbuf_new_from_uri_cancel" shared="true">
         <return-type type="void" />
         <parameters>
@@ -4833,9 +4846,7 @@
       <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">
+    </object></namespace><namespace name="Gnome" library="gnomeprint-2-2">
     <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" />
@@ -6395,9 +6406,7 @@
           <parameter type="gboolean" name="append" />
         </parameters>
       </method>
-    </class>
-  </namespace>
-  <namespace name="Gnome" library="gnomeprintui-2-2">
+    </class></namespace><namespace name="Gnome" library="gnomeprintui-2-2">
     <enum name="PaperSelectorFlags" cname="GnomePaperSelectorFlags" gtype="gnome_paper_selector_flags_get_type" type="flags">
       <member cname="GNOME_PAPER_SELECTOR_MARGINS" name="Margins" value="1 &lt;&lt; 0" />
       <member cname="GNOME_PAPER_SELECTOR_FEED_ORIENTATION" name="FeedOrientation" value="1 &lt;&lt; 1" />
@@ -6671,9 +6680,7 @@
           <parameter type="const-GnomePrintUnit*" name="unit" />
         </parameters>
       </method>
-    </object>
-  </namespace>
-  <namespace name="Gnome" library="panel-applet-2">
+    </object></namespace><namespace name="Gnome" library="panel-applet-2">
     <enum name="PanelAppletBackgroundType" cname="PanelAppletBackgroundType" type="enum">
       <member cname="PANEL_NO_BACKGROUND" name="NoBackground" />
       <member cname="PANEL_COLOR_BACKGROUND" name="ColorBackground" />
@@ -6902,6 +6909,12 @@
           <parameter type="guint32" name="timestamp" />
         </parameters>
       </method>
+      <method name="SetBackgroundWidget" cname="panel_applet_set_background_widget">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GtkWidget*" name="widget" />
+        </parameters>
+      </method>
       <method name="SetFlags" cname="panel_applet_set_flags">
         <return-type type="void" />
         <parameters>
@@ -6958,6 +6971,4 @@
         </parameters>
       </method>
     </object>
-    <alias name="PanelAppletOrient" cname="PanelAppletOrient" type="GNOME_Vertigo_PanelOrient" />
-  </namespace>
-</api>
\ No newline at end of file
+    <alias name="PanelAppletOrient" cname="PanelAppletOrient" type="GNOME_Vertigo_PanelOrient" /></namespace></api>
\ No newline at end of file
diff --git a/gnomevfs/Gnomevfs.metadata b/gnomevfs/Gnomevfs.metadata
index eceb6c111..09b49d712 100644
--- a/gnomevfs/Gnomevfs.metadata
+++ b/gnomevfs/Gnomevfs.metadata
@@ -60,6 +60,7 @@
   <attr path="/api/namespace/enum[@cname='GnomeVFSProcessRunResult']" name="hidden">1</attr>
   <attr path="/api/namespace/enum[@cname='GnomeVFSURIHideOptions']" name="name">UriHideOptions</attr>
   <attr path="/api/namespace/enum[@cname='XdgGlobType']" name="hidden">1</attr>
+  <attr path="/api/namespace/object[@cname='GnomeVFSACE']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GnomeVFSClient']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GnomeVFSClientCall']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GnomeVFSDrive']/method[@name='Ref']" name="hidden">1</attr>
diff --git a/gnomevfs/gnome-vfs-api-2.16.raw b/gnomevfs/gnome-vfs-api-2.16.raw
index d2a3c7405..a4ae08778 100644
--- a/gnomevfs/gnome-vfs-api-2.16.raw
+++ b/gnomevfs/gnome-vfs-api-2.16.raw
@@ -1,12 +1,22 @@
 <?xml version="1.0"?>
-<api>
-  <!--
+<api
+  ><!--
 
         This file was automatically generated.
         Please DO NOT MODIFY THIS FILE, modify .metadata files instead.
 
--->
-  <namespace name="GnomeVFS" library="gnomevfs-2">
+--><namespace name="GnomeVFS" library="gnomevfs-2">
+    <enum name="DvdArgumentType" cname="DvdArgumentType" type="enum">
+      <member cname="DVD_TYPE_LAST" name="Last" value="-1" />
+      <member cname="DVD_TYPE_URI" name="Uri" />
+      <member cname="DVD_TYPE_STRING" name="String" />
+      <member cname="DVD_TYPE_INT32" name="Int32" />
+      <member cname="DVD_TYPE_INT64" name="Int64" />
+      <member cname="DVD_TYPE_UINT64" name="Uint64" />
+      <member cname="DVD_TYPE_FILE_INFO" name="FileInfo" />
+      <member cname="DVD_TYPE_BOOL" name="Bool" />
+      <member cname="DVD_TYPE_BYTE_ARRAY" name="ByteArray" />
+    </enum>
     <enum name="DNSSDServiceStatus" cname="GnomeVFSDNSSDServiceStatus" type="enum">
       <member cname="GNOME_VFS_DNS_SD_SERVICE_ADDED" name="Added" />
       <member cname="GNOME_VFS_DNS_SD_SERVICE_REMOVED" name="Removed" />
@@ -58,6 +68,9 @@
       <member cname="GNOME_VFS_FILE_INFO_FIELDS_SYMLINK_NAME" name="SymlinkName" value="1 &lt;&lt; 12" />
       <member cname="GNOME_VFS_FILE_INFO_FIELDS_MIME_TYPE" name="MimeType" value="1 &lt;&lt; 13" />
       <member cname="GNOME_VFS_FILE_INFO_FIELDS_ACCESS" name="Access" value="1 &lt;&lt; 14" />
+      <member cname="GNOME_VFS_FILE_INFO_FIELDS_IDS" name="Ids" value="1 &lt;&lt; 15" />
+      <member cname="GNOME_VFS_FILE_INFO_FIELDS_ACL" name="Acl" value="1 &lt;&lt; 16" />
+      <member cname="GNOME_VFS_FILE_INFO_FIELDS_SELINUX_CONTEXT" name="SelinuxContext" value="1 &lt;&lt; 17" />
     </enum>
     <enum name="FileInfoOptions" cname="GnomeVFSFileInfoOptions" type="flags">
       <member cname="GNOME_VFS_FILE_INFO_DEFAULT" name="Default" />
@@ -66,6 +79,9 @@
       <member cname="GNOME_VFS_FILE_INFO_FORCE_SLOW_MIME_TYPE" name="ForceSlowMimeType" value="1 &lt;&lt; 2" />
       <member cname="GNOME_VFS_FILE_INFO_FOLLOW_LINKS" name="FollowLinks" value="1 &lt;&lt; 3" />
       <member cname="GNOME_VFS_FILE_INFO_GET_ACCESS_RIGHTS" name="GetAccessRights" value="1 &lt;&lt; 4" />
+      <member cname="GNOME_VFS_FILE_INFO_NAME_ONLY" name="NameOnly" value="1 &lt;&lt; 5" />
+      <member cname="GNOME_VFS_FILE_INFO_GET_ACL" name="GetAcl" value="1 &lt;&lt; 6" />
+      <member cname="GNOME_VFS_FILE_INFO_GET_SELINUX_CONTEXT" name="GetSelinuxContext" value="1 &lt;&lt; 7" />
     </enum>
     <enum name="FilePermissions" cname="GnomeVFSFilePermissions" type="flags">
       <member cname="GNOME_VFS_PERM_SUID" name="Suid" value="S_ISUID" />
@@ -121,6 +137,10 @@
       <member cname="GNOME_VFS_MIME_IDENTICAL" name="Identical" />
       <member cname="GNOME_VFS_MIME_PARENT" name="Parent" />
     </enum>
+    <enum name="ModuleCallbackAuthenticationAuthType" cname="GnomeVFSModuleCallbackAuthenticationAuthType" deprecated="1" type="enum">
+      <member cname="_AuthTypeBasic" name="Authtypebasic" />
+      <member cname="_AuthTypeDigest" name="Authtypedigest" />
+    </enum>
     <enum name="ModuleCallbackFullAuthenticationFlags" cname="GnomeVFSModuleCallbackFullAuthenticationFlags" type="flags">
       <member cname="GNOME_VFS_MODULE_CALLBACK_FULL_AUTHENTICATION_PREVIOUS_ATTEMPT_FAILED" name="PreviousAttemptFailed" value="1 &lt;&lt; 0" />
       <member cname="GNOME_VFS_MODULE_CALLBACK_FULL_AUTHENTICATION_NEED_PASSWORD" name="NeedPassword" value="1 &lt;&lt; 1" />
@@ -151,26 +171,6 @@
       <member cname="GNOME_VFS_OPEN_RANDOM" name="Random" value="1 &lt;&lt; 2" />
       <member cname="GNOME_VFS_OPEN_TRUNCATE" name="Truncate" value="1 &lt;&lt; 3" />
     </enum>
-    <enum name="ProcessOptions" cname="GnomeVFSProcessOptions" type="flags">
-      <member cname="GNOME_VFS_PROCESS_DEFAULT" name="Default" />
-      <member cname="GNOME_VFS_PROCESS_USEPATH" name="Usepath" value="1 &lt;&lt; 0" />
-      <member cname="GNOME_VFS_PROCESS_CLOSEFDS" name="Closefds" value="1 &lt;&lt; 1" />
-      <member cname="GNOME_VFS_PROCESS_SETSID" name="Setsid" value="1 &lt;&lt; 2" />
-    </enum>
-    <enum name="ProcessResult" cname="GnomeVFSProcessResult" type="enum">
-      <member cname="GNOME_VFS_PROCESS_OK" name="Ok" />
-      <member cname="GNOME_VFS_PROCESS_ERROR_UNKNOWN" name="ErrorUnknown" />
-      <member cname="GNOME_VFS_PROCESS_ERROR_INVALIDSIGNAL" name="ErrorInvalidsignal" />
-      <member cname="GNOME_VFS_PROCESS_ERROR_NOPERM" name="ErrorNoperm" />
-      <member cname="GNOME_VFS_PROCESS_ERROR_NOPROCESS" name="ErrorNoprocess" />
-    </enum>
-    <enum name="ProcessRunResult" cname="GnomeVFSProcessRunResult" type="enum">
-      <member cname="GNOME_VFS_PROCESS_RUN_OK" name="Ok" />
-      <member cname="GNOME_VFS_PROCESS_RUN_ERROR" name="Error" />
-      <member cname="GNOME_VFS_PROCESS_RUN_CANCELLED" name="Cancelled" />
-      <member cname="GNOME_VFS_PROCESS_RUN_SIGNALED" name="Signaled" />
-      <member cname="GNOME_VFS_PROCESS_RUN_STOPPED" name="Stopped" />
-    </enum>
     <enum name="Result" cname="GnomeVFSResult" type="enum">
       <member cname="GNOME_VFS_OK" name="Ok" />
       <member cname="GNOME_VFS_ERROR_NOT_FOUND" name="ErrorNotFound" />
@@ -235,6 +235,8 @@
       <member cname="GNOME_VFS_SET_FILE_INFO_PERMISSIONS" name="Permissions" value="1 &lt;&lt; 1" />
       <member cname="GNOME_VFS_SET_FILE_INFO_OWNER" name="Owner" value="1 &lt;&lt; 2" />
       <member cname="GNOME_VFS_SET_FILE_INFO_TIME" name="Time" value="1 &lt;&lt; 3" />
+      <member cname="GNOME_VFS_SET_FILE_INFO_ACL" name="Acl" value="1 &lt;&lt; 4" />
+      <member cname="GNOME_VFS_SET_FILE_INFO_SELINUX_CONTEXT" name="SelinuxContext" value="1 &lt;&lt; 5" />
     </enum>
     <enum name="URIHideOptions" cname="GnomeVFSURIHideOptions" type="flags">
       <member cname="GNOME_VFS_URI_HIDE_NONE" name="None" />
@@ -273,6 +275,7 @@
       <member cname="GNOME_VFS_XFER_USE_UNIQUE_NAMES" name="UseUniqueNames" value="1 &lt;&lt; 9" />
       <member cname="GNOME_VFS_XFER_LINK_ITEMS" name="LinkItems" value="1 &lt;&lt; 10" />
       <member cname="GNOME_VFS_XFER_FOLLOW_LINKS_RECURSIVE" name="FollowLinksRecursive" value="1 &lt;&lt; 11" />
+      <member cname="GNOME_VFS_XFER_TARGET_DEFAULT_PERMS" name="TargetDefaultPerms" value="1 &lt;&lt; 12" />
     </enum>
     <enum name="XferOverwriteAction" cname="GnomeVFSXferOverwriteAction" type="enum">
       <member cname="GNOME_VFS_XFER_OVERWRITE_ACTION_ABORT" name="Abort" />
@@ -326,6 +329,31 @@
         <parameter type="gpointer" name="callback_data" />
       </parameters>
     </callback>
+    <callback name="AsyncCloseCallback" cname="GnomeVFSAsyncCloseCallback">
+      <return-type type="void" />
+      <parameters>
+        <parameter type="GnomeVFSAsyncHandle*" name="handle" />
+        <parameter type="GnomeVFSResult" name="result" />
+        <parameter type="gpointer" name="callback_data" />
+      </parameters>
+    </callback>
+    <callback name="AsyncCreateAsChannelCallback" cname="GnomeVFSAsyncCreateAsChannelCallback">
+      <return-type type="void" />
+      <parameters>
+        <parameter type="GnomeVFSAsyncHandle*" name="handle" />
+        <parameter type="GIOChannel*" name="channel" />
+        <parameter type="GnomeVFSResult" name="result" />
+        <parameter type="gpointer" name="callback_data" />
+      </parameters>
+    </callback>
+    <callback name="AsyncCreateCallback" cname="GnomeVFSAsyncCreateCallback">
+      <return-type type="void" />
+      <parameters>
+        <parameter type="GnomeVFSAsyncHandle*" name="handle" />
+        <parameter type="GnomeVFSResult" name="result" />
+        <parameter type="gpointer" name="callback_data" />
+      </parameters>
+    </callback>
     <callback name="AsyncDirectoryLoadCallback" cname="GnomeVFSAsyncDirectoryLoadCallback">
       <return-type type="void" />
       <parameters>
@@ -345,6 +373,14 @@
         <parameter type="gpointer" name="callback_data" />
       </parameters>
     </callback>
+    <callback name="AsyncFindDirectoryCallback" cname="GnomeVFSAsyncFindDirectoryCallback">
+      <return-type type="void" />
+      <parameters>
+        <parameter type="GnomeVFSAsyncHandle*" name="handle" />
+        <parameter type="GList*" name="results" />
+        <parameter type="gpointer" name="data" />
+      </parameters>
+    </callback>
     <callback name="AsyncGetFileInfoCallback" cname="GnomeVFSAsyncGetFileInfoCallback">
       <return-type type="void" />
       <parameters>
@@ -374,6 +410,14 @@
         <parameter type="gpointer" name="callback_data" />
       </parameters>
     </callback>
+    <callback name="AsyncOpenCallback" cname="GnomeVFSAsyncOpenCallback">
+      <return-type type="void" />
+      <parameters>
+        <parameter type="GnomeVFSAsyncHandle*" name="handle" />
+        <parameter type="GnomeVFSResult" name="result" />
+        <parameter type="gpointer" name="callback_data" />
+      </parameters>
+    </callback>
     <callback name="AsyncReadCallback" cname="GnomeVFSAsyncReadCallback">
       <return-type type="void" />
       <parameters>
@@ -385,6 +429,14 @@
         <parameter type="gpointer" name="callback_data" />
       </parameters>
     </callback>
+    <callback name="AsyncSeekCallback" cname="GnomeVFSAsyncSeekCallback">
+      <return-type type="void" />
+      <parameters>
+        <parameter type="GnomeVFSAsyncHandle*" name="handle" />
+        <parameter type="GnomeVFSResult" name="result" />
+        <parameter type="gpointer" name="callback_data" />
+      </parameters>
+    </callback>
     <callback name="AsyncSetFileInfoCallback" cname="GnomeVFSAsyncSetFileInfoCallback">
       <return-type type="void" />
       <parameters>
@@ -410,7 +462,7 @@
       <parameters>
         <parameter type="GnomeVFSAsyncHandle*" name="handle" />
         <parameter type="GnomeVFSXferProgressInfo*" name="info" />
-        <parameter type="gpointer" name="data" />
+        <parameter type="gpointer" name="user_data" />
       </parameters>
     </callback>
     <callback name="DNSSDBrowseCallback" cname="GnomeVFSDNSSDBrowseCallback">
@@ -442,7 +494,7 @@
         <parameter type="const-gchar*" name="rel_path" />
         <parameter type="GnomeVFSFileInfo*" name="info" />
         <parameter type="gboolean" name="recursing_will_loop" />
-        <parameter type="gpointer" name="data" />
+        <parameter type="gpointer" name="user_data" />
         <parameter type="gboolean*" name="recurse" />
       </parameters>
     </callback>
@@ -472,20 +524,6 @@
         <parameter type="gpointer" name="user_data" />
       </parameters>
     </callback>
-    <callback name="ProcessCallback" cname="GnomeVFSProcessCallback">
-      <return-type type="void" />
-      <parameters>
-        <parameter type="GnomeVFSProcess*" name="process" />
-        <parameter type="gint" name="status" />
-        <parameter type="gpointer" name="data" />
-      </parameters>
-    </callback>
-    <callback name="ProcessInitFunc" cname="GnomeVFSProcessInitFunc">
-      <return-type type="void" />
-      <parameters>
-        <parameter type="gpointer" name="data" />
-      </parameters>
-    </callback>
     <callback name="SniffBufferReadCall" cname="GnomeVFSSniffBufferReadCall">
       <return-type type="GnomeVFSResult" />
       <parameters>
@@ -516,7 +554,7 @@
         <parameter type="gpointer" name="connection" />
         <parameter type="gpointer" name="buffer" />
         <parameter type="GnomeVFSFileSize" name="bytes" />
-        <parameter type="GnomeVFSFileSize*" name="bytes_read" />
+        <parameter type="GnomeVFSFileSize*" name="bytes_read_out" />
         <parameter type="GnomeVFSCancellation*" name="cancellation" />
       </parameters>
     </callback>
@@ -534,7 +572,7 @@
         <parameter type="gpointer" name="connection" />
         <parameter type="gconstpointer" name="buffer" />
         <parameter type="GnomeVFSFileSize" name="bytes" />
-        <parameter type="GnomeVFSFileSize*" name="bytes_written" />
+        <parameter type="GnomeVFSFileSize*" name="bytes_written_out" />
         <parameter type="GnomeVFSCancellation*" name="cancellation" />
       </parameters>
     </callback>
@@ -550,14 +588,14 @@
         <parameter type="gboolean" name="succeeded" />
         <parameter type="char*" name="error" />
         <parameter type="char*" name="detailed_error" />
-        <parameter type="gpointer" name="data" />
+        <parameter type="gpointer" name="user_data" />
       </parameters>
     </callback>
     <callback name="XferProgressCallback" cname="GnomeVFSXferProgressCallback">
       <return-type type="gint" />
       <parameters>
         <parameter type="GnomeVFSXferProgressInfo*" name="info" />
-        <parameter type="gpointer" name="data" />
+        <parameter type="gpointer" name="user_data" />
       </parameters>
     </callback>
     <callback name="XdgMimeCallback" cname="XdgMimeCallback">
@@ -572,20 +610,6 @@
         <parameter type="void*" name="user_data" />
       </parameters>
     </callback>
-    <object name="Client" cname="GnomeVFSClient" parent="BonoboObject">
-      <field name="Priv" cname="priv" type="GnomeVFSClientPrivate*" />
-      <method name="GetType" cname="gnome_vfs_client_get_type" shared="true">
-        <return-type type="GType" />
-      </method>
-    </object>
-    <object name="ClientCall" cname="GnomeVFSClientCall" parent="BonoboObject">
-      <field name="DelayFinishMutex" cname="delay_finish_mutex" type="GMutex*" />
-      <field name="DelayFinishCond" cname="delay_finish_cond" type="GCond*" />
-      <field name="DelayFinish" cname="delay_finish" type="gboolean" />
-      <method name="GetType" cname="gnome_vfs_client_call_get_type" shared="true">
-        <return-type type="GType" />
-      </method>
-    </object>
     <object name="MIMEMonitor" cname="GnomeVFSMIMEMonitor" parent="GObject">
       <field name="Priv" cname="priv" type="GnomeVFSMIMEMonitorPrivate*" />
       <signal name="DataChanged" cname="data_changed" when="LAST">
@@ -601,6 +625,142 @@
         <return-type type="GType" />
       </method>
     </object>
+    <object name="ACE" cname="GnomeVFSACE" parent="GObject">
+      <field name="Priv" cname="priv" type="GnomeVFSACEPrivate*" />
+      <property name="" cname="" type="" />
+      <property name="" cname="" type="" />
+      <property name="" cname="" type="" />
+      <property name="" cname="" type="" />
+      <property name="" cname="" type="" />
+      <method name="AddPerm" cname="gnome_vfs_ace_add_perm">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GnomeVFSACLPerm" name="perm" />
+        </parameters>
+      </method>
+      <method name="CheckPerm" cname="gnome_vfs_ace_check_perm">
+        <return-type type="gboolean" />
+        <parameters>
+          <parameter type="GnomeVFSACLPerm" name="perm" />
+        </parameters>
+      </method>
+      <method name="CopyPerms" cname="gnome_vfs_ace_copy_perms">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GnomeVFSACE*" name="dest" />
+        </parameters>
+      </method>
+      <method name="DelPerm" cname="gnome_vfs_ace_del_perm">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GnomeVFSACLPerm" name="perm" />
+        </parameters>
+      </method>
+      <method name="Equal" cname="gnome_vfs_ace_equal">
+        <return-type type="gboolean" />
+        <parameters>
+          <parameter type="GnomeVFSACE*" name="entry_b" />
+        </parameters>
+      </method>
+      <method name="GetId" cname="gnome_vfs_ace_get_id">
+        <return-type type="const-char*" />
+      </method>
+      <method name="GetInherit" cname="gnome_vfs_ace_get_inherit">
+        <return-type type="gboolean" />
+      </method>
+      <method name="GetKind" cname="gnome_vfs_ace_get_kind">
+        <return-type type="GnomeVFSACLKind" />
+      </method>
+      <method name="GetNegative" cname="gnome_vfs_ace_get_negative">
+        <return-type type="gboolean" />
+      </method>
+      <method name="GetPerms" cname="gnome_vfs_ace_get_perms">
+        <return-type type="const-GnomeVFSACLPerm*" />
+      </method>
+      <method name="GetType" cname="gnome_vfs_ace_get_type" shared="true">
+        <return-type type="GType" />
+      </method>
+      <constructor cname="gnome_vfs_ace_new">
+        <parameters>
+          <parameter type="GnomeVFSACLKind" name="kind" />
+          <parameter type="const-char*" name="id" />
+          <parameter type="GnomeVFSACLPerm*" name="perms" />
+        </parameters>
+      </constructor>
+      <method name="SetId" cname="gnome_vfs_ace_set_id">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="const-char*" name="id" />
+        </parameters>
+      </method>
+      <method name="SetInherit" cname="gnome_vfs_ace_set_inherit">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="gboolean" name="inherit" />
+        </parameters>
+      </method>
+      <method name="SetKind" cname="gnome_vfs_ace_set_kind">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GnomeVFSACLKind" name="kind" />
+        </parameters>
+      </method>
+      <method name="SetNegative" cname="gnome_vfs_ace_set_negative">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="gboolean" name="negative" />
+        </parameters>
+      </method>
+      <method name="SetPerms" cname="gnome_vfs_ace_set_perms">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GnomeVFSACLPerm*" name="perms" />
+        </parameters>
+      </method>
+    </object>
+    <object name="ACL" cname="GnomeVFSACL" parent="GObject">
+      <field name="Priv" cname="priv" type="GnomeVFSACLPrivate*" />
+      <method name="Clear" cname="gnome_vfs_acl_clear">
+        <return-type type="void" />
+      </method>
+      <method name="FreeAceList" cname="gnome_vfs_acl_free_ace_list" shared="true">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GList*" name="ace_list" />
+        </parameters>
+      </method>
+      <method name="GetAceList" cname="gnome_vfs_acl_get_ace_list">
+        <return-type type="GList*" />
+      </method>
+      <method name="GetType" cname="gnome_vfs_acl_get_type" shared="true">
+        <return-type type="GType" />
+      </method>
+      <method name="KindToString" cname="gnome_vfs_acl_kind_to_string" shared="true">
+        <return-type type="const-char*" />
+        <parameters>
+          <parameter type="GnomeVFSACLKind" name="kind" />
+        </parameters>
+      </method>
+      <constructor cname="gnome_vfs_acl_new" />
+      <method name="PermToString" cname="gnome_vfs_acl_perm_to_string" shared="true">
+        <return-type type="const-char*" />
+        <parameters>
+          <parameter type="GnomeVFSACLPerm" name="perm" />
+        </parameters>
+      </method>
+      <method name="Set" cname="gnome_vfs_acl_set">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GnomeVFSACE*" name="ace" />
+        </parameters>
+      </method>
+      <method name="Unset" cname="gnome_vfs_acl_unset">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GnomeVFSACE*" name="ace" />
+        </parameters>
+      </method>
+    </object>
     <object name="Drive" cname="GnomeVFSDrive" parent="GObject">
       <field name="Priv" cname="priv" type="GnomeVFSDrivePrivate*" />
       <signal name="VolumeMounted" cname="volume_mounted" when="FIRST">
@@ -850,9 +1010,13 @@
     </object>
     <object name="VolumeMonitorClient" cname="GnomeVFSVolumeMonitorClient" parent="GnomeVFSVolumeMonitor">
       <field name="IsShutdown" cname="is_shutdown" type="gboolean" />
+      <field name="DbusConn" cname="dbus_conn" type="DBusConnection*" />
       <method name="GetType" cname="gnome_vfs_volume_monitor_client_get_type" shared="true">
         <return-type type="GType" />
       </method>
+      <method name="ShutdownPrivate" cname="gnome_vfs_volume_monitor_client_shutdown_private">
+        <return-type type="void" />
+      </method>
     </object>
     <object name="VolumeMonitorDaemon" cname="GnomeVFSVolumeMonitorDaemon" parent="GnomeVFSVolumeMonitor">
       <field name="HalCtx" cname="hal_ctx" type="LibHalContext*" />
@@ -871,10 +1035,18 @@
         <return-type type="GType" />
       </method>
     </object>
+    <alias name="ACLKind" cname="GnomeVFSACLKind" type="guint32" />
+    <alias name="ACLPerm" cname="GnomeVFSACLPerm" type="guint32" />
     <boxed name="Address" cname="GnomeVFSAddress" opaque="true">
       <method name="Dup" cname="gnome_vfs_address_dup">
         <return-type type="GnomeVFSAddress*" />
       </method>
+      <method name="Equal" cname="gnome_vfs_address_equal">
+        <return-type type="gboolean" />
+        <parameters>
+          <parameter type="const-GnomeVFSAddress*" name="b" />
+        </parameters>
+      </method>
       <method name="Free" cname="gnome_vfs_address_free">
         <return-type type="void" />
       </method>
@@ -887,6 +1059,13 @@
       <method name="GetType" cname="gnome_vfs_address_get_type" shared="true">
         <return-type type="GType" />
       </method>
+      <method name="Match" cname="gnome_vfs_address_match">
+        <return-type type="gboolean" />
+        <parameters>
+          <parameter type="const-GnomeVFSAddress*" name="b" />
+          <parameter type="guint" name="prefix" />
+        </parameters>
+      </method>
       <constructor cname="gnome_vfs_address_new_from_ipv4">
         <parameters>
           <parameter type="guint32" name="ipv4_address" />
@@ -907,12 +1086,7 @@
         <return-type type="char*" />
       </method>
     </boxed>
-    <alias name="AsyncCloseCallback" cname="GnomeVFSAsyncCloseCallback" type="GnomeVFSAsyncCallback" />
-    <alias name="AsyncCreateAsChannelCallback" cname="GnomeVFSAsyncCreateAsChannelCallback" type="GnomeVFSAsyncOpenAsChannelCallback" />
-    <alias name="AsyncCreateCallback" cname="GnomeVFSAsyncCreateCallback" type="GnomeVFSAsyncCallback" />
     <struct name="AsyncHandle" cname="GnomeVFSAsyncHandle" opaque="true" />
-    <alias name="AsyncOpenCallback" cname="GnomeVFSAsyncOpenCallback" type="GnomeVFSAsyncCallback" />
-    <alias name="AsyncSeekCallback" cname="GnomeVFSAsyncSeekCallback" type="GnomeVFSAsyncCallback" />
     <struct name="Cancellation" cname="GnomeVFSCancellation" opaque="true">
       <method name="Ack" cname="gnome_vfs_cancellation_ack">
         <return-type type="void" />
@@ -974,11 +1148,11 @@
       <field name="SymlinkName" cname="symlink_name" type="char*" access="public" writeable="true" />
       <field name="MimeType" cname="mime_type" type="char*" access="public" writeable="true" />
       <field name="Refcount" cname="refcount" type="guint" access="public" writeable="true" />
+      <field name="Acl" cname="acl" type="GnomeVFSACL*" access="public" writeable="true" />
+      <field name="SelinuxContext" cname="selinux_context" type="char*" access="public" writeable="true" />
       <field name="Reserved1" cname="reserved1" type="void*" access="public" writeable="true" />
       <field name="Reserved2" cname="reserved2" type="void*" access="public" writeable="true" />
       <field name="Reserved3" cname="reserved3" type="void*" access="public" writeable="true" />
-      <field name="Reserved4" cname="reserved4" type="void*" access="public" writeable="true" />
-      <field name="Reserved5" cname="reserved5" type="void*" access="public" writeable="true" />
       <method name="Clear" cname="gnome_vfs_file_info_clear">
         <return-type type="void" />
       </method>
@@ -1038,13 +1212,31 @@
     <struct name="FindDirectoryResult" cname="GnomeVFSFindDirectoryResult">
       <field name="Uri" cname="uri" type="GnomeVFSURI*" />
       <field name="Result" cname="result" type="GnomeVFSResult" />
-      <field name="Reserved1" cname="reserved1" type="void*" />
-      <field name="Reserved2" cname="reserved2" type="void*" />
+      <field name="Reserved1" cname="reserved1" type="void*" access="private" />
+      <field name="Reserved2" cname="reserved2" type="void*" access="private" />
+      <method name="Dup" cname="gnome_vfs_find_directory_result_dup">
+        <return-type type="GnomeVFSFindDirectoryResult*" />
+      </method>
+      <method name="Free" cname="gnome_vfs_find_directory_result_free">
+        <return-type type="void" />
+      </method>
+      <method name="GetType" cname="gnome_vfs_find_directory_result_get_type" shared="true">
+        <return-type type="GType" />
+      </method>
     </struct>
     <struct name="GetFileInfoResult" cname="GnomeVFSGetFileInfoResult">
       <field name="Uri" cname="uri" type="GnomeVFSURI*" />
       <field name="Result" cname="result" type="GnomeVFSResult" />
       <field name="FileInfo" cname="file_info" type="GnomeVFSFileInfo*" />
+      <method name="Dup" cname="gnome_vfs_get_file_info_result_dup">
+        <return-type type="GnomeVFSGetFileInfoResult*" />
+      </method>
+      <method name="Free" cname="gnome_vfs_get_file_info_result_free">
+        <return-type type="void" />
+      </method>
+      <method name="GetType" cname="gnome_vfs_get_file_info_result_get_type" shared="true">
+        <return-type type="GType" />
+      </method>
     </struct>
     <struct name="Handle" cname="GnomeVFSHandle" opaque="true" />
     <struct name="InetConnection" cname="GnomeVFSInetConnection" opaque="true">
@@ -1096,8 +1288,8 @@
     <alias name="MethodHandle" cname="GnomeVFSMethodHandle" type="gpointer" />
     <struct name="MimeAction" cname="GnomeVFSMimeAction" deprecated="1">
       <field name="ActionType" cname="action_type" type="GnomeVFSMimeActionType" />
-      <field name="Component" cname="component" type="Bonobo_ServerInfo*" />
-      <field name="Reserved1" cname="reserved1" type="void*" />
+      <field name="Component" cname="component" type="void*" />
+      <field name="Reserved1" cname="reserved1" type="void*" access="private" />
       <method name="Free" cname="gnome_vfs_mime_action_free" deprecated="1">
         <return-type type="void" />
       </method>
@@ -1229,13 +1421,12 @@
       <field name="Uri" cname="uri" type="char*" />
       <field name="Realm" cname="realm" type="char*" />
       <field name="PreviousAttemptFailed" cname="previous_attempt_failed" type="gboolean" />
-      <field name="AuthType" cname="auth_type" type="}" />
+      <field name="AuthType" cname="auth_type" type="GnomeVFSModuleCallbackAuthenticationAuthType" />
       <field name="Reserved1" cname="reserved1" type="void*" />
       <field name="Reserved2" cname="reserved2" type="void*" />
     </struct>
     <struct name="ModuleCallbackAuthenticationOut" cname="GnomeVFSModuleCallbackAuthenticationOut">
       <field name="Username" cname="username" type="char*" />
-      <field name="NULL" cname="NULL indicates no auth should be provided" type="*" />
       <field name="Password" cname="password" type="char*" />
       <field name="Reserved1" cname="reserved1" type="void*" />
       <field name="Reserved2" cname="reserved2" type="void*" />
@@ -1339,7 +1530,6 @@
       <field name="Reserved2" cname="reserved2" type="void*" />
     </struct>
     <struct name="MonitorHandle" cname="GnomeVFSMonitorHandle" opaque="true" />
-    <struct name="Process" cname="GnomeVFSProcess" opaque="true" />
     <struct name="ProgressCallbackState" cname="GnomeVFSProgressCallbackState" opaque="true" />
     <struct name="ResolveHandle" cname="GnomeVFSResolveHandle" opaque="true" />
     <struct name="SSL" cname="GnomeVFSSSL" opaque="true">
@@ -1717,6 +1907,7 @@
     </struct>
     <struct name="XdgAliasList" cname="XdgAliasList" opaque="true" />
     <struct name="XdgGlobHash" cname="XdgGlobHash" opaque="true" />
+    <struct name="XdgMimeCache" cname="XdgMimeCache" opaque="true" />
     <struct name="XdgMimeMagic" cname="XdgMimeMagic" opaque="true" />
     <struct name="XdgParentList" cname="XdgParentList" opaque="true" />
     <alias name="XdgUchar8T" cname="xdg_uchar8_t" type="unsigned char" />
@@ -1882,7 +2073,7 @@
           <parameter type="gpointer" name="callback_data" />
         </parameters>
       </method>
-      <method name="CreateAsChannel" cname="gnome_vfs_async_create_as_channel" shared="true">
+      <method name="CreateAsChannel" cname="gnome_vfs_async_create_as_channel" deprecated="1" shared="true">
         <return-type type="void" />
         <parameters>
           <parameter type="GnomeVFSAsyncHandle**" name="handle_return" />
@@ -1919,7 +2110,7 @@
           <parameter type="gpointer" name="callback_data" />
         </parameters>
       </method>
-      <method name="CreateUriAsChannel" cname="gnome_vfs_async_create_uri_as_channel" shared="true">
+      <method name="CreateUriAsChannel" cname="gnome_vfs_async_create_uri_as_channel" deprecated="1" shared="true">
         <return-type type="void" />
         <parameters>
           <parameter type="GnomeVFSAsyncHandle**" name="handle_return" />
@@ -2030,7 +2221,7 @@
           <parameter type="gpointer" name="callback_data" />
         </parameters>
       </method>
-      <method name="OpenAsChannel" cname="gnome_vfs_async_open_as_channel" shared="true">
+      <method name="OpenAsChannel" cname="gnome_vfs_async_open_as_channel" deprecated="1" shared="true">
         <return-type type="void" />
         <parameters>
           <parameter type="GnomeVFSAsyncHandle**" name="handle_return" />
@@ -2053,7 +2244,7 @@
           <parameter type="gpointer" name="callback_data" />
         </parameters>
       </method>
-      <method name="OpenUriAsChannel" cname="gnome_vfs_async_open_uri_as_channel" shared="true">
+      <method name="OpenUriAsChannel" cname="gnome_vfs_async_open_uri_as_channel" deprecated="1" shared="true">
         <return-type type="void" />
         <parameters>
           <parameter type="GnomeVFSAsyncHandle**" name="handle_return" />
@@ -2169,9 +2360,9 @@
       <method name="ConnectToServer" cname="gnome_vfs_connect_to_server" shared="true">
         <return-type type="void" />
         <parameters>
-          <parameter type="char*" name="uri" />
-          <parameter type="char*" name="display_name" />
-          <parameter type="char*" name="icon" />
+          <parameter type="const-char*" name="uri" />
+          <parameter type="const-char*" name="display_name" />
+          <parameter type="const-char*" name="icon" />
         </parameters>
       </method>
       <method name="ExpandInitialTilde" cname="gnome_vfs_expand_initial_tilde" shared="true">
@@ -2203,6 +2394,14 @@
           <parameter type="GnomeVFSContext*" name="context" />
         </parameters>
       </method>
+      <method name="ForgetCache" cname="gnome_vfs_forget_cache" shared="true">
+        <return-type type="GnomeVFSResult" />
+        <parameters>
+          <parameter type="GnomeVFSHandle*" name="handle" />
+          <parameter type="GnomeVFSFileOffset" name="offset" />
+          <parameter type="GnomeVFSFileSize" name="size" />
+        </parameters>
+      </method>
       <method name="GetFileInfo" cname="gnome_vfs_get_file_info" shared="true">
         <return-type type="GnomeVFSResult" />
         <parameters>
@@ -2291,6 +2490,20 @@
           <parameter type="int" name="data_size" />
         </parameters>
       </method>
+      <method name="GetMimeTypeForName" cname="gnome_vfs_get_mime_type_for_name" shared="true">
+        <return-type type="const-char*" />
+        <parameters>
+          <parameter type="const-char*" name="filename" />
+        </parameters>
+      </method>
+      <method name="GetMimeTypeForNameAndData" cname="gnome_vfs_get_mime_type_for_name_and_data" shared="true">
+        <return-type type="const-char*" />
+        <parameters>
+          <parameter type="const-char*" name="filename" />
+          <parameter type="gconstpointer" name="data" />
+          <parameter type="gssize" name="data_size" />
+        </parameters>
+      </method>
       <method name="GetMimeTypeFromFileData" cname="gnome_vfs_get_mime_type_from_file_data" deprecated="1" shared="true">
         <return-type type="const-char*" />
         <parameters>
@@ -2306,6 +2519,12 @@
       <method name="GetRegisteredMimeTypes" cname="gnome_vfs_get_registered_mime_types" deprecated="1" shared="true">
         <return-type type="GList*" />
       </method>
+      <method name="GetSlowMimeType" cname="gnome_vfs_get_slow_mime_type" shared="true">
+        <return-type type="char*" />
+        <parameters>
+          <parameter type="const-char*" name="text_uri" />
+        </parameters>
+      </method>
       <method name="GetSpecialMimeType" cname="gnome_vfs_get_special_mime_type" shared="true">
         <return-type type="const-char*" />
         <parameters>
@@ -2361,6 +2580,22 @@
           <parameter type="char**" name="linkname" />
         </parameters>
       </method>
+      <method name="PtyOpen" cname="gnome_vfs_pty_open" shared="true">
+        <return-type type="int" />
+        <parameters>
+          <parameter type="pid_t*" name="child" />
+          <parameter type="guint" name="flags" />
+          <parameter type="char**" name="env_add" />
+          <parameter type="const-char*" name="command" />
+          <parameter type="char**" name="argv" />
+          <parameter type="const-char*" name="directory" />
+          <parameter type="int" name="columns" />
+          <parameter type="int" name="rows" />
+          <parameter type="int*" name="stdin_fd" />
+          <parameter type="int*" name="stdout_fd" />
+          <parameter type="int*" name="stderr_fd" />
+        </parameters>
+      </method>
       <method name="RemoveDirectory" cname="gnome_vfs_remove_directory" shared="true">
         <return-type type="GnomeVFSResult" />
         <parameters>
@@ -2518,24 +2753,30 @@
       </method>
     </class>
     <class name="Daemon" cname="GnomeVfsDaemon_">
-      <method name="ConvertFromCorbaFileInfo" cname="gnome_vfs_daemon_convert_from_corba_file_info" shared="true">
-        <return-type type="void" />
+      <method name="MessageAppendFileInfo" cname="gnome_vfs_daemon_message_append_file_info" shared="true">
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="const-GNOME_VFS_FileInfo*" name="corba_info" />
-          <parameter type="GnomeVFSFileInfo*" name="file_info" />
+          <parameter type="DBusMessage*" name="message" />
+          <parameter type="const-GnomeVFSFileInfo*" name="info" />
         </parameters>
       </method>
-      <method name="ConvertToCorbaFileInfo" cname="gnome_vfs_daemon_convert_to_corba_file_info" shared="true">
-        <return-type type="void" />
+      <method name="MessageIterAppendFileInfo" cname="gnome_vfs_daemon_message_iter_append_file_info" shared="true">
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="const-GnomeVFSFileInfo*" name="file_info" />
-          <parameter type="GNOME_VFS_FileInfo*" name="corba_info" />
+          <parameter type="DBusMessageIter*" name="iter" />
+          <parameter type="const-GnomeVFSFileInfo*" name="info" />
         </parameters>
       </method>
-      <method name="SetCurrentDaemonClientCall" cname="gnome_vfs_daemon_set_current_daemon_client_call" shared="true">
+      <method name="MessageIterGetFileInfo" cname="gnome_vfs_daemon_message_iter_get_file_info" shared="true">
+        <return-type type="GnomeVFSFileInfo*" />
+        <parameters>
+          <parameter type="DBusMessageIter*" name="iter" />
+        </parameters>
+      </method>
+      <method name="SetCurrentConnection" cname="gnome_vfs_daemon_set_current_connection" shared="true">
         <return-type type="void" />
         <parameters>
-          <parameter type="GNOME_VFS_ClientCall" name="client_call" />
+          <parameter type="DBusConnection*" name="conn" />
         </parameters>
       </method>
     </class>
@@ -2758,16 +2999,22 @@
       <method name="UriFromInput" cname="gnome_vfs_make_uri_from_input" shared="true">
         <return-type type="char*" />
         <parameters>
-          <parameter type="const-char*" name="uri" />
+          <parameter type="const-char*" name="location" />
         </parameters>
       </method>
       <method name="UriFromInputWithDirs" cname="gnome_vfs_make_uri_from_input_with_dirs" shared="true">
         <return-type type="char*" />
         <parameters>
-          <parameter type="const-char*" name="uri" />
+          <parameter type="const-char*" name="location" />
           <parameter type="GnomeVFSMakeURIDirs" name="dirs" />
         </parameters>
       </method>
+      <method name="UriFromInputWithTrailingWs" cname="gnome_vfs_make_uri_from_input_with_trailing_ws" shared="true">
+        <return-type type="char*" />
+        <parameters>
+          <parameter type="const-char*" name="location" />
+        </parameters>
+      </method>
       <method name="UriFromShellArg" cname="gnome_vfs_make_uri_from_shell_arg" shared="true">
         <return-type type="char*" />
         <parameters>
@@ -2810,7 +3057,7 @@
           <parameter type="const-char*" name="mime_type" />
         </parameters>
       </method>
-      <method name="ComponentListFree" cname="gnome_vfs_mime_component_list_free" shared="true">
+      <method name="ComponentListFree" cname="gnome_vfs_mime_component_list_free" deprecated="1" shared="true">
         <return-type type="void" />
         <parameters>
           <parameter type="GList*" name="list" />
@@ -2845,7 +3092,7 @@
           <parameter type="const-char*" name="mime_type" />
         </parameters>
       </method>
-      <method name="GetAllComponents" cname="gnome_vfs_mime_get_all_components" shared="true">
+      <method name="GetAllComponents" cname="gnome_vfs_mime_get_all_components" deprecated="1" shared="true">
         <return-type type="GList*" />
         <parameters>
           <parameter type="const-char*" name="mime_type" />
@@ -2882,8 +3129,8 @@
           <parameter type="const-char*" name="mime_type" />
         </parameters>
       </method>
-      <method name="GetDefaultComponent" cname="gnome_vfs_mime_get_default_component" shared="true">
-        <return-type type="Bonobo_ServerInfo*" />
+      <method name="GetDefaultComponent" cname="gnome_vfs_mime_get_default_component" deprecated="1" shared="true">
+        <return-type type="void*" />
         <parameters>
           <parameter type="const-char*" name="mime_type" />
         </parameters>
@@ -3143,7 +3390,7 @@
           <parameter type="mode_t" name="mode" />
         </parameters>
       </method>
-      <method name="TypeFromName" cname="gnome_vfs_mime_type_from_name" shared="true">
+      <method name="TypeFromName" cname="gnome_vfs_mime_type_from_name" deprecated="1" shared="true">
         <return-type type="const-char*" />
         <parameters>
           <parameter type="const-char*" name="filename" />
@@ -3443,6 +3690,4 @@
           <parameter type="gpointer" name="data" />
         </parameters>
       </method>
-    </class>
-  </namespace>
-</api>
\ No newline at end of file
+    </class></namespace></api>
\ No newline at end of file
diff --git a/parser/gapi-parser.cs b/parser/gapi-parser.cs
index b4df40030..56ba5c503 100644
--- a/parser/gapi-parser.cs
+++ b/parser/gapi-parser.cs
@@ -158,7 +158,9 @@ namespace GtkSharp.Parsing {
 			
 				XmlDocument final = new XmlDocument ();
 				final.Load (prefile);
-				final.Save (outfile);
+				XmlTextWriter writer = new XmlTextWriter (outfile, null);
+				writer.Formatting = Formatting.Indented;
+				final.Save (writer);
 				File.Delete (prefile);
 			}
 
diff --git a/sample/PrintSample.cs b/sample/PrintSample.cs
index 349f6e323..34315936c 100644
--- a/sample/PrintSample.cs
+++ b/sample/PrintSample.cs
@@ -33,7 +33,7 @@ class PrintSample
 		Application.Run ();
 	}
 	
-	void MyPrint (PrintContext gpc)
+	void MyPrint (Gnome.PrintContext gpc)
 	{
 		gpc.BeginPage ("demo");
 		gpc.MoveTo (1, 700);
@@ -43,8 +43,8 @@ class PrintSample
 	
 	void OnPrintClicked (object o, EventArgs args)
 	{
-		PrintJob pj = new PrintJob (PrintConfig.Default ());
-		PrintDialog dialog = new PrintDialog (pj, "Print Test", 0);
+		Gnome.PrintJob pj = new Gnome.PrintJob (Gnome.PrintConfig.Default ());
+		Gnome.PrintDialog dialog = new Gnome.PrintDialog (pj, "Print Test", 0);
 		int response = dialog.Run ();
 		Console.WriteLine ("response: " + response);
 		
@@ -55,7 +55,7 @@ class PrintSample
 			return;
 		}
 
-		PrintContext ctx = pj.Context;
+		Gnome.PrintContext ctx = pj.Context;
 		MyPrint (ctx); 
 
 		pj.Close ();
diff --git a/sources/Makefile.am b/sources/Makefile.am
index d0185bdc0..3f11c15f2 100644
--- a/sources/Makefile.am
+++ b/sources/Makefile.am
@@ -53,8 +53,8 @@ GTK_2_10_DOWNLOADS = \
 	http://ftp.gnome.org/pub/GNOME/platform/2.15/2.15.4/sources/libgnome-2.15.1.tar.bz2       	\
 	http://ftp.gnome.org/pub/GNOME/platform/2.15/2.15.4/sources/libgnomecanvas-2.14.0.tar.bz2 	\
 	http://ftp.gnome.org/pub/GNOME/platform/2.15/2.15.4/sources/libgnomeui-2.15.2.tar.bz2     	\
-	http://ftp.gnome.org/pub/GNOME/desktop/2.15/2.15.4/sources/libgnomeprint-2.12.1.tar.bz2		\
-	http://ftp.gnome.org/pub/GNOME/desktop/2.15/2.15.4/sources/libgnomeprintui-2.12.1.tar.bz2	\
+	http://ftp.gnome.org/pub/GNOME/platform/2.10/2.10.0/sources/libgnomeprint-2.10.0.tar.bz2		\
+	http://ftp.gnome.org/pub/GNOME/platform/2.10/2.10.0/sources/libgnomeprintui-2.10.0.1.tar.bz2	\
 	http://ftp.gnome.org/pub/GNOME/desktop/2.15/2.15.4/sources/gnome-panel-2.14.2.tar.bz2
 
 GNOME_DOWNLOADS = \
diff --git a/sources/gtk-sharp-2.10-sources.xml b/sources/gtk-sharp-2.10-sources.xml
index 2ebda6327..6f002eafb 100644
--- a/sources/gtk-sharp-2.10-sources.xml
+++ b/sources/gtk-sharp-2.10-sources.xml
@@ -190,7 +190,7 @@
     </library>
     <library name="gnomeprint-2-2">
       <namespace name="Gnome">
-        <directory path="libgnomeprint-2.12.1/libgnomeprint">
+        <directory path="libgnomeprint-2.10.0/libgnomeprint">
 	  <exclude>gnome-font-family.h</exclude>
 	  <exclude>gnome-fontmap.h</exclude>
 	  <exclude>gnome-print-encode.h</exclude>
@@ -210,7 +210,7 @@
     </library>
     <library name="gnomeprintui-2-2">
       <namespace name="Gnome">
-        <directory path="libgnomeprintui-2.12.1/libgnomeprintui">
+        <directory path="libgnomeprintui-2.10.0.1/libgnomeprintui">
 	  <exclude>gnome-canvas-hacktext.h</exclude>
 	  <exclude>gnome-print-copies.h</exclude>
 	  <exclude>gnome-print-i18n.h</exclude>