diff -ur Desktop/gir-1.0/Atk-1.0.gir /opt/gnome/share/gir-1.0/Atk-1.0.gir
--- Desktop/gir-1.0/Atk-1.0.gir	2010-01-23 13:26:52.000000000 +0100
+++ /opt/gnome/share/gir-1.0/Atk-1.0.gir	2010-01-23 20:00:37.000000000 +0100
@@ -3513,36 +3513,6 @@
           </parameter>
         </parameters>
       </constructor>
-      <function name="type_register" c:identifier="atk_relation_type_register">
-        <return-value transfer-ownership="full">
-          <type name="RelationType" c:type="AtkRelationType"/>
-        </return-value>
-        <parameters>
-          <parameter name="name" transfer-ownership="none">
-            <type name="utf8" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </function>
-      <function name="type_get_name" c:identifier="atk_relation_type_get_name">
-        <return-value transfer-ownership="none">
-          <type name="utf8" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="type" transfer-ownership="none">
-            <type name="RelationType" c:type="AtkRelationType"/>
-          </parameter>
-        </parameters>
-      </function>
-      <function name="type_for_name" c:identifier="atk_relation_type_for_name">
-        <return-value transfer-ownership="full">
-          <type name="RelationType" c:type="AtkRelationType"/>
-        </return-value>
-        <parameters>
-          <parameter name="name" transfer-ownership="none">
-            <type name="utf8" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </function>
       <method name="get_relation_type"
               c:identifier="atk_relation_get_relation_type">
         <return-value transfer-ownership="full">
@@ -6167,6 +6137,16 @@
                glib:type-name="AtkText"
                glib:get-type="atk_text_get_type"
                glib:type-struct="TextIface">
+      <function name="free_ranges" c:identifier="atk_text_free_ranges">
+        <return-value transfer-ownership="none">
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="ranges" transfer-ownership="none">
+            <type name="TextRange" c:type="AtkTextRange**"/>
+          </parameter>
+        </parameters>
+      </function>
       <virtual-method name="get_text" invoker="get_text">
         <return-value transfer-ownership="full">
           <type name="utf8" c:type="gchar*"/>
@@ -7838,6 +7818,39 @@
         <type name="utf8" c:type="gchar*"/>
       </return-value>
     </function>
+    <function name="relation_type_for_name"
+              c:identifier="atk_relation_type_for_name">
+      <return-value transfer-ownership="full">
+        <type name="RelationType" c:type="AtkRelationType"/>
+      </return-value>
+      <parameters>
+        <parameter name="name" transfer-ownership="none">
+          <type name="utf8" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="relation_type_get_name"
+              c:identifier="atk_relation_type_get_name">
+      <return-value transfer-ownership="none">
+        <type name="utf8" c:type="gchar*"/>
+      </return-value>
+      <parameters>
+        <parameter name="type" transfer-ownership="none">
+          <type name="RelationType" c:type="AtkRelationType"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="relation_type_register"
+              c:identifier="atk_relation_type_register">
+      <return-value transfer-ownership="full">
+        <type name="RelationType" c:type="AtkRelationType"/>
+      </return-value>
+      <parameters>
+        <parameter name="name" transfer-ownership="none">
+          <type name="utf8" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
     <function name="remove_focus_tracker"
               c:identifier="atk_remove_focus_tracker">
       <return-value transfer-ownership="none">
@@ -7992,15 +8005,5 @@
         </parameter>
       </parameters>
     </function>
-    <function name="text_free_ranges" c:identifier="atk_text_free_ranges">
-      <return-value transfer-ownership="none">
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="ranges" transfer-ownership="none">
-          <type name="TextRange" c:type="AtkTextRange**"/>
-        </parameter>
-      </parameters>
-    </function>
   </namespace>
 </repository>
diff -ur Desktop/gir-1.0/Gio-2.0.gir /opt/gnome/share/gir-1.0/Gio-2.0.gir
--- Desktop/gir-1.0/Gio-2.0.gir	2010-01-23 13:47:42.000000000 +0100
+++ /opt/gnome/share/gir-1.0/Gio-2.0.gir	2010-01-23 19:56:11.000000000 +0100
@@ -22,6 +22,97 @@
                glib:type-name="GAppInfo"
                glib:get-type="g_app_info_get_type"
                glib:type-struct="AppInfoIface">
+      <function name="create_from_commandline"
+                c:identifier="g_app_info_create_from_commandline"
+                throws="1">
+        <return-value transfer-ownership="full">
+          <type name="AppInfo" c:type="GAppInfo*"/>
+        </return-value>
+        <parameters>
+          <parameter name="commandline" transfer-ownership="none">
+            <type name="utf8" c:type="char*"/>
+          </parameter>
+          <parameter name="application_name"
+                     transfer-ownership="none"
+                     allow-none="1">
+            <type name="utf8" c:type="char*"/>
+          </parameter>
+          <parameter name="flags" transfer-ownership="none">
+            <type name="AppInfoCreateFlags" c:type="GAppInfoCreateFlags"/>
+          </parameter>
+        </parameters>
+      </function>
+      <function name="get_all" c:identifier="g_app_info_get_all">
+        <return-value transfer-ownership="full">
+          <type name="GLib.List" c:type="GList*">
+            <type name="AppInfo"/>
+          </type>
+        </return-value>
+      </function>
+      <function name="get_all_for_type"
+                c:identifier="g_app_info_get_all_for_type">
+        <return-value transfer-ownership="full">
+          <type name="GLib.List" c:type="GList*">
+            <type name="AppInfo"/>
+          </type>
+        </return-value>
+        <parameters>
+          <parameter name="content_type" transfer-ownership="none">
+            <type name="utf8" c:type="char*"/>
+          </parameter>
+        </parameters>
+      </function>
+      <function name="reset_type_associations"
+                c:identifier="g_app_info_reset_type_associations">
+        <return-value transfer-ownership="none">
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="content_type" transfer-ownership="none">
+            <type name="utf8" c:type="char*"/>
+          </parameter>
+        </parameters>
+      </function>
+      <function name="get_default_for_type"
+                c:identifier="g_app_info_get_default_for_type">
+        <return-value transfer-ownership="full">
+          <type name="AppInfo" c:type="GAppInfo*"/>
+        </return-value>
+        <parameters>
+          <parameter name="content_type" transfer-ownership="none">
+            <type name="utf8" c:type="char*"/>
+          </parameter>
+          <parameter name="must_support_uris" transfer-ownership="none">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </function>
+      <function name="get_default_for_uri_scheme"
+                c:identifier="g_app_info_get_default_for_uri_scheme">
+        <return-value transfer-ownership="full">
+          <type name="AppInfo" c:type="GAppInfo*"/>
+        </return-value>
+        <parameters>
+          <parameter name="uri_scheme" transfer-ownership="none">
+            <type name="utf8" c:type="char*"/>
+          </parameter>
+        </parameters>
+      </function>
+      <function name="launch_default_for_uri"
+                c:identifier="g_app_info_launch_default_for_uri"
+                throws="1">
+        <return-value transfer-ownership="none">
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="uri" transfer-ownership="none">
+            <type name="utf8" c:type="char*"/>
+          </parameter>
+          <parameter name="launch_context" transfer-ownership="none">
+            <type name="AppLaunchContext" c:type="GAppLaunchContext*"/>
+          </parameter>
+        </parameters>
+      </function>
       <virtual-method name="dup" invoker="dup">
         <return-value transfer-ownership="full">
           <type name="AppInfo" c:type="GAppInfo*"/>
@@ -888,6 +979,69 @@
                glib:type-name="GAsyncInitable"
                glib:get-type="g_async_initable_get_type"
                glib:type-struct="AsyncInitableIface">
+      <function name="new_async" c:identifier="g_async_initable_new_async">
+        <return-value transfer-ownership="none">
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object_type" transfer-ownership="none">
+            <type name="GType" c:type="GType"/>
+          </parameter>
+          <parameter name="io_priority" transfer-ownership="none">
+            <type name="int" c:type="int"/>
+          </parameter>
+          <parameter name="cancellable" transfer-ownership="none">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="callback"
+                     transfer-ownership="none"
+                     scope="async"
+                     closure="4">
+            <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+          </parameter>
+          <parameter name="user_data" transfer-ownership="none">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="first_property_name" transfer-ownership="none">
+            <type name="utf8" c:type="gchar*"/>
+          </parameter>
+          <parameter transfer-ownership="none">
+            <varargs>
+            </varargs>
+          </parameter>
+        </parameters>
+      </function>
+      <function name="newv_async" c:identifier="g_async_initable_newv_async">
+        <return-value transfer-ownership="none">
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object_type" transfer-ownership="none">
+            <type name="GType" c:type="GType"/>
+          </parameter>
+          <parameter name="n_parameters" transfer-ownership="none">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+          <parameter name="parameters" transfer-ownership="none">
+            <type name="GObject.Parameter" c:type="GParameter*"/>
+          </parameter>
+          <parameter name="io_priority" transfer-ownership="none">
+            <type name="int" c:type="int"/>
+          </parameter>
+          <parameter name="cancellable" transfer-ownership="none">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="callback"
+                     transfer-ownership="none"
+                     scope="async"
+                     closure="6">
+            <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+          </parameter>
+          <parameter name="user_data" transfer-ownership="none">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </function>
       <virtual-method name="init_async" invoker="init_async">
         <return-value transfer-ownership="none">
           <type name="none" c:type="void"/>
@@ -4225,6 +4379,57 @@
                glib:type-name="GFile"
                glib:get-type="g_file_get_type"
                glib:type-struct="FileIface">
+      <function name="new_for_path" c:identifier="g_file_new_for_path">
+        <return-value transfer-ownership="full">
+          <type name="File" c:type="GFile*"/>
+        </return-value>
+        <parameters>
+          <parameter name="path" transfer-ownership="none">
+            <type name="utf8" c:type="char*"/>
+          </parameter>
+        </parameters>
+      </function>
+      <function name="new_for_uri" c:identifier="g_file_new_for_uri">
+        <return-value transfer-ownership="full">
+          <type name="File" c:type="GFile*"/>
+        </return-value>
+        <parameters>
+          <parameter name="uri" transfer-ownership="none">
+            <type name="utf8" c:type="char*"/>
+          </parameter>
+        </parameters>
+      </function>
+      <function name="new_for_commandline_arg"
+                c:identifier="g_file_new_for_commandline_arg">
+        <return-value transfer-ownership="full">
+          <type name="File" c:type="GFile*"/>
+        </return-value>
+        <parameters>
+          <parameter name="arg" transfer-ownership="none">
+            <type name="utf8" c:type="char*"/>
+          </parameter>
+        </parameters>
+      </function>
+      <function name="parse_name" c:identifier="g_file_parse_name">
+        <return-value transfer-ownership="full">
+          <type name="File" c:type="GFile*"/>
+        </return-value>
+        <parameters>
+          <parameter name="parse_name" transfer-ownership="none">
+            <type name="utf8" c:type="char*"/>
+          </parameter>
+        </parameters>
+      </function>
+      <function name="hash" c:identifier="g_file_hash">
+        <return-value transfer-ownership="none">
+          <type name="uint" c:type="guint"/>
+        </return-value>
+        <parameters>
+          <parameter name="file" transfer-ownership="none">
+            <type name="any" c:type="gconstpointer"/>
+          </parameter>
+        </parameters>
+      </function>
       <virtual-method name="dup" invoker="dup">
         <return-value transfer-ownership="full">
           <type name="File" c:type="GFile*"/>
@@ -12748,6 +12953,28 @@
                glib:type-name="GIcon"
                glib:get-type="g_icon_get_type"
                glib:type-struct="IconIface">
+      <function name="hash" c:identifier="g_icon_hash">
+        <return-value transfer-ownership="none">
+          <type name="uint" c:type="guint"/>
+        </return-value>
+        <parameters>
+          <parameter name="icon" transfer-ownership="none">
+            <type name="any" c:type="gconstpointer"/>
+          </parameter>
+        </parameters>
+      </function>
+      <function name="new_for_string"
+                c:identifier="g_icon_new_for_string"
+                throws="1">
+        <return-value transfer-ownership="full">
+          <type name="Icon" c:type="GIcon*"/>
+        </return-value>
+        <parameters>
+          <parameter name="str" transfer-ownership="none">
+            <type name="utf8" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </function>
       <virtual-method name="hash">
         <return-value transfer-ownership="none">
           <type name="uint" c:type="guint"/>
@@ -13162,6 +13389,48 @@
                glib:type-name="GInitable"
                glib:get-type="g_initable_get_type"
                glib:type-struct="InitableIface">
+      <function name="new" c:identifier="g_initable_new">
+        <return-value transfer-ownership="none">
+          <type name="any" c:type="gpointer"/>
+        </return-value>
+        <parameters>
+          <parameter name="object_type" transfer-ownership="none">
+            <type name="GType" c:type="GType"/>
+          </parameter>
+          <parameter name="cancellable" transfer-ownership="none">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="error" transfer-ownership="none">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+          <parameter name="first_property_name" transfer-ownership="none">
+            <type name="utf8" c:type="gchar*"/>
+          </parameter>
+          <parameter transfer-ownership="none">
+            <varargs>
+            </varargs>
+          </parameter>
+        </parameters>
+      </function>
+      <function name="newv" c:identifier="g_initable_newv" throws="1">
+        <return-value transfer-ownership="none">
+          <type name="any" c:type="gpointer"/>
+        </return-value>
+        <parameters>
+          <parameter name="object_type" transfer-ownership="none">
+            <type name="GType" c:type="GType"/>
+          </parameter>
+          <parameter name="n_parameters" transfer-ownership="none">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+          <parameter name="parameters" transfer-ownership="none">
+            <type name="GObject.Parameter" c:type="GParameter*"/>
+          </parameter>
+          <parameter name="cancellable" transfer-ownership="none">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+        </parameters>
+      </function>
       <virtual-method name="init" invoker="init" throws="1">
         <return-value transfer-ownership="none">
           <type name="boolean" c:type="gboolean"/>
@@ -22393,162 +22662,6 @@
         <type name="GObject.ObjectClass" c:type="GObjectClass"/>
       </field>
     </record>
-    <function name="app_info_create_from_commandline"
-              c:identifier="g_app_info_create_from_commandline"
-              throws="1">
-      <return-value transfer-ownership="full">
-        <type name="AppInfo" c:type="GAppInfo*"/>
-      </return-value>
-      <parameters>
-        <parameter name="commandline" transfer-ownership="none">
-          <type name="utf8" c:type="char*"/>
-        </parameter>
-        <parameter name="application_name"
-                   transfer-ownership="none"
-                   allow-none="1">
-          <type name="utf8" c:type="char*"/>
-        </parameter>
-        <parameter name="flags" transfer-ownership="none">
-          <type name="AppInfoCreateFlags" c:type="GAppInfoCreateFlags"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="app_info_get_all" c:identifier="g_app_info_get_all">
-      <return-value transfer-ownership="full">
-        <type name="GLib.List" c:type="GList*">
-          <type name="AppInfo"/>
-        </type>
-      </return-value>
-    </function>
-    <function name="app_info_get_all_for_type"
-              c:identifier="g_app_info_get_all_for_type">
-      <return-value transfer-ownership="full">
-        <type name="GLib.List" c:type="GList*">
-          <type name="AppInfo"/>
-        </type>
-      </return-value>
-      <parameters>
-        <parameter name="content_type" transfer-ownership="none">
-          <type name="utf8" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="app_info_get_default_for_type"
-              c:identifier="g_app_info_get_default_for_type">
-      <return-value transfer-ownership="full">
-        <type name="AppInfo" c:type="GAppInfo*"/>
-      </return-value>
-      <parameters>
-        <parameter name="content_type" transfer-ownership="none">
-          <type name="utf8" c:type="char*"/>
-        </parameter>
-        <parameter name="must_support_uris" transfer-ownership="none">
-          <type name="boolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="app_info_get_default_for_uri_scheme"
-              c:identifier="g_app_info_get_default_for_uri_scheme">
-      <return-value transfer-ownership="full">
-        <type name="AppInfo" c:type="GAppInfo*"/>
-      </return-value>
-      <parameters>
-        <parameter name="uri_scheme" transfer-ownership="none">
-          <type name="utf8" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="app_info_launch_default_for_uri"
-              c:identifier="g_app_info_launch_default_for_uri"
-              throws="1">
-      <return-value transfer-ownership="none">
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="uri" transfer-ownership="none">
-          <type name="utf8" c:type="char*"/>
-        </parameter>
-        <parameter name="launch_context" transfer-ownership="none">
-          <type name="AppLaunchContext" c:type="GAppLaunchContext*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="app_info_reset_type_associations"
-              c:identifier="g_app_info_reset_type_associations">
-      <return-value transfer-ownership="none">
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="content_type" transfer-ownership="none">
-          <type name="utf8" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="async_initable_new_async"
-              c:identifier="g_async_initable_new_async">
-      <return-value transfer-ownership="none">
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="object_type" transfer-ownership="none">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-        <parameter name="io_priority" transfer-ownership="none">
-          <type name="int" c:type="int"/>
-        </parameter>
-        <parameter name="cancellable" transfer-ownership="none">
-          <type name="Cancellable" c:type="GCancellable*"/>
-        </parameter>
-        <parameter name="callback"
-                   transfer-ownership="none"
-                   scope="async"
-                   closure="4">
-          <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
-        </parameter>
-        <parameter name="user_data" transfer-ownership="none">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="first_property_name" transfer-ownership="none">
-          <type name="utf8" c:type="gchar*"/>
-        </parameter>
-        <parameter transfer-ownership="none">
-          <varargs>
-          </varargs>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="async_initable_newv_async"
-              c:identifier="g_async_initable_newv_async">
-      <return-value transfer-ownership="none">
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="object_type" transfer-ownership="none">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-        <parameter name="n_parameters" transfer-ownership="none">
-          <type name="uint" c:type="guint"/>
-        </parameter>
-        <parameter name="parameters" transfer-ownership="none">
-          <type name="GObject.Parameter" c:type="GParameter*"/>
-        </parameter>
-        <parameter name="io_priority" transfer-ownership="none">
-          <type name="int" c:type="int"/>
-        </parameter>
-        <parameter name="cancellable" transfer-ownership="none">
-          <type name="Cancellable" c:type="GCancellable*"/>
-        </parameter>
-        <parameter name="callback"
-                   transfer-ownership="none"
-                   scope="async"
-                   closure="6">
-          <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
-        </parameter>
-        <parameter name="user_data" transfer-ownership="none">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
     <function name="content_type_can_be_executable"
               c:identifier="g_content_type_can_be_executable">
       <return-value transfer-ownership="none">
@@ -22683,121 +22796,6 @@
         <type name="GLib.List" c:type="GList*"/>
       </return-value>
     </function>
-    <function name="file_hash" c:identifier="g_file_hash">
-      <return-value transfer-ownership="none">
-        <type name="uint" c:type="guint"/>
-      </return-value>
-      <parameters>
-        <parameter name="file" transfer-ownership="none">
-          <type name="any" c:type="gconstpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_new_for_commandline_arg"
-              c:identifier="g_file_new_for_commandline_arg">
-      <return-value transfer-ownership="full">
-        <type name="File" c:type="GFile*"/>
-      </return-value>
-      <parameters>
-        <parameter name="arg" transfer-ownership="none">
-          <type name="utf8" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_new_for_path" c:identifier="g_file_new_for_path">
-      <return-value transfer-ownership="full">
-        <type name="File" c:type="GFile*"/>
-      </return-value>
-      <parameters>
-        <parameter name="path" transfer-ownership="none">
-          <type name="utf8" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_new_for_uri" c:identifier="g_file_new_for_uri">
-      <return-value transfer-ownership="full">
-        <type name="File" c:type="GFile*"/>
-      </return-value>
-      <parameters>
-        <parameter name="uri" transfer-ownership="none">
-          <type name="utf8" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_parse_name" c:identifier="g_file_parse_name">
-      <return-value transfer-ownership="full">
-        <type name="File" c:type="GFile*"/>
-      </return-value>
-      <parameters>
-        <parameter name="parse_name" transfer-ownership="none">
-          <type name="utf8" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="icon_hash" c:identifier="g_icon_hash">
-      <return-value transfer-ownership="none">
-        <type name="uint" c:type="guint"/>
-      </return-value>
-      <parameters>
-        <parameter name="icon" transfer-ownership="none">
-          <type name="any" c:type="gconstpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="icon_new_for_string"
-              c:identifier="g_icon_new_for_string"
-              throws="1">
-      <return-value transfer-ownership="full">
-        <type name="Icon" c:type="GIcon*"/>
-      </return-value>
-      <parameters>
-        <parameter name="str" transfer-ownership="none">
-          <type name="utf8" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="initable_new" c:identifier="g_initable_new">
-      <return-value transfer-ownership="none">
-        <type name="any" c:type="gpointer"/>
-      </return-value>
-      <parameters>
-        <parameter name="object_type" transfer-ownership="none">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-        <parameter name="cancellable" transfer-ownership="none">
-          <type name="Cancellable" c:type="GCancellable*"/>
-        </parameter>
-        <parameter name="error" transfer-ownership="none">
-          <type name="GLib.Error" c:type="GError**"/>
-        </parameter>
-        <parameter name="first_property_name" transfer-ownership="none">
-          <type name="utf8" c:type="gchar*"/>
-        </parameter>
-        <parameter transfer-ownership="none">
-          <varargs>
-          </varargs>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="initable_newv" c:identifier="g_initable_newv" throws="1">
-      <return-value transfer-ownership="none">
-        <type name="any" c:type="gpointer"/>
-      </return-value>
-      <parameters>
-        <parameter name="object_type" transfer-ownership="none">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-        <parameter name="n_parameters" transfer-ownership="none">
-          <type name="uint" c:type="guint"/>
-        </parameter>
-        <parameter name="parameters" transfer-ownership="none">
-          <type name="GObject.Parameter" c:type="GParameter*"/>
-        </parameter>
-        <parameter name="cancellable" transfer-ownership="none">
-          <type name="Cancellable" c:type="GCancellable*"/>
-        </parameter>
-      </parameters>
-    </function>
     <function name="io_error_from_errno" c:identifier="g_io_error_from_errno">
       <return-value transfer-ownership="full">
         <type name="IOErrorEnum" c:type="GIOErrorEnum"/>
diff -ur Desktop/gir-1.0/Gst-0.10.gir /opt/gnome/share/gir-1.0/Gst-0.10.gir
--- Desktop/gir-1.0/Gst-0.10.gir	2010-01-23 13:26:53.000000000 +0100
+++ /opt/gnome/share/gir-1.0/Gst-0.10.gir	2010-01-23 20:00:37.000000000 +0100
@@ -5246,6 +5246,120 @@
                glib:get-type="gst_child_proxy_get_type"
                glib:type-struct="ChildProxyInterface">
       <prerequisite name="Object"/>
+      <function name="lookup" c:identifier="gst_child_proxy_lookup">
+        <return-value transfer-ownership="none">
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="object" transfer-ownership="none">
+            <type name="Object" c:type="GstObject*"/>
+          </parameter>
+          <parameter name="name" transfer-ownership="none">
+            <type name="utf8" c:type="gchar*"/>
+          </parameter>
+          <parameter name="target" transfer-ownership="none">
+            <type name="Object" c:type="GstObject**"/>
+          </parameter>
+          <parameter name="pspec" transfer-ownership="none">
+            <type name="GObject.ParamSpec" c:type="GParamSpec**"/>
+          </parameter>
+        </parameters>
+      </function>
+      <function name="get_property"
+                c:identifier="gst_child_proxy_get_property">
+        <return-value transfer-ownership="none">
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object" transfer-ownership="none">
+            <type name="Object" c:type="GstObject*"/>
+          </parameter>
+          <parameter name="name" transfer-ownership="none">
+            <type name="utf8" c:type="gchar*"/>
+          </parameter>
+          <parameter name="value" transfer-ownership="none">
+            <type name="GObject.Value" c:type="GValue*"/>
+          </parameter>
+        </parameters>
+      </function>
+      <function name="get" c:identifier="gst_child_proxy_get">
+        <return-value transfer-ownership="none">
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object" transfer-ownership="none">
+            <type name="Object" c:type="GstObject*"/>
+          </parameter>
+          <parameter name="first_property_name" transfer-ownership="none">
+            <type name="utf8" c:type="gchar*"/>
+          </parameter>
+          <parameter transfer-ownership="none">
+            <varargs>
+            </varargs>
+          </parameter>
+        </parameters>
+      </function>
+      <function name="set_property"
+                c:identifier="gst_child_proxy_set_property">
+        <return-value transfer-ownership="none">
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object" transfer-ownership="none">
+            <type name="Object" c:type="GstObject*"/>
+          </parameter>
+          <parameter name="name" transfer-ownership="none">
+            <type name="utf8" c:type="gchar*"/>
+          </parameter>
+          <parameter name="value" transfer-ownership="none">
+            <type name="GObject.Value" c:type="GValue*"/>
+          </parameter>
+        </parameters>
+      </function>
+      <function name="set" c:identifier="gst_child_proxy_set">
+        <return-value transfer-ownership="none">
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object" transfer-ownership="none">
+            <type name="Object" c:type="GstObject*"/>
+          </parameter>
+          <parameter name="first_property_name" transfer-ownership="none">
+            <type name="utf8" c:type="gchar*"/>
+          </parameter>
+          <parameter transfer-ownership="none">
+            <varargs>
+            </varargs>
+          </parameter>
+        </parameters>
+      </function>
+      <function name="child_added" c:identifier="gst_child_proxy_child_added">
+        <return-value transfer-ownership="none">
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object" transfer-ownership="none">
+            <type name="Object" c:type="GstObject*"/>
+          </parameter>
+          <parameter name="child" transfer-ownership="none">
+            <type name="Object" c:type="GstObject*"/>
+          </parameter>
+        </parameters>
+      </function>
+      <function name="child_removed"
+                c:identifier="gst_child_proxy_child_removed">
+        <return-value transfer-ownership="none">
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object" transfer-ownership="none">
+            <type name="Object" c:type="GstObject*"/>
+          </parameter>
+          <parameter name="child" transfer-ownership="none">
+            <type name="Object" c:type="GstObject*"/>
+          </parameter>
+        </parameters>
+      </function>
       <virtual-method name="get_child_by_index" invoker="get_child_by_index">
         <return-value transfer-ownership="full">
           <type name="Object" c:type="GstObject*"/>
@@ -9323,6 +9437,32 @@
                glib:get-type="gst_implements_interface_get_type"
                glib:type-struct="ImplementsInterfaceClass">
       <prerequisite name="Element"/>
+      <function name="cast" c:identifier="gst_implements_interface_cast">
+        <return-value transfer-ownership="none">
+          <type name="any" c:type="gpointer"/>
+        </return-value>
+        <parameters>
+          <parameter name="from" transfer-ownership="none">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="type" transfer-ownership="none">
+            <type name="GType" c:type="GType"/>
+          </parameter>
+        </parameters>
+      </function>
+      <function name="check" c:identifier="gst_implements_interface_check">
+        <return-value transfer-ownership="none">
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="from" transfer-ownership="none">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="type" transfer-ownership="none">
+            <type name="GType" c:type="GType"/>
+          </parameter>
+        </parameters>
+      </function>
       <virtual-method name="supported">
         <return-value transfer-ownership="none">
           <type name="boolean" c:type="gboolean"/>
@@ -19789,121 +19929,6 @@
         </parameter>
       </parameters>
     </function>
-    <function name="child_proxy_child_added"
-              c:identifier="gst_child_proxy_child_added">
-      <return-value transfer-ownership="none">
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="object" transfer-ownership="none">
-          <type name="Object" c:type="GstObject*"/>
-        </parameter>
-        <parameter name="child" transfer-ownership="none">
-          <type name="Object" c:type="GstObject*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="child_proxy_child_removed"
-              c:identifier="gst_child_proxy_child_removed">
-      <return-value transfer-ownership="none">
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="object" transfer-ownership="none">
-          <type name="Object" c:type="GstObject*"/>
-        </parameter>
-        <parameter name="child" transfer-ownership="none">
-          <type name="Object" c:type="GstObject*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="child_proxy_get" c:identifier="gst_child_proxy_get">
-      <return-value transfer-ownership="none">
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="object" transfer-ownership="none">
-          <type name="Object" c:type="GstObject*"/>
-        </parameter>
-        <parameter name="first_property_name" transfer-ownership="none">
-          <type name="utf8" c:type="gchar*"/>
-        </parameter>
-        <parameter transfer-ownership="none">
-          <varargs>
-          </varargs>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="child_proxy_get_property"
-              c:identifier="gst_child_proxy_get_property">
-      <return-value transfer-ownership="none">
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="object" transfer-ownership="none">
-          <type name="Object" c:type="GstObject*"/>
-        </parameter>
-        <parameter name="name" transfer-ownership="none">
-          <type name="utf8" c:type="gchar*"/>
-        </parameter>
-        <parameter name="value" transfer-ownership="none">
-          <type name="GObject.Value" c:type="GValue*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="child_proxy_lookup" c:identifier="gst_child_proxy_lookup">
-      <return-value transfer-ownership="none">
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="object" transfer-ownership="none">
-          <type name="Object" c:type="GstObject*"/>
-        </parameter>
-        <parameter name="name" transfer-ownership="none">
-          <type name="utf8" c:type="gchar*"/>
-        </parameter>
-        <parameter name="target" transfer-ownership="none">
-          <type name="Object" c:type="GstObject**"/>
-        </parameter>
-        <parameter name="pspec" transfer-ownership="none">
-          <type name="GObject.ParamSpec" c:type="GParamSpec**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="child_proxy_set" c:identifier="gst_child_proxy_set">
-      <return-value transfer-ownership="none">
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="object" transfer-ownership="none">
-          <type name="Object" c:type="GstObject*"/>
-        </parameter>
-        <parameter name="first_property_name" transfer-ownership="none">
-          <type name="utf8" c:type="gchar*"/>
-        </parameter>
-        <parameter transfer-ownership="none">
-          <varargs>
-          </varargs>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="child_proxy_set_property"
-              c:identifier="gst_child_proxy_set_property">
-      <return-value transfer-ownership="none">
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="object" transfer-ownership="none">
-          <type name="Object" c:type="GstObject*"/>
-        </parameter>
-        <parameter name="name" transfer-ownership="none">
-          <type name="utf8" c:type="gchar*"/>
-        </parameter>
-        <parameter name="value" transfer-ownership="none">
-          <type name="GObject.Value" c:type="GValue*"/>
-        </parameter>
-      </parameters>
-    </function>
     <function name="class_signal_connect"
               c:identifier="gst_class_signal_connect">
       <return-value transfer-ownership="none">
@@ -20342,34 +20367,6 @@
         </parameter>
       </parameters>
     </function>
-    <function name="implements_interface_cast"
-              c:identifier="gst_implements_interface_cast">
-      <return-value transfer-ownership="none">
-        <type name="any" c:type="gpointer"/>
-      </return-value>
-      <parameters>
-        <parameter name="from" transfer-ownership="none">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="type" transfer-ownership="none">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="implements_interface_check"
-              c:identifier="gst_implements_interface_check">
-      <return-value transfer-ownership="none">
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="from" transfer-ownership="none">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="type" transfer-ownership="none">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-      </parameters>
-    </function>
     <function name="init" c:identifier="gst_init">
       <return-value transfer-ownership="none">
         <type name="none" c:type="void"/>
diff -ur Desktop/gir-1.0/GstInterfaces-0.10.gir /opt/gnome/share/gir-1.0/GstInterfaces-0.10.gir
--- Desktop/gir-1.0/GstInterfaces-0.10.gir	2010-01-23 13:26:53.000000000 +0100
+++ /opt/gnome/share/gir-1.0/GstInterfaces-0.10.gir	2010-01-23 20:00:37.000000000 +0100
@@ -286,6 +286,106 @@
                glib:type-struct="GstMixerClass">
       <prerequisite name="Gst.ImplementsInterface"/>
       <prerequisite name="Gst.Element"/>
+      <function name="message_get_type"
+                c:identifier="gst_mixer_message_get_type">
+        <return-value transfer-ownership="full">
+          <type name="GstMixerMessageType" c:type="GstMixerMessageType"/>
+        </return-value>
+        <parameters>
+          <parameter name="message" transfer-ownership="none">
+            <type name="Gst.Message" c:type="GstMessage*"/>
+          </parameter>
+        </parameters>
+      </function>
+      <function name="message_parse_mute_toggled"
+                c:identifier="gst_mixer_message_parse_mute_toggled">
+        <return-value transfer-ownership="none">
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="message" transfer-ownership="none">
+            <type name="Gst.Message" c:type="GstMessage*"/>
+          </parameter>
+          <parameter name="track" transfer-ownership="none">
+            <type name="GstMixerTrack" c:type="GstMixerTrack**"/>
+          </parameter>
+          <parameter name="mute" direction="out" transfer-ownership="full">
+            <type name="boolean" c:type="gboolean*"/>
+          </parameter>
+        </parameters>
+      </function>
+      <function name="message_parse_record_toggled"
+                c:identifier="gst_mixer_message_parse_record_toggled">
+        <return-value transfer-ownership="none">
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="message" transfer-ownership="none">
+            <type name="Gst.Message" c:type="GstMessage*"/>
+          </parameter>
+          <parameter name="track" transfer-ownership="none">
+            <type name="GstMixerTrack" c:type="GstMixerTrack**"/>
+          </parameter>
+          <parameter name="record" direction="out" transfer-ownership="full">
+            <type name="boolean" c:type="gboolean*"/>
+          </parameter>
+        </parameters>
+      </function>
+      <function name="message_parse_volume_changed"
+                c:identifier="gst_mixer_message_parse_volume_changed">
+        <return-value transfer-ownership="none">
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="message" transfer-ownership="none">
+            <type name="Gst.Message" c:type="GstMessage*"/>
+          </parameter>
+          <parameter name="track" transfer-ownership="none">
+            <type name="GstMixerTrack" c:type="GstMixerTrack**"/>
+          </parameter>
+          <parameter name="volumes" direction="out" transfer-ownership="full">
+            <type name="int" c:type="gint**"/>
+          </parameter>
+          <parameter name="num_channels"
+                     direction="out"
+                     transfer-ownership="full">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+        </parameters>
+      </function>
+      <function name="message_parse_option_changed"
+                c:identifier="gst_mixer_message_parse_option_changed">
+        <return-value transfer-ownership="none">
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="message" transfer-ownership="none">
+            <type name="Gst.Message" c:type="GstMessage*"/>
+          </parameter>
+          <parameter name="options" transfer-ownership="none">
+            <type name="GstMixerOptions" c:type="GstMixerOptions**"/>
+          </parameter>
+          <parameter name="value" transfer-ownership="none">
+            <array c:type="gchar**">
+              <type name="utf8"/>
+            </array>
+          </parameter>
+        </parameters>
+      </function>
+      <function name="message_parse_options_list_changed"
+                c:identifier="gst_mixer_message_parse_options_list_changed">
+        <return-value transfer-ownership="none">
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="message" transfer-ownership="none">
+            <type name="Gst.Message" c:type="GstMessage*"/>
+          </parameter>
+          <parameter name="options" transfer-ownership="none">
+            <type name="GstMixerOptions" c:type="GstMixerOptions**"/>
+          </parameter>
+        </parameters>
+      </function>
       <virtual-method name="list_tracks" invoker="list_tracks">
         <return-value transfer-ownership="none">
           <type name="GLib.List" c:type="GList*"/>
@@ -1050,6 +1150,296 @@
                glib:type-name="GstNavigation"
                glib:get-type="gst_navigation_get_type"
                glib:type-struct="GstNavigationInterface">
+      <function name="query_get_type"
+                c:identifier="gst_navigation_query_get_type">
+        <return-value transfer-ownership="full">
+          <type name="GstNavigationQueryType" c:type="GstNavigationQueryType"/>
+        </return-value>
+        <parameters>
+          <parameter name="query" transfer-ownership="none">
+            <type name="Gst.Query" c:type="GstQuery*"/>
+          </parameter>
+        </parameters>
+      </function>
+      <function name="query_new_commands"
+                c:identifier="gst_navigation_query_new_commands">
+        <return-value transfer-ownership="full">
+          <type name="Gst.Query" c:type="GstQuery*"/>
+        </return-value>
+      </function>
+      <function name="query_set_commands"
+                c:identifier="gst_navigation_query_set_commands">
+        <return-value transfer-ownership="none">
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="query" transfer-ownership="none">
+            <type name="Gst.Query" c:type="GstQuery*"/>
+          </parameter>
+          <parameter name="n_cmds" transfer-ownership="none">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter transfer-ownership="none">
+            <varargs>
+            </varargs>
+          </parameter>
+        </parameters>
+      </function>
+      <function name="query_set_commandsv"
+                c:identifier="gst_navigation_query_set_commandsv">
+        <return-value transfer-ownership="none">
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="query" transfer-ownership="none">
+            <type name="Gst.Query" c:type="GstQuery*"/>
+          </parameter>
+          <parameter name="n_cmds" transfer-ownership="none">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="cmds" transfer-ownership="none">
+            <type name="GstNavigationCommand" c:type="GstNavigationCommand*"/>
+          </parameter>
+        </parameters>
+      </function>
+      <function name="query_parse_commands_length"
+                c:identifier="gst_navigation_query_parse_commands_length">
+        <return-value transfer-ownership="none">
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="query" transfer-ownership="none">
+            <type name="Gst.Query" c:type="GstQuery*"/>
+          </parameter>
+          <parameter name="n_cmds" direction="out" transfer-ownership="full">
+            <type name="uint" c:type="guint*"/>
+          </parameter>
+        </parameters>
+      </function>
+      <function name="query_parse_commands_nth"
+                c:identifier="gst_navigation_query_parse_commands_nth">
+        <return-value transfer-ownership="none">
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="query" transfer-ownership="none">
+            <type name="Gst.Query" c:type="GstQuery*"/>
+          </parameter>
+          <parameter name="nth" transfer-ownership="none">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+          <parameter name="cmd" transfer-ownership="none">
+            <type name="GstNavigationCommand" c:type="GstNavigationCommand*"/>
+          </parameter>
+        </parameters>
+      </function>
+      <function name="query_new_angles"
+                c:identifier="gst_navigation_query_new_angles">
+        <return-value transfer-ownership="full">
+          <type name="Gst.Query" c:type="GstQuery*"/>
+        </return-value>
+      </function>
+      <function name="query_set_angles"
+                c:identifier="gst_navigation_query_set_angles">
+        <return-value transfer-ownership="none">
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="query" transfer-ownership="none">
+            <type name="Gst.Query" c:type="GstQuery*"/>
+          </parameter>
+          <parameter name="cur_angle" transfer-ownership="none">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+          <parameter name="n_angles" transfer-ownership="none">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+        </parameters>
+      </function>
+      <function name="query_parse_angles"
+                c:identifier="gst_navigation_query_parse_angles">
+        <return-value transfer-ownership="none">
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="query" transfer-ownership="none">
+            <type name="Gst.Query" c:type="GstQuery*"/>
+          </parameter>
+          <parameter name="cur_angle"
+                     direction="out"
+                     transfer-ownership="full">
+            <type name="uint" c:type="guint*"/>
+          </parameter>
+          <parameter name="n_angles" direction="out" transfer-ownership="full">
+            <type name="uint" c:type="guint*"/>
+          </parameter>
+        </parameters>
+      </function>
+      <function name="message_get_type"
+                c:identifier="gst_navigation_message_get_type">
+        <return-value transfer-ownership="full">
+          <type name="GstNavigationMessageType"
+                c:type="GstNavigationMessageType"/>
+        </return-value>
+        <parameters>
+          <parameter name="message" transfer-ownership="none">
+            <type name="Gst.Message" c:type="GstMessage*"/>
+          </parameter>
+        </parameters>
+      </function>
+      <function name="message_new_mouse_over"
+                c:identifier="gst_navigation_message_new_mouse_over">
+        <return-value transfer-ownership="full">
+          <type name="Gst.Message" c:type="GstMessage*"/>
+        </return-value>
+        <parameters>
+          <parameter name="src" transfer-ownership="none">
+            <type name="Gst.Object" c:type="GstObject*"/>
+          </parameter>
+          <parameter name="active" transfer-ownership="none">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </function>
+      <function name="message_parse_mouse_over"
+                c:identifier="gst_navigation_message_parse_mouse_over">
+        <return-value transfer-ownership="none">
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="message" transfer-ownership="none">
+            <type name="Gst.Message" c:type="GstMessage*"/>
+          </parameter>
+          <parameter name="active" direction="out" transfer-ownership="full">
+            <type name="boolean" c:type="gboolean*"/>
+          </parameter>
+        </parameters>
+      </function>
+      <function name="message_new_commands_changed"
+                c:identifier="gst_navigation_message_new_commands_changed">
+        <return-value transfer-ownership="full">
+          <type name="Gst.Message" c:type="GstMessage*"/>
+        </return-value>
+        <parameters>
+          <parameter name="src" transfer-ownership="none">
+            <type name="Gst.Object" c:type="GstObject*"/>
+          </parameter>
+        </parameters>
+      </function>
+      <function name="message_new_angles_changed"
+                c:identifier="gst_navigation_message_new_angles_changed">
+        <return-value transfer-ownership="full">
+          <type name="Gst.Message" c:type="GstMessage*"/>
+        </return-value>
+        <parameters>
+          <parameter name="src" transfer-ownership="none">
+            <type name="Gst.Object" c:type="GstObject*"/>
+          </parameter>
+          <parameter name="cur_angle" transfer-ownership="none">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+          <parameter name="n_angles" transfer-ownership="none">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+        </parameters>
+      </function>
+      <function name="message_parse_angles_changed"
+                c:identifier="gst_navigation_message_parse_angles_changed">
+        <return-value transfer-ownership="none">
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="message" transfer-ownership="none">
+            <type name="Gst.Message" c:type="GstMessage*"/>
+          </parameter>
+          <parameter name="cur_angle"
+                     direction="out"
+                     transfer-ownership="full">
+            <type name="uint" c:type="guint*"/>
+          </parameter>
+          <parameter name="n_angles" direction="out" transfer-ownership="full">
+            <type name="uint" c:type="guint*"/>
+          </parameter>
+        </parameters>
+      </function>
+      <function name="event_get_type"
+                c:identifier="gst_navigation_event_get_type">
+        <return-value transfer-ownership="full">
+          <type name="GstNavigationEventType" c:type="GstNavigationEventType"/>
+        </return-value>
+        <parameters>
+          <parameter name="event" transfer-ownership="none">
+            <type name="Gst.Event" c:type="GstEvent*"/>
+          </parameter>
+        </parameters>
+      </function>
+      <function name="event_parse_key_event"
+                c:identifier="gst_navigation_event_parse_key_event">
+        <return-value transfer-ownership="none">
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="event" transfer-ownership="none">
+            <type name="Gst.Event" c:type="GstEvent*"/>
+          </parameter>
+          <parameter name="key" transfer-ownership="none">
+            <array c:type="gchar**">
+              <type name="utf8"/>
+            </array>
+          </parameter>
+        </parameters>
+      </function>
+      <function name="event_parse_mouse_button_event"
+                c:identifier="gst_navigation_event_parse_mouse_button_event">
+        <return-value transfer-ownership="none">
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="event" transfer-ownership="none">
+            <type name="Gst.Event" c:type="GstEvent*"/>
+          </parameter>
+          <parameter name="button" direction="out" transfer-ownership="full">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+          <parameter name="x" direction="out" transfer-ownership="full">
+            <type name="double" c:type="gdouble*"/>
+          </parameter>
+          <parameter name="y" direction="out" transfer-ownership="full">
+            <type name="double" c:type="gdouble*"/>
+          </parameter>
+        </parameters>
+      </function>
+      <function name="event_parse_mouse_move_event"
+                c:identifier="gst_navigation_event_parse_mouse_move_event">
+        <return-value transfer-ownership="none">
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="event" transfer-ownership="none">
+            <type name="Gst.Event" c:type="GstEvent*"/>
+          </parameter>
+          <parameter name="x" direction="out" transfer-ownership="full">
+            <type name="double" c:type="gdouble*"/>
+          </parameter>
+          <parameter name="y" direction="out" transfer-ownership="full">
+            <type name="double" c:type="gdouble*"/>
+          </parameter>
+        </parameters>
+      </function>
+      <function name="event_parse_command"
+                c:identifier="gst_navigation_event_parse_command">
+        <return-value transfer-ownership="none">
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="event" transfer-ownership="none">
+            <type name="Gst.Event" c:type="GstEvent*"/>
+          </parameter>
+          <parameter name="command" transfer-ownership="none">
+            <type name="GstNavigationCommand" c:type="GstNavigationCommand*"/>
+          </parameter>
+        </parameters>
+      </function>
       <virtual-method name="send_event" invoker="send_event">
         <return-value transfer-ownership="none">
           <type name="none" c:type="void"/>
@@ -2658,391 +3048,5 @@
         </array>
       </field>
     </record>
-    <function name="gst_mixer_message_get_type"
-              c:identifier="gst_mixer_message_get_type">
-      <return-value transfer-ownership="full">
-        <type name="GstMixerMessageType" c:type="GstMixerMessageType"/>
-      </return-value>
-      <parameters>
-        <parameter name="message" transfer-ownership="none">
-          <type name="Gst.Message" c:type="GstMessage*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="gst_mixer_message_parse_mute_toggled"
-              c:identifier="gst_mixer_message_parse_mute_toggled">
-      <return-value transfer-ownership="none">
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="message" transfer-ownership="none">
-          <type name="Gst.Message" c:type="GstMessage*"/>
-        </parameter>
-        <parameter name="track" transfer-ownership="none">
-          <type name="GstMixerTrack" c:type="GstMixerTrack**"/>
-        </parameter>
-        <parameter name="mute" direction="out" transfer-ownership="full">
-          <type name="boolean" c:type="gboolean*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="gst_mixer_message_parse_option_changed"
-              c:identifier="gst_mixer_message_parse_option_changed">
-      <return-value transfer-ownership="none">
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="message" transfer-ownership="none">
-          <type name="Gst.Message" c:type="GstMessage*"/>
-        </parameter>
-        <parameter name="options" transfer-ownership="none">
-          <type name="GstMixerOptions" c:type="GstMixerOptions**"/>
-        </parameter>
-        <parameter name="value" transfer-ownership="none">
-          <array c:type="gchar**">
-            <type name="utf8"/>
-          </array>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="gst_mixer_message_parse_options_list_changed"
-              c:identifier="gst_mixer_message_parse_options_list_changed">
-      <return-value transfer-ownership="none">
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="message" transfer-ownership="none">
-          <type name="Gst.Message" c:type="GstMessage*"/>
-        </parameter>
-        <parameter name="options" transfer-ownership="none">
-          <type name="GstMixerOptions" c:type="GstMixerOptions**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="gst_mixer_message_parse_record_toggled"
-              c:identifier="gst_mixer_message_parse_record_toggled">
-      <return-value transfer-ownership="none">
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="message" transfer-ownership="none">
-          <type name="Gst.Message" c:type="GstMessage*"/>
-        </parameter>
-        <parameter name="track" transfer-ownership="none">
-          <type name="GstMixerTrack" c:type="GstMixerTrack**"/>
-        </parameter>
-        <parameter name="record" direction="out" transfer-ownership="full">
-          <type name="boolean" c:type="gboolean*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="gst_mixer_message_parse_volume_changed"
-              c:identifier="gst_mixer_message_parse_volume_changed">
-      <return-value transfer-ownership="none">
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="message" transfer-ownership="none">
-          <type name="Gst.Message" c:type="GstMessage*"/>
-        </parameter>
-        <parameter name="track" transfer-ownership="none">
-          <type name="GstMixerTrack" c:type="GstMixerTrack**"/>
-        </parameter>
-        <parameter name="volumes" direction="out" transfer-ownership="full">
-          <type name="int" c:type="gint**"/>
-        </parameter>
-        <parameter name="num_channels"
-                   direction="out"
-                   transfer-ownership="full">
-          <type name="int" c:type="gint*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="gst_navigation_event_get_type"
-              c:identifier="gst_navigation_event_get_type">
-      <return-value transfer-ownership="full">
-        <type name="GstNavigationEventType" c:type="GstNavigationEventType"/>
-      </return-value>
-      <parameters>
-        <parameter name="event" transfer-ownership="none">
-          <type name="Gst.Event" c:type="GstEvent*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="gst_navigation_event_parse_command"
-              c:identifier="gst_navigation_event_parse_command">
-      <return-value transfer-ownership="none">
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="event" transfer-ownership="none">
-          <type name="Gst.Event" c:type="GstEvent*"/>
-        </parameter>
-        <parameter name="command" transfer-ownership="none">
-          <type name="GstNavigationCommand" c:type="GstNavigationCommand*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="gst_navigation_event_parse_key_event"
-              c:identifier="gst_navigation_event_parse_key_event">
-      <return-value transfer-ownership="none">
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="event" transfer-ownership="none">
-          <type name="Gst.Event" c:type="GstEvent*"/>
-        </parameter>
-        <parameter name="key" transfer-ownership="none">
-          <array c:type="gchar**">
-            <type name="utf8"/>
-          </array>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="gst_navigation_event_parse_mouse_button_event"
-              c:identifier="gst_navigation_event_parse_mouse_button_event">
-      <return-value transfer-ownership="none">
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="event" transfer-ownership="none">
-          <type name="Gst.Event" c:type="GstEvent*"/>
-        </parameter>
-        <parameter name="button" direction="out" transfer-ownership="full">
-          <type name="int" c:type="gint*"/>
-        </parameter>
-        <parameter name="x" direction="out" transfer-ownership="full">
-          <type name="double" c:type="gdouble*"/>
-        </parameter>
-        <parameter name="y" direction="out" transfer-ownership="full">
-          <type name="double" c:type="gdouble*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="gst_navigation_event_parse_mouse_move_event"
-              c:identifier="gst_navigation_event_parse_mouse_move_event">
-      <return-value transfer-ownership="none">
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="event" transfer-ownership="none">
-          <type name="Gst.Event" c:type="GstEvent*"/>
-        </parameter>
-        <parameter name="x" direction="out" transfer-ownership="full">
-          <type name="double" c:type="gdouble*"/>
-        </parameter>
-        <parameter name="y" direction="out" transfer-ownership="full">
-          <type name="double" c:type="gdouble*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="gst_navigation_message_get_type"
-              c:identifier="gst_navigation_message_get_type">
-      <return-value transfer-ownership="full">
-        <type name="GstNavigationMessageType"
-              c:type="GstNavigationMessageType"/>
-      </return-value>
-      <parameters>
-        <parameter name="message" transfer-ownership="none">
-          <type name="Gst.Message" c:type="GstMessage*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="gst_navigation_message_new_angles_changed"
-              c:identifier="gst_navigation_message_new_angles_changed">
-      <return-value transfer-ownership="full">
-        <type name="Gst.Message" c:type="GstMessage*"/>
-      </return-value>
-      <parameters>
-        <parameter name="src" transfer-ownership="none">
-          <type name="Gst.Object" c:type="GstObject*"/>
-        </parameter>
-        <parameter name="cur_angle" transfer-ownership="none">
-          <type name="uint" c:type="guint"/>
-        </parameter>
-        <parameter name="n_angles" transfer-ownership="none">
-          <type name="uint" c:type="guint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="gst_navigation_message_new_commands_changed"
-              c:identifier="gst_navigation_message_new_commands_changed">
-      <return-value transfer-ownership="full">
-        <type name="Gst.Message" c:type="GstMessage*"/>
-      </return-value>
-      <parameters>
-        <parameter name="src" transfer-ownership="none">
-          <type name="Gst.Object" c:type="GstObject*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="gst_navigation_message_new_mouse_over"
-              c:identifier="gst_navigation_message_new_mouse_over">
-      <return-value transfer-ownership="full">
-        <type name="Gst.Message" c:type="GstMessage*"/>
-      </return-value>
-      <parameters>
-        <parameter name="src" transfer-ownership="none">
-          <type name="Gst.Object" c:type="GstObject*"/>
-        </parameter>
-        <parameter name="active" transfer-ownership="none">
-          <type name="boolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="gst_navigation_message_parse_angles_changed"
-              c:identifier="gst_navigation_message_parse_angles_changed">
-      <return-value transfer-ownership="none">
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="message" transfer-ownership="none">
-          <type name="Gst.Message" c:type="GstMessage*"/>
-        </parameter>
-        <parameter name="cur_angle" direction="out" transfer-ownership="full">
-          <type name="uint" c:type="guint*"/>
-        </parameter>
-        <parameter name="n_angles" direction="out" transfer-ownership="full">
-          <type name="uint" c:type="guint*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="gst_navigation_message_parse_mouse_over"
-              c:identifier="gst_navigation_message_parse_mouse_over">
-      <return-value transfer-ownership="none">
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="message" transfer-ownership="none">
-          <type name="Gst.Message" c:type="GstMessage*"/>
-        </parameter>
-        <parameter name="active" direction="out" transfer-ownership="full">
-          <type name="boolean" c:type="gboolean*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="gst_navigation_query_get_type"
-              c:identifier="gst_navigation_query_get_type">
-      <return-value transfer-ownership="full">
-        <type name="GstNavigationQueryType" c:type="GstNavigationQueryType"/>
-      </return-value>
-      <parameters>
-        <parameter name="query" transfer-ownership="none">
-          <type name="Gst.Query" c:type="GstQuery*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="gst_navigation_query_new_angles"
-              c:identifier="gst_navigation_query_new_angles">
-      <return-value transfer-ownership="full">
-        <type name="Gst.Query" c:type="GstQuery*"/>
-      </return-value>
-    </function>
-    <function name="gst_navigation_query_new_commands"
-              c:identifier="gst_navigation_query_new_commands">
-      <return-value transfer-ownership="full">
-        <type name="Gst.Query" c:type="GstQuery*"/>
-      </return-value>
-    </function>
-    <function name="gst_navigation_query_parse_angles"
-              c:identifier="gst_navigation_query_parse_angles">
-      <return-value transfer-ownership="none">
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="query" transfer-ownership="none">
-          <type name="Gst.Query" c:type="GstQuery*"/>
-        </parameter>
-        <parameter name="cur_angle" direction="out" transfer-ownership="full">
-          <type name="uint" c:type="guint*"/>
-        </parameter>
-        <parameter name="n_angles" direction="out" transfer-ownership="full">
-          <type name="uint" c:type="guint*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="gst_navigation_query_parse_commands_length"
-              c:identifier="gst_navigation_query_parse_commands_length">
-      <return-value transfer-ownership="none">
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="query" transfer-ownership="none">
-          <type name="Gst.Query" c:type="GstQuery*"/>
-        </parameter>
-        <parameter name="n_cmds" direction="out" transfer-ownership="full">
-          <type name="uint" c:type="guint*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="gst_navigation_query_parse_commands_nth"
-              c:identifier="gst_navigation_query_parse_commands_nth">
-      <return-value transfer-ownership="none">
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="query" transfer-ownership="none">
-          <type name="Gst.Query" c:type="GstQuery*"/>
-        </parameter>
-        <parameter name="nth" transfer-ownership="none">
-          <type name="uint" c:type="guint"/>
-        </parameter>
-        <parameter name="cmd" transfer-ownership="none">
-          <type name="GstNavigationCommand" c:type="GstNavigationCommand*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="gst_navigation_query_set_angles"
-              c:identifier="gst_navigation_query_set_angles">
-      <return-value transfer-ownership="none">
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="query" transfer-ownership="none">
-          <type name="Gst.Query" c:type="GstQuery*"/>
-        </parameter>
-        <parameter name="cur_angle" transfer-ownership="none">
-          <type name="uint" c:type="guint"/>
-        </parameter>
-        <parameter name="n_angles" transfer-ownership="none">
-          <type name="uint" c:type="guint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="gst_navigation_query_set_commands"
-              c:identifier="gst_navigation_query_set_commands">
-      <return-value transfer-ownership="none">
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="query" transfer-ownership="none">
-          <type name="Gst.Query" c:type="GstQuery*"/>
-        </parameter>
-        <parameter name="n_cmds" transfer-ownership="none">
-          <type name="int" c:type="gint"/>
-        </parameter>
-        <parameter transfer-ownership="none">
-          <varargs>
-          </varargs>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="gst_navigation_query_set_commandsv"
-              c:identifier="gst_navigation_query_set_commandsv">
-      <return-value transfer-ownership="none">
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="query" transfer-ownership="none">
-          <type name="Gst.Query" c:type="GstQuery*"/>
-        </parameter>
-        <parameter name="n_cmds" transfer-ownership="none">
-          <type name="int" c:type="gint"/>
-        </parameter>
-        <parameter name="cmds" transfer-ownership="none">
-          <type name="GstNavigationCommand" c:type="GstNavigationCommand*"/>
-        </parameter>
-      </parameters>
-    </function>
   </namespace>
 </repository>
diff -ur Desktop/gir-1.0/Gtk-2.0.gir /opt/gnome/share/gir-1.0/Gtk-2.0.gir
--- Desktop/gir-1.0/Gtk-2.0.gir	2010-01-23 13:26:52.000000000 +0100
+++ /opt/gnome/share/gir-1.0/Gtk-2.0.gir	2010-01-23 20:00:37.000000000 +0100
@@ -13802,36 +13802,6 @@
            glib:type-struct="ContainerClass">
       <implements name="Atk.ImplementorIface"/>
       <implements name="Buildable"/>
-      <function name="class_find_child_property"
-                c:identifier="gtk_container_class_find_child_property">
-        <return-value transfer-ownership="full">
-          <type name="GObject.ParamSpec" c:type="GParamSpec*"/>
-        </return-value>
-        <parameters>
-          <parameter name="cclass" transfer-ownership="none">
-            <type name="GObject.ObjectClass" c:type="GObjectClass*"/>
-          </parameter>
-          <parameter name="property_name" transfer-ownership="none">
-            <type name="utf8" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </function>
-      <function name="class_list_child_properties"
-                c:identifier="gtk_container_class_list_child_properties">
-        <return-value transfer-ownership="full">
-          <type name="GObject.ParamSpec" c:type="GParamSpec**"/>
-        </return-value>
-        <parameters>
-          <parameter name="cclass" transfer-ownership="none">
-            <type name="GObject.ObjectClass" c:type="GObjectClass*"/>
-          </parameter>
-          <parameter name="n_properties"
-                     direction="out"
-                     transfer-ownership="full">
-            <type name="uint" c:type="guint*"/>
-          </parameter>
-        </parameters>
-      </function>
       <virtual-method name="forall">
         <return-value transfer-ownership="none">
           <type name="none" c:type="void"/>
@@ -52168,16 +52138,6 @@
           <type name="Tooltips" c:type="GtkTooltips*"/>
         </return-value>
       </constructor>
-      <function name="data_get" c:identifier="gtk_tooltips_data_get">
-        <return-value transfer-ownership="full">
-          <type name="TooltipsData" c:type="GtkTooltipsData*"/>
-        </return-value>
-        <parameters>
-          <parameter name="widget" transfer-ownership="none">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-        </parameters>
-      </function>
       <function name="get_info_from_tip_window"
                 c:identifier="gtk_tooltips_get_info_from_tip_window">
         <return-value transfer-ownership="none">
@@ -64097,6 +64057,36 @@
         </parameter>
       </parameters>
     </function>
+    <function name="container_class_find_child_property"
+              c:identifier="gtk_container_class_find_child_property">
+      <return-value transfer-ownership="full">
+        <type name="GObject.ParamSpec" c:type="GParamSpec*"/>
+      </return-value>
+      <parameters>
+        <parameter name="cclass" transfer-ownership="none">
+          <type name="GObject.ObjectClass" c:type="GObjectClass*"/>
+        </parameter>
+        <parameter name="property_name" transfer-ownership="none">
+          <type name="utf8" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="container_class_list_child_properties"
+              c:identifier="gtk_container_class_list_child_properties">
+      <return-value transfer-ownership="full">
+        <type name="GObject.ParamSpec" c:type="GParamSpec**"/>
+      </return-value>
+      <parameters>
+        <parameter name="cclass" transfer-ownership="none">
+          <type name="GObject.ObjectClass" c:type="GObjectClass*"/>
+        </parameter>
+        <parameter name="n_properties"
+                   direction="out"
+                   transfer-ownership="full">
+          <type name="uint" c:type="guint*"/>
+        </parameter>
+      </parameters>
+    </function>
     <function name="disable_setlocale" c:identifier="gtk_disable_setlocale">
       <return-value transfer-ownership="none">
         <type name="none" c:type="void"/>
@@ -68087,6 +68077,16 @@
         </parameter>
       </parameters>
     </function>
+    <function name="tooltips_data_get" c:identifier="gtk_tooltips_data_get">
+      <return-value transfer-ownership="full">
+        <type name="TooltipsData" c:type="GtkTooltipsData*"/>
+      </return-value>
+      <parameters>
+        <parameter name="widget" transfer-ownership="none">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+      </parameters>
+    </function>
     <function name="tree_get_row_drag_data"
               c:identifier="gtk_tree_get_row_drag_data">
       <return-value transfer-ownership="none">
diff -ur Desktop/gir-1.0/Pango-1.0.gir /opt/gnome/share/gir-1.0/Pango-1.0.gir
--- Desktop/gir-1.0/Pango-1.0.gir	2010-01-23 13:26:52.000000000 +0100
+++ /opt/gnome/share/gir-1.0/Pango-1.0.gir	2010-01-23 20:00:37.000000000 +0100
@@ -1044,17 +1044,6 @@
            abstract="1"
            glib:type-name="PangoFont"
            glib:get-type="pango_font_get_type">
-      <function name="description_from_string"
-                c:identifier="pango_font_description_from_string">
-        <return-value transfer-ownership="full">
-          <type name="FontDescription" c:type="PangoFontDescription*"/>
-        </return-value>
-        <parameters>
-          <parameter name="str" transfer-ownership="none">
-            <type name="utf8" c:type="char*"/>
-          </parameter>
-        </parameters>
-      </function>
       <method name="describe" c:identifier="pango_font_describe">
         <return-value transfer-ownership="full">
           <type name="FontDescription" c:type="PangoFontDescription*"/>
@@ -4875,6 +4864,17 @@
         </parameter>
       </parameters>
     </function>
+    <function name="font_description_from_string"
+              c:identifier="pango_font_description_from_string">
+      <return-value transfer-ownership="full">
+        <type name="FontDescription" c:type="PangoFontDescription*"/>
+      </return-value>
+      <parameters>
+        <parameter name="str" transfer-ownership="none">
+          <type name="utf8" c:type="char*"/>
+        </parameter>
+      </parameters>
+    </function>
     <function name="get_log_attrs" c:identifier="pango_get_log_attrs">
       <return-value transfer-ownership="none">
         <type name="none" c:type="void"/>
diff -ur Desktop/gir-1.0/PangoCairo-1.0.gir /opt/gnome/share/gir-1.0/PangoCairo-1.0.gir
--- Desktop/gir-1.0/PangoCairo-1.0.gir	2010-01-23 13:26:52.000000000 +0100
+++ /opt/gnome/share/gir-1.0/PangoCairo-1.0.gir	2010-01-23 20:00:37.000000000 +0100
@@ -42,6 +42,28 @@
                glib:type-name="PangoCairoFontMap"
                glib:get-type="pango_cairo_font_map_get_type">
       <prerequisite name="Pango.FontMap"/>
+      <function name="new" c:identifier="pango_cairo_font_map_new">
+        <return-value transfer-ownership="full">
+          <type name="Pango.FontMap" c:type="PangoFontMap*"/>
+        </return-value>
+      </function>
+      <function name="new_for_font_type"
+                c:identifier="pango_cairo_font_map_new_for_font_type">
+        <return-value transfer-ownership="full">
+          <type name="Pango.FontMap" c:type="PangoFontMap*"/>
+        </return-value>
+        <parameters>
+          <parameter name="fonttype" transfer-ownership="none">
+            <type name="cairo.FontType" c:type="cairo_font_type_t"/>
+          </parameter>
+        </parameters>
+      </function>
+      <function name="get_default"
+                c:identifier="pango_cairo_font_map_get_default">
+        <return-value transfer-ownership="full">
+          <type name="Pango.FontMap" c:type="PangoFontMap*"/>
+        </return-value>
+      </function>
       <method name="set_default"
               c:identifier="pango_cairo_font_map_set_default">
         <return-value transfer-ownership="none">
@@ -228,28 +250,6 @@
         </parameter>
       </parameters>
     </function>
-    <function name="font_map_get_default"
-              c:identifier="pango_cairo_font_map_get_default">
-      <return-value transfer-ownership="full">
-        <type name="Pango.FontMap" c:type="PangoFontMap*"/>
-      </return-value>
-    </function>
-    <function name="font_map_new" c:identifier="pango_cairo_font_map_new">
-      <return-value transfer-ownership="full">
-        <type name="Pango.FontMap" c:type="PangoFontMap*"/>
-      </return-value>
-    </function>
-    <function name="font_map_new_for_font_type"
-              c:identifier="pango_cairo_font_map_new_for_font_type">
-      <return-value transfer-ownership="full">
-        <type name="Pango.FontMap" c:type="PangoFontMap*"/>
-      </return-value>
-      <parameters>
-        <parameter name="fonttype" transfer-ownership="none">
-          <type name="cairo.FontType" c:type="cairo_font_type_t"/>
-        </parameter>
-      </parameters>
-    </function>
     <function name="glyph_string_path"
               c:identifier="pango_cairo_glyph_string_path">
       <return-value transfer-ownership="none">
