diff --git a/gio/AppInfoFactory.cs b/gio/AppInfoFactory.cs
new file mode 100644
index 000000000..b9b710439
--- /dev/null
+++ b/gio/AppInfoFactory.cs
@@ -0,0 +1,109 @@
+//
+// AppInfoFactory.cs
+//
+// Author(s):
+//	Stephane Delcroix  <stephane@delcroix.org>
+//
+// Copyright (c) 2009 Stephane Delcroix
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the Lesser GNU General
+// Public License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace GLib
+{
+	public class AppInfoFactory
+	{
+		[DllImport("libgio-2.0-0.dll")]
+		static extern IntPtr g_app_info_get_all();
+
+		[DllImport("libgio-2.0-0.dll")]
+		static extern IntPtr g_app_info_create_from_commandline(IntPtr commandline, IntPtr application_name, int flags, out IntPtr error);
+
+		public static GLib.AppInfo CreateFromCommandline(string commandline, string application_name, GLib.AppInfoCreateFlags flags) {
+			IntPtr native_commandline = GLib.Marshaller.StringToPtrGStrdup (commandline);
+			IntPtr native_application_name = GLib.Marshaller.StringToPtrGStrdup (application_name);
+			IntPtr error = IntPtr.Zero;
+			IntPtr raw_ret = g_app_info_create_from_commandline(native_commandline, native_application_name, (int) flags, out error);
+			GLib.AppInfo ret = GLib.Object.GetObject (raw_ret, false) as AppInfo;
+			GLib.Marshaller.Free (native_commandline);
+			GLib.Marshaller.Free (native_application_name);
+			if (error != IntPtr.Zero) throw new GLib.GException (error);
+			return ret;
+		}
+
+		public static GLib.List GetAll () {
+			IntPtr raw_ret = g_app_info_get_all();
+			GLib.List ret = new GLib.List(raw_ret);
+			return ret;
+		}
+
+		[DllImport("libgio-2.0-0.dll")]
+		static extern IntPtr g_app_info_get_all_for_type(IntPtr content_type);
+
+//		public static GLib.AppInfo[] GetAllForType(string content_type) {
+//			IntPtr native_content_type = GLib.Marshaller.StringToPtrGStrdup (content_type);
+//			IntPtr raw_ret = g_app_info_get_all_for_type(native_content_type);
+//			GLib.AppInfo[] ret = (GLib.AppInfo[]) GLib.Marshaller.ListPtrToArray (raw_ret, typeof(GLib.List), true, false, typeof(GLib.AppInfo));
+//			GLib.Marshaller.Free (native_content_type);
+//			return ret;
+//		}
+
+		public static GLib.List GetAllForType (string content_type)
+		{
+			IntPtr native_content_type = GLib.Marshaller.StringToPtrGStrdup (content_type);
+			IntPtr raw_ret = g_app_info_get_all_for_type(native_content_type);
+			GLib.List ret = new GLib.List(raw_ret);
+			GLib.Marshaller.Free (native_content_type);
+			return ret;
+		}
+
+		[DllImport("libgio-2.0-0.dll")]
+		static extern IntPtr g_app_info_get_default_for_type(IntPtr content_type, bool must_support_uris);
+
+		public static GLib.AppInfo GetDefaultForType(string content_type, bool must_support_uris) {
+			IntPtr native_content_type = GLib.Marshaller.StringToPtrGStrdup (content_type);
+			IntPtr raw_ret = g_app_info_get_default_for_type(native_content_type, must_support_uris);
+			GLib.AppInfo ret = GLib.Object.GetObject (raw_ret, false) as AppInfo;
+			GLib.Marshaller.Free (native_content_type);
+			return ret;
+		}
+
+		[DllImport("libgio-2.0-0.dll")]
+		static extern IntPtr g_app_info_get_default_for_uri_scheme(IntPtr uri_scheme);
+
+		public static GLib.AppInfo GetDefaultForUriScheme(string uri_scheme) {
+			IntPtr native_uri_scheme = GLib.Marshaller.StringToPtrGStrdup (uri_scheme);
+			IntPtr raw_ret = g_app_info_get_default_for_uri_scheme(native_uri_scheme);
+			GLib.AppInfo ret = GLib.Object.GetObject (raw_ret, false) as AppInfo;
+			GLib.Marshaller.Free (native_uri_scheme);
+			return ret;
+		}
+
+		[DllImport("libgio-2.0-0.dll")]
+		static extern bool g_app_info_launch_default_for_uri(IntPtr uri, IntPtr launch_context, out IntPtr error);
+
+		public static bool LaunchDefaultForUri(string uri, GLib.AppLaunchContext launch_context) {
+			IntPtr native_uri = GLib.Marshaller.StringToPtrGStrdup (uri);
+			IntPtr error = IntPtr.Zero;
+			bool raw_ret = g_app_info_launch_default_for_uri(native_uri, launch_context == null ? IntPtr.Zero : launch_context.Handle, out error);
+			bool ret = raw_ret;
+			GLib.Marshaller.Free (native_uri);
+			if (error != IntPtr.Zero) throw new GLib.GException (error);
+			return ret;
+		}
+	}
+}
diff --git a/gio/Gio.metadata b/gio/Gio.metadata
index 7a7332fbc..85ca61c2a 100644
--- a/gio/Gio.metadata
+++ b/gio/Gio.metadata
@@ -2,16 +2,11 @@
 <metadata>
   <add-node path="/api"><symbol type="simple" cname="GSeekType" name="GLib.SeekType"/></add-node>
   <attr path="/api/namespace" name="name">GLib</attr>
-  <attr path="/api/namespace/interface[@cname='GAppInfo']/method[@name='All']/return-type" name="element_type">GAppInfo*</attr>
-  <attr path="/api/namespace/interface[@cname='GAppInfo']/method[@name='All']/return-type" name="owned">true</attr>
-  <attr path="/api/namespace/interface[@cname='GAppInfo']/method[@name='All']/return-type" name="elements_owned">true</attr>
-  <attr path="/api/namespace/interface[@cname='GAppInfo']/method[@name='GetAllForType']/return-type" name="element_type">GAppInfo*</attr>
-  <attr path="/api/namespace/interface[@cname='GAppInfo']/method[@name='GetAllForType']/return-type" name="owned">true</attr>
-<!--  <attr path="/api/namespace/interface[@cname='GAppInfo']/method[@name='GetAllForType']/return-type" name="elements_owned">true</attr>-->
   <attr path="/api/namespace/interface[@cname='GAppInfo']/method[@name='ShouldShow']" name="name">GetShouldShow</attr>
   <attr path="/api/namespace/interface[@cname='GAppInfo']/method[@name='SupportsFiles']" name="name">GetSupportsFiles</attr>
   <attr path="/api/namespace/interface[@cname='GAppInfo']/method[@name='SupportsUris']" name="name">GetSupportsUris</attr>
   <attr path="/api/namespace/interface[@cname='GAppInfo']/method[@name='CanRemoveSupportsType']" name="name">GetCanRemoveSupportsType</attr>
+  <attr path="/api/namespace/interface[@cname='GAppInfo']" name="consume_only">1</attr>
   <attr path="/api/namespace/interface[@cname='GFile']/method[@name='GetParseName']" name="name">GetParsedName</attr>
   <attr path="/api/namespace/interface[@cname='GFile']/method[@name='GetUri']" name="hidden">1</attr>
   <attr path="/api/namespace/interface[@cname='GLoadableIcon']/method[@name='LoadAsync']/*/*[@type='GAsyncReadyCallback']" name="scope">async</attr>
diff --git a/gio/Makefile.am b/gio/Makefile.am
index 94b951450..750e43f0b 100644
--- a/gio/Makefile.am
+++ b/gio/Makefile.am
@@ -11,6 +11,7 @@ glue_includes = gio/gio.h
 POLICY_VERSIONS=
 
 sources =			\
+	AppInfoFactory.cs	\
 	FileFactory.cs		\
 	GioStream.cs