vala r2340 - in trunk: . vala vapi vapigen



Author: juergbi
Date: Wed Jan 14 22:44:41 2009
New Revision: 2340
URL: http://svn.gnome.org/viewvc/vala?rev=2340&view=rev

Log:
2009-01-14  JÃrg Billeter  <j bitron ch>

	* vala/valacodewriter.vala:

	Improve output for owned property getters

	* vapigen/valagidlparser.vala:

	Getters of properties without accessor have to return owned value

	* vapi/: regenerated


Modified:
   trunk/ChangeLog
   trunk/vala/valacodewriter.vala
   trunk/vapi/atk.vapi
   trunk/vapi/gconf-2.0.vapi
   trunk/vapi/gdk-2.0.vapi
   trunk/vapi/gdk-x11-2.0.vapi
   trunk/vapi/gnome-desktop-2.0.vapi
   trunk/vapi/gnome-keyring-1.vapi
   trunk/vapi/goocanvas.vapi
   trunk/vapi/gstreamer-0.10.vapi
   trunk/vapi/gstreamer-check-0.10.vapi
   trunk/vapi/gstreamer-fft-0.10.vapi
   trunk/vapi/gstreamer-interfaces-0.10.vapi
   trunk/vapi/gstreamer-net-0.10.vapi
   trunk/vapi/gtk+-2.0.vapi
   trunk/vapi/gtksourceview-2.0.vapi
   trunk/vapi/hildon-1.vapi
   trunk/vapi/hildon-fm-2.vapi
   trunk/vapi/json-glib-1.0.vapi
   trunk/vapi/libglade-2.0.vapi
   trunk/vapi/libgnome-2.0.vapi
   trunk/vapi/libgnome-menu.vapi
   trunk/vapi/libgnomeui-2.0.vapi
   trunk/vapi/libnotify.vapi
   trunk/vapi/liboobs-1.vapi
   trunk/vapi/libsexy.vapi
   trunk/vapi/libsoup-2.2.vapi
   trunk/vapi/libsoup-2.4.vapi
   trunk/vapi/libwnck-1.0.vapi
   trunk/vapi/pango.vapi
   trunk/vapi/poppler-glib.vapi
   trunk/vapi/webkit-1.0.vapi
   trunk/vapigen/valagidlparser.vala

Modified: trunk/vala/valacodewriter.vala
==============================================================================
--- trunk/vala/valacodewriter.vala	(original)
+++ trunk/vala/valacodewriter.vala	Wed Jan 14 22:44:41 2009
@@ -962,8 +962,8 @@
 		write_identifier (prop.name);
 		write_string (" {");
 		if (prop.get_accessor != null) {
-			if (prop.get_accessor.value_type.value_owned) {
-				write_string ("owned ");
+			if (prop.get_accessor.value_type.is_disposable ()) {
+				write_string (" owned");
 			}
 
 			write_string (" get");

Modified: trunk/vapi/atk.vapi
==============================================================================
--- trunk/vapi/atk.vapi	(original)
+++ trunk/vapi/atk.vapi	Wed Jan 14 22:44:41 2009
@@ -1,4 +1,4 @@
-/* atk.vapi generated by lt-vapigen, do not modify. */
+/* atk.vapi generated by vapigen, do not modify. */
 
 [CCode (cprefix = "Atk", lower_case_cprefix = "atk_")]
 namespace Atk {
@@ -103,29 +103,29 @@
 		[NoAccessorMethod]
 		public int accessible_component_mdi_zorder { get; }
 		[NoAccessorMethod]
-		public string accessible_description { get; set; }
+		public string accessible_description { owned get; set; }
 		[NoAccessorMethod]
 		public int accessible_hypertext_nlinks { get; }
 		[NoAccessorMethod]
-		public string accessible_name { get; set; }
+		public string accessible_name { owned get; set; }
 		[NoAccessorMethod]
-		public Atk.Object accessible_parent { get; set; }
+		public Atk.Object accessible_parent { owned get; set; }
 		[NoAccessorMethod]
 		public int accessible_role { get; set; }
 		[NoAccessorMethod]
-		public string accessible_table_caption { get; set; }
+		public string accessible_table_caption { owned get; set; }
 		[NoAccessorMethod]
-		public Atk.Object accessible_table_caption_object { get; set; }
+		public Atk.Object accessible_table_caption_object { owned get; set; }
 		[NoAccessorMethod]
-		public string accessible_table_column_description { get; set; }
+		public string accessible_table_column_description { owned get; set; }
 		[NoAccessorMethod]
-		public Atk.Object accessible_table_column_header { get; set; }
+		public Atk.Object accessible_table_column_header { owned get; set; }
 		[NoAccessorMethod]
-		public string accessible_table_row_description { get; set; }
+		public string accessible_table_row_description { owned get; set; }
 		[NoAccessorMethod]
-		public Atk.Object accessible_table_row_header { get; set; }
+		public Atk.Object accessible_table_row_header { owned get; set; }
 		[NoAccessorMethod]
-		public Atk.Object accessible_table_summary { get; set; }
+		public Atk.Object accessible_table_summary { owned get; set; }
 		[NoAccessorMethod]
 		public double accessible_value { get; set; }
 		public virtual signal void active_descendant_changed (void* child);

Modified: trunk/vapi/gconf-2.0.vapi
==============================================================================
--- trunk/vapi/gconf-2.0.vapi	(original)
+++ trunk/vapi/gconf-2.0.vapi	Wed Jan 14 22:44:41 2009
@@ -1,11 +1,11 @@
-/* gconf-2.0.vapi generated by lt-vapigen, do not modify. */
+/* gconf-2.0.vapi generated by vapigen, do not modify. */
 
 [CCode (cprefix = "GConf", lower_case_cprefix = "gconf_")]
 namespace GConf {
 	[Compact]
 	[CCode (ref_function = "gconf_change_set_ref", unref_function = "gconf_change_set_unref", cheader_filename = "gconf/gconf.h")]
 	public class ChangeSet {
-		public bool check_value (string key, out weak GConf.Value value_retloc);
+		public bool check_value (string key, out unowned GConf.Value value_retloc);
 		public void clear ();
 		public void @foreach (GConf.ChangeSetForeachFunc func);
 		public void* get_user_data ();
@@ -38,34 +38,34 @@
 		public int pad2;
 		public int pending_notify_count;
 		public void add_dir (string dir, GConf.ClientPreloadType preload) throws GLib.Error;
-		public weak GLib.SList all_dirs (string dir) throws GLib.Error;
-		public weak GLib.SList all_entries (string dir) throws GLib.Error;
-		public weak GConf.ChangeSet change_set_from_current (...) throws GLib.Error;
-		public weak GConf.ChangeSet change_set_from_currentv (string keys) throws GLib.Error;
+		public unowned GLib.SList all_dirs (string dir) throws GLib.Error;
+		public unowned GLib.SList all_entries (string dir) throws GLib.Error;
+		public unowned GConf.ChangeSet change_set_from_current (...) throws GLib.Error;
+		public unowned GConf.ChangeSet change_set_from_currentv (string keys) throws GLib.Error;
 		public void clear_cache ();
 		public bool commit_change_set (GConf.ChangeSet cs, bool remove_committed) throws GLib.Error;
 		public bool dir_exists (string dir) throws GLib.Error;
-		public weak GConf.Value get (string key) throws GLib.Error;
+		public unowned GConf.Value get (string key) throws GLib.Error;
 		public bool get_bool (string key) throws GLib.Error;
-		public static weak GConf.Client get_default ();
-		public weak GConf.Value get_default_from_schema (string key) throws GLib.Error;
-		public weak GConf.Entry get_entry (string key, string locale, bool use_schema_default) throws GLib.Error;
+		public static unowned GConf.Client get_default ();
+		public unowned GConf.Value get_default_from_schema (string key) throws GLib.Error;
+		public unowned GConf.Entry get_entry (string key, string locale, bool use_schema_default) throws GLib.Error;
 		public double get_float (string key) throws GLib.Error;
-		public static weak GConf.Client get_for_engine (GConf.Engine engine);
+		public static unowned GConf.Client get_for_engine (GConf.Engine engine);
 		public int get_int (string key) throws GLib.Error;
-		public weak GLib.SList get_list (string key, GConf.ValueType list_type) throws GLib.Error;
+		public unowned GLib.SList get_list (string key, GConf.ValueType list_type) throws GLib.Error;
 		public bool get_pair (string key, GConf.ValueType car_type, GConf.ValueType cdr_type, void* car_retloc, void* cdr_retloc) throws GLib.Error;
-		public weak GConf.Schema get_schema (string key) throws GLib.Error;
-		public weak string get_string (string key) throws GLib.Error;
-		public weak GConf.Value get_without_default (string key) throws GLib.Error;
+		public unowned GConf.Schema get_schema (string key) throws GLib.Error;
+		public unowned string get_string (string key) throws GLib.Error;
+		public unowned GConf.Value get_without_default (string key) throws GLib.Error;
 		public bool key_is_writable (string key) throws GLib.Error;
 		public void notify (string key);
-		public uint notify_add (string namespace_section, GConf.ClientNotifyFunc# func) throws GLib.Error;
+		public uint notify_add (string namespace_section, owned GConf.ClientNotifyFunc func) throws GLib.Error;
 		public void notify_remove (uint cnxn);
 		public void preload (string dirname, GConf.ClientPreloadType type) throws GLib.Error;
 		public bool recursive_unset (string key, GConf.UnsetFlags flags) throws GLib.Error;
 		public void remove_dir (string dir) throws GLib.Error;
-		public weak GConf.ChangeSet reverse_change_set (GConf.ChangeSet cs) throws GLib.Error;
+		public unowned GConf.ChangeSet reverse_change_set (GConf.ChangeSet cs) throws GLib.Error;
 		public void set (string key, GConf.Value val) throws GLib.Error;
 		public bool set_bool (string key, bool val) throws GLib.Error;
 		public void set_error_handling (GConf.ClientErrorHandlingMode mode);
@@ -88,34 +88,34 @@
 	[Compact]
 	[CCode (ref_function = "gconf_engine_ref", unref_function = "gconf_engine_unref", cheader_filename = "gconf/gconf.h")]
 	public class Engine {
-		public weak GLib.SList all_dirs (string dir) throws GLib.Error;
-		public weak GLib.SList all_entries (string dir) throws GLib.Error;
+		public unowned GLib.SList all_dirs (string dir) throws GLib.Error;
+		public unowned GLib.SList all_entries (string dir) throws GLib.Error;
 		public bool associate_schema (string key, string schema_key) throws GLib.Error;
-		public weak GConf.ChangeSet change_set_from_current (...) throws GLib.Error;
-		public weak GConf.ChangeSet change_set_from_currentv (string keys) throws GLib.Error;
+		public unowned GConf.ChangeSet change_set_from_current (...) throws GLib.Error;
+		public unowned GConf.ChangeSet change_set_from_currentv (string keys) throws GLib.Error;
 		public bool commit_change_set (GConf.ChangeSet cs, bool remove_committed) throws GLib.Error;
 		public bool dir_exists (string dir) throws GLib.Error;
-		public weak GConf.Value get (string key) throws GLib.Error;
+		public unowned GConf.Value get (string key) throws GLib.Error;
 		public bool get_bool (string key) throws GLib.Error;
-		public static weak GConf.Engine get_default ();
-		public weak GConf.Value get_default_from_schema (string key) throws GLib.Error;
-		public weak GConf.Entry get_entry (string key, string locale, bool use_schema_default) throws GLib.Error;
+		public static unowned GConf.Engine get_default ();
+		public unowned GConf.Value get_default_from_schema (string key) throws GLib.Error;
+		public unowned GConf.Entry get_entry (string key, string locale, bool use_schema_default) throws GLib.Error;
 		public double get_float (string key) throws GLib.Error;
-		public static weak GConf.Engine get_for_address (string address) throws GLib.Error;
-		public static weak GConf.Engine get_for_addresses (GLib.SList addresses) throws GLib.Error;
+		public static unowned GConf.Engine get_for_address (string address) throws GLib.Error;
+		public static unowned GConf.Engine get_for_addresses (GLib.SList addresses) throws GLib.Error;
 		public int get_int (string key) throws GLib.Error;
-		public weak GLib.SList get_list (string key, GConf.ValueType list_type) throws GLib.Error;
+		public unowned GLib.SList get_list (string key, GConf.ValueType list_type) throws GLib.Error;
 		public bool get_pair (string key, GConf.ValueType car_type, GConf.ValueType cdr_type, void* car_retloc, void* cdr_retloc) throws GLib.Error;
-		public weak GConf.Schema get_schema (string key) throws GLib.Error;
-		public weak string get_string (string key) throws GLib.Error;
+		public unowned GConf.Schema get_schema (string key) throws GLib.Error;
+		public unowned string get_string (string key) throws GLib.Error;
 		public void* get_user_data ();
-		public weak GConf.Value get_with_locale (string key, string locale) throws GLib.Error;
-		public weak GConf.Value get_without_default (string key) throws GLib.Error;
+		public unowned GConf.Value get_with_locale (string key, string locale) throws GLib.Error;
+		public unowned GConf.Value get_without_default (string key) throws GLib.Error;
 		public bool key_is_writable (string key) throws GLib.Error;
 		public uint notify_add (string namespace_section, GConf.NotifyFunc func) throws GLib.Error;
 		public void notify_remove (uint cnxn);
 		public void remove_dir (string dir) throws GLib.Error;
-		public weak GConf.ChangeSet reverse_change_set (GConf.ChangeSet cs) throws GLib.Error;
+		public unowned GConf.ChangeSet reverse_change_set (GConf.ChangeSet cs) throws GLib.Error;
 		public bool set (string key, GConf.Value value) throws GLib.Error;
 		public bool set_bool (string key, bool val) throws GLib.Error;
 		public bool set_float (string key, double val) throws GLib.Error;
@@ -133,13 +133,13 @@
 	public class Entry {
 		public weak string key;
 		public weak GConf.Value value;
-		public weak GConf.Entry copy ();
+		public unowned GConf.Entry copy ();
 		public bool equal (GConf.Entry b);
 		public bool get_is_default ();
 		public bool get_is_writable ();
-		public weak string get_key ();
-		public weak string get_schema_name ();
-		public weak GConf.Value get_value ();
+		public unowned string get_key ();
+		public unowned string get_schema_name ();
+		public unowned GConf.Value get_value ();
 		[CCode (has_construct_function = false)]
 		public Entry (string key, GConf.Value val);
 		[CCode (has_construct_function = false)]
@@ -149,7 +149,7 @@
 		public void set_schema_name (string name);
 		public void set_value (GConf.Value val);
 		public void set_value_nocopy (GConf.Value val);
-		public weak GConf.Value steal_value ();
+		public unowned GConf.Value steal_value ();
 	}
 	[Compact]
 	[CCode (cheader_filename = "gconf/gconf.h")]
@@ -178,8 +178,8 @@
 		public weak string schema;
 		[CCode (cname = "gconf_meta_info_mod_time")]
 		public GLib.Time get_mod_time ();
-		public weak string get_mod_user ();
-		public weak string get_schema ();
+		public unowned string get_mod_user ();
+		public unowned string get_schema ();
 		[CCode (has_construct_function = false)]
 		public MetaInfo ();
 		public void set_mod_time (GLib.Time mod_time);
@@ -189,15 +189,15 @@
 	[Compact]
 	[CCode (copy_function = "gconf_schema_copy", cheader_filename = "gconf/gconf.h")]
 	public class Schema {
-		public weak GConf.Schema copy ();
+		public unowned GConf.Schema copy ();
 		public GConf.ValueType get_car_type ();
 		public GConf.ValueType get_cdr_type ();
-		public weak GConf.Value get_default_value ();
+		public unowned GConf.Value get_default_value ();
 		public GConf.ValueType get_list_type ();
-		public weak string get_locale ();
-		public weak string get_long_desc ();
-		public weak string get_owner ();
-		public weak string get_short_desc ();
+		public unowned string get_locale ();
+		public unowned string get_long_desc ();
+		public unowned string get_owner ();
+		public unowned string get_short_desc ();
 		[CCode (has_construct_function = false)]
 		public Schema ();
 		public void set_car_type (GConf.ValueType type);
@@ -216,18 +216,18 @@
 	public class Value {
 		public GConf.ValueType type;
 		public int compare (GConf.Value value_b);
-		public weak GConf.Value copy ();
+		public unowned GConf.Value copy ();
 		[CCode (has_construct_function = false)]
 		public Value.from_string (GConf.ValueType type, string str) throws GLib.Error;
 		public bool get_bool ();
-		public weak GConf.Value get_car ();
-		public weak GConf.Value get_cdr ();
+		public unowned GConf.Value get_car ();
+		public unowned GConf.Value get_cdr ();
 		public double get_float ();
 		public int get_int ();
-		public weak GLib.SList get_list ();
+		public unowned GLib.SList get_list ();
 		public GConf.ValueType get_list_type ();
-		public weak GConf.Schema get_schema ();
-		public weak string get_string ();
+		public unowned GConf.Schema get_schema ();
+		public unowned string get_string ();
 		[CCode (has_construct_function = false)]
 		public Value (GConf.ValueType type);
 		public void set_bool (bool the_bool);
@@ -243,7 +243,7 @@
 		public void set_schema (GConf.Schema sc);
 		public void set_schema_nocopy (GConf.Schema sc);
 		public void set_string (string the_str);
-		public weak string to_string ();
+		public unowned string to_string ();
 	}
 	[CCode (cprefix = "GCONF_CLIENT_HANDLE_", has_type_id = "0", cheader_filename = "gconf/gconf.h")]
 	public enum ClientErrorHandlingMode {
@@ -308,17 +308,17 @@
 	[CCode (cheader_filename = "gconf/gconf.h")]
 	public delegate void NotifyFunc (GConf.Engine conf, uint cnxn_id, GConf.Entry entry);
 	[CCode (cheader_filename = "gconf/gconf.h")]
-	public static weak string concat_dir_and_key (string dir, string key);
+	public static unowned string concat_dir_and_key (string dir, string key);
 	[CCode (cheader_filename = "gconf/gconf.h")]
 	public static int debug_shutdown ();
 	[CCode (cheader_filename = "gconf/gconf.h")]
-	public static weak string enum_to_string (GConf.EnumStringPair[] lookup_table, int enum_value);
+	public static unowned string enum_to_string (GConf.EnumStringPair[] lookup_table, int enum_value);
 	[CCode (cheader_filename = "gconf/gconf.h")]
 	public static GLib.Quark error_quark ();
 	[CCode (cheader_filename = "gconf/gconf.h")]
-	public static weak string escape_key (string arbitrary_text, int len);
+	public static unowned string escape_key (string arbitrary_text, int len);
 	[CCode (cheader_filename = "gconf/gconf.h")]
-	public static bool init (int argc, out weak string argv) throws GLib.Error;
+	public static bool init (int argc, out unowned string argv) throws GLib.Error;
 	[CCode (cheader_filename = "gconf/gconf.h")]
 	public static bool is_initialized ();
 	[CCode (cheader_filename = "gconf/gconf.h")]
@@ -326,9 +326,9 @@
 	[CCode (cheader_filename = "gconf/gconf.h")]
 	public static bool string_to_enum (GConf.EnumStringPair[] lookup_table, string str, int enum_value_retloc);
 	[CCode (cheader_filename = "gconf/gconf.h")]
-	public static weak string unescape_key (string escaped_key, int len);
+	public static unowned string unescape_key (string escaped_key, int len);
 	[CCode (cheader_filename = "gconf/gconf.h")]
-	public static weak string unique_key ();
+	public static unowned string unique_key ();
 	[CCode (cheader_filename = "gconf/gconf.h")]
 	public static bool valid_key (string key, string why_invalid);
 }

Modified: trunk/vapi/gdk-2.0.vapi
==============================================================================
--- trunk/vapi/gdk-2.0.vapi	(original)
+++ trunk/vapi/gdk-2.0.vapi	Wed Jan 14 22:44:41 2009
@@ -306,7 +306,7 @@
 		public void set_override_color (Pango.RenderPart part, Gdk.Color color);
 		public void set_stipple (Pango.RenderPart part, Gdk.Bitmap stipple);
 		[NoAccessorMethod]
-		public Gdk.Screen screen { get; construct; }
+		public Gdk.Screen screen { owned get; construct; }
 	}
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public class Pixmap : Gdk.Drawable {

Modified: trunk/vapi/gdk-x11-2.0.vapi
==============================================================================
--- trunk/vapi/gdk-x11-2.0.vapi	(original)
+++ trunk/vapi/gdk-x11-2.0.vapi	Wed Jan 14 22:44:41 2009
@@ -1,4 +1,4 @@
-/* gdk-x11-2.0.vapi generated by lt-vapigen, do not modify. */
+/* gdk-x11-2.0.vapi generated by vapigen, do not modify. */
 
 [CCode (cprefix = "Gdk", lower_case_cprefix = "gdk_")]
 namespace Gdk {
@@ -7,21 +7,21 @@
 	[CCode (cheader_filename = "gdk/gdkx.h")]
 	public static Gdk.Atom x11_atom_to_xatom_for_display (Gdk.Display display, Gdk.Atom atom);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
-	public static weak Gdk.Colormap x11_colormap_foreign_new (Gdk.Visual visual, Gdk.Colormap xcolormap);
+	public static unowned Gdk.Colormap x11_colormap_foreign_new (Gdk.Visual visual, Gdk.Colormap xcolormap);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
-	public static weak Gdk.Colormap x11_colormap_get_xcolormap (Gdk.Colormap colormap);
+	public static unowned Gdk.Colormap x11_colormap_get_xcolormap (Gdk.Colormap colormap);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
 	public static void* x11_colormap_get_xdisplay (Gdk.Colormap colormap);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
-	public static weak Gdk.Cursor x11_cursor_get_xcursor (Gdk.Cursor cursor);
+	public static unowned Gdk.Cursor x11_cursor_get_xcursor (Gdk.Cursor cursor);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
 	public static void* x11_cursor_get_xdisplay (Gdk.Cursor cursor);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
 	public static void x11_display_broadcast_startup_message (Gdk.Display display, string message_type);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
-	public static weak string x11_display_get_startup_notification_id (Gdk.Display display);
+	public static unowned string x11_display_get_startup_notification_id (Gdk.Display display);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
-	public static uint x11_display_get_user_time (Gdk.Display display);
+	public static uint32 x11_display_get_user_time (Gdk.Display display);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
 	public static void* x11_display_get_xdisplay (Gdk.Display display);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
@@ -39,21 +39,21 @@
 	[CCode (cheader_filename = "gdk/gdkx.h")]
 	public static void* x11_gc_get_xgc (Gdk.GC gc);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
-	public static weak Gdk.Window x11_get_default_root_xwindow ();
+	public static unowned Gdk.Window x11_get_default_root_xwindow ();
 	[CCode (cheader_filename = "gdk/gdkx.h")]
 	public static int x11_get_default_screen ();
 	[CCode (cheader_filename = "gdk/gdkx.h")]
 	public static void* x11_get_default_xdisplay ();
 	[CCode (cheader_filename = "gdk/gdkx.h")]
-	public static uint x11_get_server_time (Gdk.Window window);
+	public static uint32 x11_get_server_time (Gdk.Window window);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
 	public static Gdk.Atom x11_get_xatom_by_name (string atom_name);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
 	public static Gdk.Atom x11_get_xatom_by_name_for_display (Gdk.Display display, string atom_name);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
-	public static weak string x11_get_xatom_name (Gdk.Atom xatom);
+	public static unowned string x11_get_xatom_name (Gdk.Atom xatom);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
-	public static weak string x11_get_xatom_name_for_display (Gdk.Display display, Gdk.Atom xatom);
+	public static unowned string x11_get_xatom_name_for_display (Gdk.Display display, Gdk.Atom xatom);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
 	public static void x11_grab_server ();
 	[CCode (cheader_filename = "gdk/gdkx.h")]
@@ -61,7 +61,7 @@
 	[CCode (cheader_filename = "gdk/gdkx.h")]
 	public static void* x11_image_get_ximage (Gdk.Image image);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
-	public static weak Gdk.Display x11_lookup_xdisplay (void* xdisplay);
+	public static unowned Gdk.Display x11_lookup_xdisplay (void* xdisplay);
 	[CCode (cname = "gdk_net_wm_supports", cheader_filename = "gdk/gdkx.h")]
 	public static bool x11_net_wm_supports (Gdk.Atom property);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
@@ -69,23 +69,23 @@
 	[CCode (cheader_filename = "gdk/gdkx.h")]
 	public static int x11_screen_get_screen_number (Gdk.Screen screen);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
-	public static weak string x11_screen_get_window_manager_name (Gdk.Screen screen);
+	public static unowned string x11_screen_get_window_manager_name (Gdk.Screen screen);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
-	public static weak Gdk.Screen x11_screen_get_xscreen (Gdk.Screen screen);
+	public static unowned Gdk.Screen x11_screen_get_xscreen (Gdk.Screen screen);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
-	public static weak Gdk.Visual x11_screen_lookup_visual (Gdk.Screen screen, uint32 xvisualid);
+	public static unowned Gdk.Visual x11_screen_lookup_visual (Gdk.Screen screen, uint32 xvisualid);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
 	public static bool x11_screen_supports_net_wm_hint (Gdk.Screen screen, Gdk.Atom property);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
 	public static void x11_ungrab_server ();
 	[CCode (cname = "gdkx_visual_get", cheader_filename = "gdk/gdkx.h")]
-	public static weak Gdk.Visual x11_visual_get (uint32 xvisualid);
+	public static unowned Gdk.Visual x11_visual_get (uint32 xvisualid);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
-	public static weak Gdk.Visual x11_visual_get_xvisual (Gdk.Visual visual);
+	public static unowned Gdk.Visual x11_visual_get_xvisual (Gdk.Visual visual);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
 	public static void x11_window_move_to_current_desktop (Gdk.Window window);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
-	public static void x11_window_set_user_time (Gdk.Window window, uint timestamp);
+	public static void x11_window_set_user_time (Gdk.Window window, uint32 timestamp);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
 	public static Gdk.Atom x11_xatom_to_atom (Gdk.Atom xatom);
 	[CCode (cheader_filename = "gdk/gdkx.h")]

Modified: trunk/vapi/gnome-desktop-2.0.vapi
==============================================================================
--- trunk/vapi/gnome-desktop-2.0.vapi	(original)
+++ trunk/vapi/gnome-desktop-2.0.vapi	Wed Jan 14 22:44:41 2009
@@ -1,12 +1,12 @@
-/* gnome-desktop-2.0.vapi generated by lt-vapigen, do not modify. */
+/* gnome-desktop-2.0.vapi generated by vapigen, do not modify. */
 
 [CCode (cprefix = "Gnome", lower_case_cprefix = "gnome_")]
 namespace Gnome {
 	[CCode (cheader_filename = "libgnomeui/gnome-ditem-edit.h")]
 	public class DItemEdit : Gtk.Notebook, Atk.Implementor, Gtk.Buildable {
 		public void clear ();
-		public weak Gnome.DesktopItem get_ditem ();
-		public weak string get_icon ();
+		public unowned Gnome.DesktopItem get_ditem ();
+		public unowned string get_icon ();
 		public void grab_focus ();
 		public bool load_uri (string uri) throws GLib.Error;
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
@@ -25,31 +25,31 @@
 		public bool attr_exists (string attr);
 		public void clear_localestring (string attr);
 		public void clear_section (string section);
-		public weak Gnome.DesktopItem copy ();
+		public unowned Gnome.DesktopItem copy ();
 		public int drop_uri_list (string uri_list, Gnome.DesktopItemLaunchFlags flags) throws GLib.Error;
 		public int drop_uri_list_with_env (string uri_list, Gnome.DesktopItemLaunchFlags flags, string[] envp) throws GLib.Error;
 		public static GLib.Quark error_quark ();
 		public bool exists ();
-		public static weak string find_icon (Gtk.IconTheme icon_theme, string icon, int desired_size, int flags);
+		public static unowned string find_icon (Gtk.IconTheme icon_theme, string icon, int desired_size, int flags);
 		[CCode (has_construct_function = false)]
 		public DesktopItem.from_basename (string basename, Gnome.DesktopItemLoadFlags flags) throws GLib.Error;
 		[CCode (has_construct_function = false)]
 		public DesktopItem.from_file (string file, Gnome.DesktopItemLoadFlags flags) throws GLib.Error;
 		[CCode (has_construct_function = false)]
-		public DesktopItem.from_string (string uri, string str, long length, Gnome.DesktopItemLoadFlags flags) throws GLib.Error;
+		public DesktopItem.from_string (string uri, string str, ssize_t length, Gnome.DesktopItemLoadFlags flags) throws GLib.Error;
 		[CCode (has_construct_function = false)]
 		public DesktopItem.from_uri (string uri, Gnome.DesktopItemLoadFlags flags) throws GLib.Error;
-		public weak string get_attr_locale (string attr);
+		public unowned string get_attr_locale (string attr);
 		public bool get_boolean (string attr);
 		public Gnome.DesktopItemType get_entry_type ();
 		public Gnome.DesktopItemStatus get_file_status ();
-		public weak string get_icon (Gtk.IconTheme icon_theme);
-		public weak GLib.List get_languages (string attr);
-		public weak string get_localestring (string attr);
-		public weak string get_localestring_lang (string attr, string language);
-		public weak string get_location ();
-		public weak string get_string (string attr);
-		public weak string get_strings (string attr);
+		public unowned string get_icon (Gtk.IconTheme icon_theme);
+		public unowned GLib.List get_languages (string attr);
+		public unowned string get_localestring (string attr);
+		public unowned string get_localestring_lang (string attr, string language);
+		public unowned string get_location ();
+		public unowned string get_string (string attr);
+		public unowned string get_strings (string attr);
 		public int launch (GLib.List file_list, Gnome.DesktopItemLaunchFlags flags) throws GLib.Error;
 		public int launch_on_screen (GLib.List file_list, Gnome.DesktopItemLaunchFlags flags, Gdk.Screen screen, int workspace) throws GLib.Error;
 		public int launch_with_env (GLib.List file_list, Gnome.DesktopItemLaunchFlags flags, string[] envp) throws GLib.Error;
@@ -58,7 +58,7 @@
 		public bool save (string under, bool force) throws GLib.Error;
 		public void set_boolean (string attr, bool value);
 		public void set_entry_type (Gnome.DesktopItemType type);
-		public void set_launch_time (uint timestamp);
+		public void set_launch_time (uint32 timestamp);
 		public void set_localestring (string attr, string value);
 		public void set_localestring_lang (string attr, string language, string value);
 		public void set_location (string location);

Modified: trunk/vapi/gnome-keyring-1.vapi
==============================================================================
--- trunk/vapi/gnome-keyring-1.vapi	(original)
+++ trunk/vapi/gnome-keyring-1.vapi	Wed Jan 14 22:44:41 2009
@@ -1,29 +1,28 @@
-/* gnome-keyring-1.vapi generated by lt-vapigen, do not modify. */
+/* gnome-keyring-1.vapi generated by vapigen, do not modify. */
 
 [CCode (cprefix = "GnomeKeyring", lower_case_cprefix = "gnome_keyring_")]
 namespace GnomeKeyring {
 	[Compact]
 	[CCode (copy_function = "gnome_keyring_access_control_copy", cheader_filename = "gnome-keyring.h")]
 	public class AccessControl {
-		public weak GnomeKeyring.AccessControl copy ();
+		public unowned GnomeKeyring.AccessControl copy ();
 		[CCode (has_construct_function = false)]
 		public AccessControl (GnomeKeyring.ApplicationRef application, GnomeKeyring.AccessType types_allowed);
 	}
 	[Compact]
 	[CCode (copy_function = "gnome_keyring_application_ref_copy", cheader_filename = "gnome-keyring.h")]
 	public class ApplicationRef {
-		public weak GnomeKeyring.ApplicationRef copy ();
+		public unowned GnomeKeyring.ApplicationRef copy ();
 		[CCode (has_construct_function = false)]
 		public ApplicationRef ();
 	}
 	[CCode (ref_function = "gnome_keyring_attribute_list_ref", unref_function = "gnome_keyring_attribute_list_unref", cheader_filename = "gnome-keyring.h")]
 	public class AttributeList {
-		[CCode (array_length = false)]
 		public GnomeKeyring.Attribute[] data;
 		public uint len;
 		public void append_string (string name, string value);
-		public void append_uint32 (string name, uint value);
-		public weak GnomeKeyring.AttributeList copy ();
+		public void append_uint32 (string name, uint32 value);
+		public unowned GnomeKeyring.AttributeList copy ();
 		public GnomeKeyring.Attribute index (int i);
 	}
 	[Compact]
@@ -38,23 +37,23 @@
 	[Compact]
 	[CCode (copy_function = "gnome_keyring_info_copy", cheader_filename = "gnome-keyring.h")]
 	public class Info {
-		public weak GnomeKeyring.Info copy ();
+		public unowned GnomeKeyring.Info copy ();
 		public ulong get_ctime ();
 		public bool get_is_locked ();
 		public bool get_lock_on_idle ();
-		public uint get_lock_timeout ();
+		public uint32 get_lock_timeout ();
 		public ulong get_mtime ();
 		public void set_lock_on_idle (bool value);
-		public void set_lock_timeout (uint value);
+		public void set_lock_timeout (uint32 value);
 	}
 	[Compact]
 	[CCode (copy_function = "gnome_keyring_item_info_copy", cheader_filename = "gnome-keyring.h")]
 	public class ItemInfo {
-		public weak GnomeKeyring.ItemInfo copy ();
+		public unowned GnomeKeyring.ItemInfo copy ();
 		public ulong get_ctime ();
-		public weak string get_display_name ();
+		public unowned string get_display_name ();
 		public ulong get_mtime ();
-		public weak string get_secret ();
+		public unowned string get_secret ();
 		[CCode (has_construct_function = false)]
 		public ItemInfo ();
 		public void set_display_name (string value);
@@ -66,11 +65,11 @@
 	public class NetworkPasswordData {
 		public weak string authtype;
 		public weak string domain;
-		public uint item_id;
+		public uint32 item_id;
 		public weak string keyring;
 		public weak string object;
 		public weak string password;
-		public uint port;
+		public uint32 port;
 		public weak string protocol;
 		public weak string server;
 		public weak string user;
@@ -139,7 +138,7 @@
 	[CCode (cheader_filename = "gnome-keyring.h")]
 	public delegate void OperationGetAttributesCallback (GnomeKeyring.Result result, GnomeKeyring.AttributeList attributes);
 	[CCode (cheader_filename = "gnome-keyring.h")]
-	public delegate void OperationGetIntCallback (GnomeKeyring.Result result, uint val);
+	public delegate void OperationGetIntCallback (GnomeKeyring.Result result, uint32 val);
 	[CCode (cheader_filename = "gnome-keyring.h")]
 	public delegate void OperationGetItemInfoCallback (GnomeKeyring.Result result, GnomeKeyring.ItemInfo info);
 	[CCode (cheader_filename = "gnome-keyring.h")]
@@ -161,17 +160,17 @@
 	[CCode (cheader_filename = "gnome-keyring.h")]
 	public const GnomeKeyring.PasswordSchema NETWORK_PASSWORD;
 	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static weak GLib.List acl_copy (GLib.List list);
+	public static unowned GLib.List acl_copy (GLib.List list);
 	[CCode (cheader_filename = "gnome-keyring.h")]
 	public static void acl_free (GLib.List acl);
 	[CCode (cheader_filename = "gnome-keyring.h")]
 	public static void cancel_request (void* request);
 	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void* change_password (string keyring, string? original, string? password, GnomeKeyring.OperationDoneCallback# callback);
+	public static void* change_password (string keyring, string? original, string? password, owned GnomeKeyring.OperationDoneCallback callback);
 	[CCode (cheader_filename = "gnome-keyring.h")]
 	public static GnomeKeyring.Result change_password_sync (string keyring, string? original, string? password);
 	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void* create (string keyring_name, string? password, GnomeKeyring.OperationDoneCallback# callback);
+	public static void* create (string keyring_name, string? password, owned GnomeKeyring.OperationDoneCallback callback);
 	[CCode (cheader_filename = "gnome-keyring.h")]
 	public static GnomeKeyring.Result create_sync (string keyring_name, string? password);
 	[CCode (cheader_filename = "gnome-keyring.h")]
@@ -181,45 +180,45 @@
 	[CCode (cheader_filename = "gnome-keyring.h")]
 	public static void* @delete (string keyring, GnomeKeyring.OperationDoneCallback callback, void* data, GLib.DestroyNotify destroy_data);
 	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void* delete_password (GnomeKeyring.PasswordSchema schema, GnomeKeyring.OperationDoneCallback# callback, ...);
+	public static void* delete_password (GnomeKeyring.PasswordSchema schema, owned GnomeKeyring.OperationDoneCallback callback, ...);
 	[CCode (cheader_filename = "gnome-keyring.h")]
 	public static GnomeKeyring.Result delete_password_sync (GnomeKeyring.PasswordSchema schema, ...);
 	[CCode (cheader_filename = "gnome-keyring.h")]
 	public static GnomeKeyring.Result delete_sync (string keyring);
 	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void* find_items (GnomeKeyring.ItemType type, GnomeKeyring.AttributeList attributes, GnomeKeyring.OperationGetListCallback# callback);
+	public static void* find_items (GnomeKeyring.ItemType type, GnomeKeyring.AttributeList attributes, owned GnomeKeyring.OperationGetListCallback callback);
 	[CCode (cheader_filename = "gnome-keyring.h")]
 	public static GnomeKeyring.Result find_items_sync (GnomeKeyring.ItemType type, GnomeKeyring.AttributeList attributes, GLib.List found);
 	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void* find_itemsv (GnomeKeyring.ItemType type, GnomeKeyring.OperationGetListCallback# callback, ...);
+	public static void* find_itemsv (GnomeKeyring.ItemType type, owned GnomeKeyring.OperationGetListCallback callback, ...);
 	[CCode (cheader_filename = "gnome-keyring.h")]
 	public static GnomeKeyring.Result find_itemsv_sync (GnomeKeyring.ItemType type, GLib.List found, ...);
 	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void* find_network_password (string? user, string? domain, string? server, string? object, string? protocol, string? authtype, uint port, GnomeKeyring.OperationGetListCallback# callback);
+	public static void* find_network_password (string? user, string? domain, string? server, string? object, string? protocol, string? authtype, uint32 port, owned GnomeKeyring.OperationGetListCallback callback);
 	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static GnomeKeyring.Result find_network_password_sync (string? user, string? domain, string? server, string? object, string? protocol, string? authtype, uint port, GLib.List results);
+	public static GnomeKeyring.Result find_network_password_sync (string? user, string? domain, string? server, string? object, string? protocol, string? authtype, uint32 port, GLib.List results);
 	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void* find_password (GnomeKeyring.PasswordSchema schema, GnomeKeyring.OperationGetStringCallback# callback, ...);
+	public static void* find_password (GnomeKeyring.PasswordSchema schema, owned GnomeKeyring.OperationGetStringCallback callback, ...);
 	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static GnomeKeyring.Result find_password_sync (GnomeKeyring.PasswordSchema schema, out weak string password, ...);
+	public static GnomeKeyring.Result find_password_sync (GnomeKeyring.PasswordSchema schema, out unowned string password, ...);
 	[CCode (cheader_filename = "gnome-keyring.h")]
 	public static void free_password (string password);
 	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void* get_default_keyring (GnomeKeyring.OperationGetStringCallback# callback);
+	public static void* get_default_keyring (owned GnomeKeyring.OperationGetStringCallback callback);
 	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static GnomeKeyring.Result get_default_keyring_sync (out weak string keyring);
+	public static GnomeKeyring.Result get_default_keyring_sync (out unowned string keyring);
 	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void* get_info (string? keyring, GnomeKeyring.OperationGetKeyringInfoCallback# callback);
+	public static void* get_info (string? keyring, owned GnomeKeyring.OperationGetKeyringInfoCallback callback);
 	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static GnomeKeyring.Result get_info_sync (string? keyring, out weak GnomeKeyring.Info info);
+	public static GnomeKeyring.Result get_info_sync (string? keyring, out unowned GnomeKeyring.Info info);
 	[CCode (cheader_filename = "gnome-keyring.h")]
 	public static bool is_available ();
 	[CCode (cheader_filename = "gnome-keyring.h")]
 	public static GnomeKeyring.AccessType item_ac_get_access_type (GnomeKeyring.AccessControl ac);
 	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static weak string item_ac_get_display_name (GnomeKeyring.AccessControl ac);
+	public static unowned string item_ac_get_display_name (GnomeKeyring.AccessControl ac);
 	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static weak string item_ac_get_path_name (GnomeKeyring.AccessControl ac);
+	public static unowned string item_ac_get_path_name (GnomeKeyring.AccessControl ac);
 	[CCode (cheader_filename = "gnome-keyring.h")]
 	public static void item_ac_set_access_type (GnomeKeyring.AccessControl ac, GnomeKeyring.AccessType value);
 	[CCode (cheader_filename = "gnome-keyring.h")]
@@ -227,57 +226,57 @@
 	[CCode (cheader_filename = "gnome-keyring.h")]
 	public static void item_ac_set_path_name (GnomeKeyring.AccessControl ac, string value);
 	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void* item_create (string? keyring, GnomeKeyring.ItemType type, string display_name, GnomeKeyring.AttributeList attributes, string secret, bool update_if_exists, GnomeKeyring.OperationGetIntCallback# callback);
+	public static void* item_create (string? keyring, GnomeKeyring.ItemType type, string display_name, GnomeKeyring.AttributeList attributes, string secret, bool update_if_exists, owned GnomeKeyring.OperationGetIntCallback callback);
 	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static GnomeKeyring.Result item_create_sync (string? keyring, GnomeKeyring.ItemType type, string display_name, GnomeKeyring.AttributeList attributes, string secret, bool update_if_exists, uint item_id);
+	public static GnomeKeyring.Result item_create_sync (string? keyring, GnomeKeyring.ItemType type, string display_name, GnomeKeyring.AttributeList attributes, string secret, bool update_if_exists, uint32 item_id);
 	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void* item_delete (string? keyring, uint id, GnomeKeyring.OperationDoneCallback# callback);
+	public static void* item_delete (string? keyring, uint32 id, owned GnomeKeyring.OperationDoneCallback callback);
 	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static GnomeKeyring.Result item_delete_sync (string? keyring, uint id);
+	public static GnomeKeyring.Result item_delete_sync (string? keyring, uint32 id);
 	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void* item_get_acl (string? keyring, uint id, GnomeKeyring.OperationGetListCallback# callback);
+	public static void* item_get_acl (string? keyring, uint32 id, owned GnomeKeyring.OperationGetListCallback callback);
 	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static GnomeKeyring.Result item_get_acl_sync (string? keyring, uint id, GLib.List acl);
+	public static GnomeKeyring.Result item_get_acl_sync (string? keyring, uint32 id, GLib.List acl);
 	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void* item_get_attributes (string? keyring, uint id, GnomeKeyring.OperationGetAttributesCallback# callback);
+	public static void* item_get_attributes (string? keyring, uint32 id, owned GnomeKeyring.OperationGetAttributesCallback callback);
 	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static GnomeKeyring.Result item_get_attributes_sync (string? keyring, uint id, out weak GnomeKeyring.AttributeList attributes);
+	public static GnomeKeyring.Result item_get_attributes_sync (string? keyring, uint32 id, out unowned GnomeKeyring.AttributeList attributes);
 	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void* item_get_info (string? keyring, uint id, GnomeKeyring.OperationGetItemInfoCallback# callback);
+	public static void* item_get_info (string? keyring, uint32 id, owned GnomeKeyring.OperationGetItemInfoCallback callback);
 	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void* item_get_info_full (string? keyring, uint id, uint flags, GnomeKeyring.OperationGetItemInfoCallback# callback);
+	public static void* item_get_info_full (string? keyring, uint32 id, uint32 flags, owned GnomeKeyring.OperationGetItemInfoCallback callback);
 	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static GnomeKeyring.Result item_get_info_full_sync (string? keyring, uint id, uint flags, out weak GnomeKeyring.ItemInfo info);
+	public static GnomeKeyring.Result item_get_info_full_sync (string? keyring, uint32 id, uint32 flags, out unowned GnomeKeyring.ItemInfo info);
 	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static weak GnomeKeyring.Result? item_get_info_sync (string keyring, uint id, out weak GnomeKeyring.ItemInfo info);
+	public static unowned GnomeKeyring.Result? item_get_info_sync (string keyring, uint32 id, out unowned GnomeKeyring.ItemInfo info);
 	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void* item_grant_access_rights (string? keyring, string display_name, string full_path, uint id, GnomeKeyring.AccessType rights, GnomeKeyring.OperationDoneCallback# callback);
+	public static void* item_grant_access_rights (string? keyring, string display_name, string full_path, uint32 id, GnomeKeyring.AccessType rights, owned GnomeKeyring.OperationDoneCallback callback);
 	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static GnomeKeyring.Result item_grant_access_rights_sync (string? keyring, string display_name, string full_path, uint id, GnomeKeyring.AccessType rights);
+	public static GnomeKeyring.Result item_grant_access_rights_sync (string? keyring, string display_name, string full_path, uint32 id, GnomeKeyring.AccessType rights);
 	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void* item_set_acl (string? keyring, uint id, GLib.List acl, GnomeKeyring.OperationDoneCallback# callback);
+	public static void* item_set_acl (string? keyring, uint32 id, GLib.List acl, owned GnomeKeyring.OperationDoneCallback callback);
 	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static GnomeKeyring.Result item_set_acl_sync (string? keyring, uint id, GLib.List acl);
+	public static GnomeKeyring.Result item_set_acl_sync (string? keyring, uint32 id, GLib.List acl);
 	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void* item_set_attributes (string? keyring, uint id, GnomeKeyring.AttributeList attributes, GnomeKeyring.OperationDoneCallback# callback);
+	public static void* item_set_attributes (string? keyring, uint32 id, GnomeKeyring.AttributeList attributes, owned GnomeKeyring.OperationDoneCallback callback);
 	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static GnomeKeyring.Result item_set_attributes_sync (string? keyring, uint id, GnomeKeyring.AttributeList attributes);
+	public static GnomeKeyring.Result item_set_attributes_sync (string? keyring, uint32 id, GnomeKeyring.AttributeList attributes);
 	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void* item_set_info (string? keyring, uint id, GnomeKeyring.ItemInfo info, GnomeKeyring.OperationDoneCallback# callback);
+	public static void* item_set_info (string? keyring, uint32 id, GnomeKeyring.ItemInfo info, owned GnomeKeyring.OperationDoneCallback callback);
 	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static GnomeKeyring.Result item_set_info_sync (string? keyring, uint id, GnomeKeyring.ItemInfo info);
+	public static GnomeKeyring.Result item_set_info_sync (string? keyring, uint32 id, GnomeKeyring.ItemInfo info);
 	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void* list_item_ids (string? keyring, GnomeKeyring.OperationGetListCallback# callback);
+	public static void* list_item_ids (string? keyring, owned GnomeKeyring.OperationGetListCallback callback);
 	[CCode (cheader_filename = "gnome-keyring.h")]
 	public static GnomeKeyring.Result list_item_ids_sync (string? keyring, out GLib.List<uint> ids);
 	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void* list_keyring_names (GnomeKeyring.OperationGetListCallback# callback);
+	public static void* list_keyring_names (owned GnomeKeyring.OperationGetListCallback callback);
 	[CCode (cheader_filename = "gnome-keyring.h")]
 	public static GnomeKeyring.Result list_keyring_names_sync (GLib.List keyrings);
 	[CCode (cheader_filename = "gnome-keyring.h")]
 	public static void* @lock (string keyring, GnomeKeyring.OperationDoneCallback callback, void* data, GLib.DestroyNotify destroy_data);
 	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void* lock_all (GnomeKeyring.OperationDoneCallback# callback);
+	public static void* lock_all (owned GnomeKeyring.OperationDoneCallback callback);
 	[CCode (cheader_filename = "gnome-keyring.h")]
 	public static GnomeKeyring.Result lock_all_sync ();
 	[CCode (cheader_filename = "gnome-keyring.h")]
@@ -291,7 +290,7 @@
 	[CCode (cheader_filename = "gnome-keyring.h")]
 	public static void* memory_realloc (void* p, ulong sz);
 	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static weak string memory_strdup (string str);
+	public static unowned string memory_strdup (string str);
 	[CCode (cheader_filename = "gnome-keyring.h")]
 	public static void* memory_try_alloc (ulong sz);
 	[CCode (cheader_filename = "gnome-keyring.h")]
@@ -301,27 +300,27 @@
 	[CCode (cheader_filename = "gnome-keyring.h")]
 	public static void network_password_list_free (GLib.List list);
 	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static weak string result_to_message (GnomeKeyring.Result res);
+	public static unowned string result_to_message (GnomeKeyring.Result res);
 	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void* set_default_keyring (string keyring, GnomeKeyring.OperationDoneCallback# callback);
+	public static void* set_default_keyring (string keyring, owned GnomeKeyring.OperationDoneCallback callback);
 	[CCode (cheader_filename = "gnome-keyring.h")]
 	public static GnomeKeyring.Result set_default_keyring_sync (string keyring);
 	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void* set_info (string? keyring, GnomeKeyring.Info info, GnomeKeyring.OperationDoneCallback# callback);
+	public static void* set_info (string? keyring, GnomeKeyring.Info info, owned GnomeKeyring.OperationDoneCallback callback);
 	[CCode (cheader_filename = "gnome-keyring.h")]
 	public static GnomeKeyring.Result set_info_sync (string? keyring, GnomeKeyring.Info info);
 	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void* set_network_password (string? keyring, string? user, string? domain, string? server, string? object, string? protocol, string? authtype, uint port, string? password, GnomeKeyring.OperationGetIntCallback# callback);
+	public static void* set_network_password (string? keyring, string? user, string? domain, string? server, string? object, string? protocol, string? authtype, uint32 port, string? password, owned GnomeKeyring.OperationGetIntCallback callback);
 	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static GnomeKeyring.Result set_network_password_sync (string? keyring, string? user, string? domain, string? server, string? object, string? protocol, string? authtype, uint port, string? password, uint item_id);
+	public static GnomeKeyring.Result set_network_password_sync (string? keyring, string? user, string? domain, string? server, string? object, string? protocol, string? authtype, uint32 port, string? password, uint32 item_id);
 	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void* store_password (GnomeKeyring.PasswordSchema schema, string? keyring, string display_name, string password, GnomeKeyring.OperationDoneCallback# callback, ...);
+	public static void* store_password (GnomeKeyring.PasswordSchema schema, string? keyring, string display_name, string password, owned GnomeKeyring.OperationDoneCallback callback, ...);
 	[CCode (cheader_filename = "gnome-keyring.h")]
 	public static GnomeKeyring.Result store_password_sync (GnomeKeyring.PasswordSchema schema, string keyring, string display_name, string password, ...);
 	[CCode (cheader_filename = "gnome-keyring.h")]
 	public static void string_list_free (GLib.List strings);
 	[CCode (cheader_filename = "gnome-keyring.h")]
-	public static void* unlock (string? keyring, string? password, GnomeKeyring.OperationDoneCallback# callback);
+	public static void* unlock (string? keyring, string? password, owned GnomeKeyring.OperationDoneCallback callback);
 	[CCode (cheader_filename = "gnome-keyring.h")]
 	public static GnomeKeyring.Result unlock_sync (string? keyring, string? password);
 }

Modified: trunk/vapi/goocanvas.vapi
==============================================================================
--- trunk/vapi/goocanvas.vapi	(original)
+++ trunk/vapi/goocanvas.vapi	Wed Jan 14 22:44:41 2009
@@ -208,9 +208,9 @@
 		[NoAccessorMethod]
 		public Goo.CairoFillRule fill_rule { get; set; }
 		[NoAccessorMethod]
-		public string font { get; set; }
+		public string font { owned get; set; }
 		[NoAccessorMethod]
-		public Pango.FontDescription font_desc { get; set; }
+		public Pango.FontDescription font_desc { owned get; set; }
 		[NoAccessorMethod]
 		public Goo.CairoHintMetrics hint_metrics { get; set; }
 		[NoAccessorMethod]
@@ -276,9 +276,9 @@
 		[NoAccessorMethod]
 		public Goo.CairoFillRule fill_rule { get; set; }
 		[NoAccessorMethod]
-		public string font { get; set; }
+		public string font { owned get; set; }
 		[NoAccessorMethod]
-		public Pango.FontDescription font_desc { get; set; }
+		public Pango.FontDescription font_desc { owned get; set; }
 		[NoAccessorMethod]
 		public Goo.CairoHintMetrics hint_metrics { get; set; }
 		[NoAccessorMethod]
@@ -359,7 +359,7 @@
 		[NoAccessorMethod]
 		public bool end_arrow { get; set; }
 		[NoAccessorMethod]
-		public Goo.CanvasPoints points { get; set; }
+		public Goo.CanvasPoints points { owned get; set; }
 		[NoAccessorMethod]
 		public bool start_arrow { get; set; }
 	}
@@ -383,7 +383,7 @@
 		[NoAccessorMethod]
 		public bool end_arrow { get; set; }
 		[NoAccessorMethod]
-		public Goo.CanvasPoints points { get; set; }
+		public Goo.CanvasPoints points { owned get; set; }
 		[NoAccessorMethod]
 		public bool start_arrow { get; set; }
 	}
@@ -486,7 +486,7 @@
 		[NoAccessorMethod]
 		public Pango.EllipsizeMode ellipsize { get; set; }
 		[NoAccessorMethod]
-		public string text { get; set; }
+		public string text { owned get; set; }
 		[NoAccessorMethod]
 		public bool use_markup { get; set; }
 		[NoAccessorMethod]
@@ -510,7 +510,7 @@
 		[NoAccessorMethod]
 		public Pango.EllipsizeMode ellipsize { get; set; }
 		[NoAccessorMethod]
-		public string text { get; set; }
+		public string text { owned get; set; }
 		[NoAccessorMethod]
 		public bool use_markup { get; set; }
 		[NoAccessorMethod]
@@ -531,7 +531,7 @@
 		[NoAccessorMethod]
 		public double height { get; set; }
 		[NoAccessorMethod]
-		public Gtk.Widget widget { get; set; }
+		public Gtk.Widget widget { owned get; set; }
 		[NoAccessorMethod]
 		public double width { get; set; }
 		[NoAccessorMethod]

Modified: trunk/vapi/gstreamer-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-0.10.vapi	(original)
+++ trunk/vapi/gstreamer-0.10.vapi	Wed Jan 14 22:44:41 2009
@@ -827,7 +827,7 @@
 		[NoAccessorMethod]
 		public Gst.PadDirection direction { get; construct; }
 		[NoAccessorMethod]
-		public Gst.PadTemplate template { get; set; }
+		public Gst.PadTemplate template { owned get; set; }
 		public virtual signal bool have_data (Gst.MiniObject data);
 		public virtual signal void linked (Gst.Pad peer);
 		public virtual signal void request_link ();

Modified: trunk/vapi/gstreamer-check-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-check-0.10.vapi	(original)
+++ trunk/vapi/gstreamer-check-0.10.vapi	Wed Jan 14 22:44:41 2009
@@ -1,4 +1,4 @@
-/* gstreamer-check-0.10.vapi generated by lt-vapigen, do not modify. */
+/* gstreamer-check-0.10.vapi generated by vapigen, do not modify. */
 
 [CCode (cprefix = "Gst", lower_case_cprefix = "gst_")]
 namespace Gst {

Modified: trunk/vapi/gstreamer-fft-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-fft-0.10.vapi	(original)
+++ trunk/vapi/gstreamer-fft-0.10.vapi	Wed Jan 14 22:44:41 2009
@@ -1,4 +1,4 @@
-/* gstreamer-fft-0.10.vapi generated by lt-vapigen, do not modify. */
+/* gstreamer-fft-0.10.vapi generated by vapigen, do not modify. */
 
 [CCode (cprefix = "Gst", lower_case_cprefix = "gst_")]
 namespace Gst {

Modified: trunk/vapi/gstreamer-interfaces-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-interfaces-0.10.vapi	(original)
+++ trunk/vapi/gstreamer-interfaces-0.10.vapi	Wed Jan 14 22:44:41 2009
@@ -1,4 +1,4 @@
-/* gstreamer-interfaces-0.10.vapi generated by lt-vapigen, do not modify. */
+/* gstreamer-interfaces-0.10.vapi generated by vapigen, do not modify. */
 
 [CCode (cprefix = "Gst", lower_case_cprefix = "gst_")]
 namespace Gst {
@@ -19,7 +19,7 @@
 		[NoAccessorMethod]
 		public uint flags { get; }
 		[NoAccessorMethod]
-		public string label { get; }
+		public string label { owned get; }
 		[NoAccessorMethod]
 		public int max_volume { get; }
 		[NoAccessorMethod]
@@ -27,7 +27,7 @@
 		[NoAccessorMethod]
 		public int num_channels { get; }
 		[NoAccessorMethod]
-		public string untranslated_label { get; construct; }
+		public string untranslated_label { owned get; construct; }
 	}
 	[CCode (cheader_filename = "gst/interfaces/tunerchannel.h")]
 	public class TunerChannel : GLib.Object {

Modified: trunk/vapi/gstreamer-net-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-net-0.10.vapi	(original)
+++ trunk/vapi/gstreamer-net-0.10.vapi	Wed Jan 14 22:44:41 2009
@@ -1,4 +1,4 @@
-/* gstreamer-net-0.10.vapi generated by lt-vapigen, do not modify. */
+/* gstreamer-net-0.10.vapi generated by vapigen, do not modify. */
 
 [CCode (cprefix = "Gst", lower_case_cprefix = "gst_")]
 namespace Gst {
@@ -13,7 +13,7 @@
 		[CCode (type = "GstClock*", has_construct_function = false)]
 		public NetClientClock (string name, string remote_address, int remote_port, Gst.ClockTime base_time);
 		[NoAccessorMethod]
-		public string address { get; set; }
+		public string address { owned get; set; }
 		[NoAccessorMethod]
 		public int port { get; set; }
 	}
@@ -39,9 +39,9 @@
 		[NoAccessorMethod]
 		public bool active { get; set; }
 		[NoAccessorMethod]
-		public string address { get; set; }
+		public string address { owned get; set; }
 		[NoAccessorMethod]
-		public Gst.Clock clock { get; set; }
+		public Gst.Clock clock { owned get; set; }
 		[NoAccessorMethod]
 		public int port { get; set; }
 	}

Modified: trunk/vapi/gtk+-2.0.vapi
==============================================================================
--- trunk/vapi/gtk+-2.0.vapi	(original)
+++ trunk/vapi/gtk+-2.0.vapi	Wed Jan 14 22:44:41 2009
@@ -101,7 +101,7 @@
 		public void set_accel_closure (GLib.Closure accel_closure);
 		public void set_accel_widget (Gtk.Widget accel_widget);
 		[NoAccessorMethod]
-		public GLib.Closure accel_closure { get; set; }
+		public GLib.Closure accel_closure { owned get; set; }
 		public Gtk.Widget accel_widget { get; set; }
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
@@ -157,24 +157,24 @@
 		public void set_visible (bool visible);
 		public void unblock_activate_from (Gtk.Widget proxy);
 		[NoAccessorMethod]
-		public Gtk.ActionGroup action_group { get; set; }
+		public Gtk.ActionGroup action_group { owned get; set; }
 		[NoAccessorMethod]
 		public bool hide_if_empty { get; set; }
 		[NoAccessorMethod]
-		public string icon_name { get; set; }
+		public string icon_name { owned get; set; }
 		[NoAccessorMethod]
 		public bool is_important { get; set; }
 		[NoAccessorMethod]
-		public string label { get; set; }
+		public string label { owned get; set; }
 		[NoAccessorMethod]
 		public string name { get; construct; }
 		public bool sensitive { get; set; }
 		[NoAccessorMethod]
-		public string short_label { get; set; }
+		public string short_label { owned get; set; }
 		[NoAccessorMethod]
-		public string stock_id { get; set; }
+		public string stock_id { owned get; set; }
 		[NoAccessorMethod]
-		public string tooltip { get; set; }
+		public string tooltip { owned get; set; }
 		public bool visible { get; set; }
 		[NoAccessorMethod]
 		public bool visible_horizontal { get; set; }
@@ -624,7 +624,7 @@
 		[NoAccessorMethod]
 		public bool has_entry { get; set; }
 		[NoAccessorMethod]
-		public Gtk.TreeModel model { get; set; }
+		public Gtk.TreeModel model { owned get; set; }
 		[NoAccessorMethod]
 		public int text_column { get; set; }
 		public virtual signal void changed (string p0, Gtk.TreeIter p1);
@@ -636,17 +636,17 @@
 		[NoAccessorMethod]
 		public bool follow_state { get; set; }
 		[NoAccessorMethod]
-		public string icon_name { get; set; }
+		public string icon_name { owned get; set; }
 		[NoAccessorMethod]
-		public Gdk.Pixbuf pixbuf { get; set; }
+		public Gdk.Pixbuf pixbuf { owned get; set; }
 		[NoAccessorMethod]
-		public Gdk.Pixbuf pixbuf_expander_closed { get; set; }
+		public Gdk.Pixbuf pixbuf_expander_closed { owned get; set; }
 		[NoAccessorMethod]
-		public Gdk.Pixbuf pixbuf_expander_open { get; set; }
+		public Gdk.Pixbuf pixbuf_expander_open { owned get; set; }
 		[NoAccessorMethod]
-		public string stock_detail { get; set; }
+		public string stock_detail { owned get; set; }
 		[NoAccessorMethod]
-		public string stock_id { get; set; }
+		public string stock_id { owned get; set; }
 		[NoAccessorMethod]
 		public uint stock_size { get; set; }
 	}
@@ -659,7 +659,7 @@
 		[NoAccessorMethod]
 		public int pulse { get; set; }
 		[NoAccessorMethod]
-		public string text { get; set; }
+		public string text { owned get; set; }
 		[NoAccessorMethod]
 		public float text_xalign { get; set; }
 		[NoAccessorMethod]
@@ -672,7 +672,7 @@
 		[CCode (type = "GtkCellRenderer*", has_construct_function = false)]
 		public CellRendererSpin ();
 		[NoAccessorMethod]
-		public Gtk.Adjustment adjustment { get; set; }
+		public Gtk.Adjustment adjustment { owned get; set; }
 		[NoAccessorMethod]
 		public double climb_rate { get; set; }
 		[NoAccessorMethod]
@@ -693,7 +693,7 @@
 		[NoAccessorMethod]
 		public Pango.Alignment alignment { get; set; }
 		[NoAccessorMethod]
-		public Pango.AttrList attributes { get; set; }
+		public Pango.AttrList attributes { owned get; set; }
 		[NoAccessorMethod]
 		public string background { set; }
 		[NoAccessorMethod]
@@ -709,13 +709,13 @@
 		[NoAccessorMethod]
 		public bool ellipsize_set { get; set; }
 		[NoAccessorMethod]
-		public string family { get; set; }
+		public string family { owned get; set; }
 		[NoAccessorMethod]
 		public bool family_set { get; set; }
 		[NoAccessorMethod]
-		public string font { get; set; }
+		public string font { owned get; set; }
 		[NoAccessorMethod]
-		public Pango.FontDescription font_desc { get; set; }
+		public Pango.FontDescription font_desc { owned get; set; }
 		[NoAccessorMethod]
 		public string foreground { set; }
 		[NoAccessorMethod]
@@ -723,7 +723,7 @@
 		[NoAccessorMethod]
 		public bool foreground_set { get; set; }
 		[NoAccessorMethod]
-		public string language { get; set; }
+		public string language { owned get; set; }
 		[NoAccessorMethod]
 		public bool language_set { get; set; }
 		[NoAccessorMethod]
@@ -757,7 +757,7 @@
 		[NoAccessorMethod]
 		public bool style_set { get; set; }
 		[NoAccessorMethod]
-		public string text { get; set; }
+		public string text { owned get; set; }
 		[NoAccessorMethod]
 		public Pango.Underline underline { get; set; }
 		[NoAccessorMethod]
@@ -819,7 +819,7 @@
 		[NoAccessorMethod]
 		public bool background_set { get; set; }
 		[NoAccessorMethod]
-		public Gtk.TreeModel model { get; set; }
+		public Gtk.TreeModel model { owned get; set; }
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class CheckButton : Gtk.ToggleButton, Atk.Implementor, Gtk.Buildable {
@@ -984,7 +984,7 @@
 		public bool popup_shown { get; }
 		public int row_span_column { get; set; }
 		[NoAccessorMethod]
-		public string tearoff_title { get; set; }
+		public string tearoff_title { owned get; set; }
 		public int wrap_width { get; set; }
 		public virtual signal void changed ();
 		public virtual signal void move_active (Gtk.ScrollType p0);
@@ -1420,7 +1420,7 @@
 		public bool set_font_name (string fontname);
 		public void set_preview_text (string text);
 		[NoAccessorMethod]
-		public Gdk.Font font { get; }
+		public Gdk.Font font { owned get; }
 		public string font_name { get; set; }
 		public string preview_text { get; set; }
 	}
@@ -1809,7 +1809,7 @@
 		public void set_from_stock (string stock_id, Gtk.IconSize size);
 		public void set_pixel_size (int pixel_size);
 		[NoAccessorMethod]
-		public string file { get; set; }
+		public string file { owned get; set; }
 		[NoAccessorMethod]
 		public GLib.Icon gicon { get; set; }
 		[NoAccessorMethod]
@@ -1821,11 +1821,11 @@
 		[NoAccessorMethod]
 		public Gdk.Image image { get; set; }
 		[NoAccessorMethod]
-		public Gdk.Pixmap mask { get; set; }
+		public Gdk.Pixmap mask { owned get; set; }
 		[NoAccessorMethod]
 		public Gdk.Pixbuf pixbuf { get; set; }
 		[NoAccessorMethod]
-		public Gdk.PixbufAnimation pixbuf_animation { get; set; }
+		public Gdk.PixbufAnimation pixbuf_animation { owned get; set; }
 		public int pixel_size { get; set; }
 		[NoAccessorMethod]
 		public Gdk.Pixmap pixmap { get; set; }
@@ -2147,7 +2147,7 @@
 		public void set_title (string title);
 		public bool tearoff_state { get; set; }
 		[NoAccessorMethod]
-		public string tearoff_title { get; set; }
+		public string tearoff_title { owned get; set; }
 		public virtual signal void move_scroll (Gtk.ScrollType p0);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
@@ -2256,15 +2256,15 @@
 		[NoAccessorMethod]
 		public Gtk.ButtonsType buttons { construct; }
 		[NoAccessorMethod]
-		public Gtk.Widget image { get; set; }
+		public Gtk.Widget image { owned get; set; }
 		[NoAccessorMethod]
 		public Gtk.MessageType message_type { get; set construct; }
 		[NoAccessorMethod]
-		public string secondary_text { get; set; }
+		public string secondary_text { owned get; set; }
 		[NoAccessorMethod]
 		public bool secondary_use_markup { get; set; }
 		[NoAccessorMethod]
-		public string text { get; set; }
+		public string text { owned get; set; }
 		[NoAccessorMethod]
 		public bool use_markup { get; set; }
 	}
@@ -2578,12 +2578,12 @@
 		[NoAccessorMethod]
 		public int current_page { get; set; }
 		[NoAccessorMethod]
-		public string custom_tab_label { get; set; }
+		public string custom_tab_label { owned get; set; }
 		public Gtk.PageSetup default_page_setup { get; set; }
 		[NoAccessorMethod]
-		public string export_filename { get; set; }
+		public string export_filename { owned get; set; }
 		[NoAccessorMethod]
-		public string job_name { get; set; }
+		public string job_name { owned get; set; }
 		[NoAccessorMethod]
 		public int n_pages { get; set; }
 		public Gtk.PrintSettings print_settings { get; set; }
@@ -2707,7 +2707,7 @@
 		[NoAccessorMethod]
 		public uint activity_step { get; set; }
 		[NoAccessorMethod]
-		public Gtk.Adjustment adjustment { get; set; }
+		public Gtk.Adjustment adjustment { owned get; set; }
 		[NoAccessorMethod]
 		public Gtk.ProgressBarStyle bar_style { get; set; }
 		[NoAccessorMethod]
@@ -3012,7 +3012,7 @@
 		public bool remove_item (string uri) throws GLib.Error;
 		public void set_limit (int limit);
 		[NoAccessorMethod]
-		public string filename { get; construct; }
+		public string filename { owned get; construct; }
 		public int limit { get; set; }
 		[NoAccessorMethod]
 		public int size { get; }
@@ -3080,7 +3080,7 @@
 		public void set_value (double value);
 		public Gtk.Adjustment adjustment { get; set; }
 		[NoAccessorMethod]
-		public string[] icons { get; set; }
+		public string[] icons { owned get; set; }
 		[NoAccessorMethod]
 		public Gtk.IconSize size { get; set; }
 		public double value { get; set; }
@@ -3184,13 +3184,13 @@
 		public void set_property_value (string name, Gtk.SettingsValue svalue);
 		public void set_string_property (string name, string v_string, string origin);
 		[NoAccessorMethod]
-		public GLib.HashTable color_hash { get; }
+		public GLib.HashTable color_hash { owned get; }
 		[NoAccessorMethod]
 		public bool gtk_alternative_button_order { get; set; }
 		[NoAccessorMethod]
 		public bool gtk_alternative_sort_arrows { get; set; }
 		[NoAccessorMethod]
-		public string gtk_color_scheme { get; set; }
+		public string gtk_color_scheme { owned get; set; }
 		[NoAccessorMethod]
 		public bool gtk_cursor_blink { get; set; }
 		[NoAccessorMethod]
@@ -3198,7 +3198,7 @@
 		[NoAccessorMethod]
 		public int gtk_cursor_blink_timeout { get; set; }
 		[NoAccessorMethod]
-		public string gtk_cursor_theme_name { get; set; }
+		public string gtk_cursor_theme_name { owned get; set; }
 		[NoAccessorMethod]
 		public int gtk_cursor_theme_size { get; set; }
 		[NoAccessorMethod]
@@ -3216,33 +3216,33 @@
 		[NoAccessorMethod]
 		public bool gtk_error_bell { get; set; }
 		[NoAccessorMethod]
-		public string gtk_fallback_icon_theme { get; set; }
+		public string gtk_fallback_icon_theme { owned get; set; }
 		[NoAccessorMethod]
-		public string gtk_file_chooser_backend { get; set; }
+		public string gtk_file_chooser_backend { owned get; set; }
 		[NoAccessorMethod]
-		public string gtk_font_name { get; set; }
+		public string gtk_font_name { owned get; set; }
 		[NoAccessorMethod]
 		public int gtk_fontconfig_timestamp { get; set; }
 		[NoAccessorMethod]
-		public string gtk_icon_sizes { get; set; }
+		public string gtk_icon_sizes { owned get; set; }
 		[NoAccessorMethod]
-		public string gtk_icon_theme_name { get; set; }
+		public string gtk_icon_theme_name { owned get; set; }
 		[NoAccessorMethod]
-		public string gtk_im_module { get; set; }
+		public string gtk_im_module { owned get; set; }
 		[NoAccessorMethod]
-		public string gtk_key_theme_name { get; set; }
+		public string gtk_key_theme_name { owned get; set; }
 		[NoAccessorMethod]
 		public bool gtk_keynav_cursor_only { get; set; }
 		[NoAccessorMethod]
 		public bool gtk_keynav_wrap_around { get; set; }
 		[NoAccessorMethod]
-		public string gtk_menu_bar_accel { get; set; }
+		public string gtk_menu_bar_accel { owned get; set; }
 		[NoAccessorMethod]
-		public string gtk_modules { get; set; }
+		public string gtk_modules { owned get; set; }
 		[NoAccessorMethod]
-		public string gtk_print_backends { get; set; }
+		public string gtk_print_backends { owned get; set; }
 		[NoAccessorMethod]
-		public string gtk_print_preview_command { get; set; }
+		public string gtk_print_preview_command { owned get; set; }
 		[NoAccessorMethod]
 		public int gtk_recent_files_limit { get; set; }
 		[NoAccessorMethod]
@@ -3254,7 +3254,7 @@
 		[NoAccessorMethod]
 		public bool gtk_split_cursor { get; set; }
 		[NoAccessorMethod]
-		public string gtk_theme_name { get; set; }
+		public string gtk_theme_name { owned get; set; }
 		[NoAccessorMethod]
 		public int gtk_timeout_expand { get; set; }
 		[NoAccessorMethod]
@@ -3276,9 +3276,9 @@
 		[NoAccessorMethod]
 		public int gtk_xft_hinting { get; set; }
 		[NoAccessorMethod]
-		public string gtk_xft_hintstyle { get; set; }
+		public string gtk_xft_hintstyle { owned get; set; }
 		[NoAccessorMethod]
-		public string gtk_xft_rgba { get; set; }
+		public string gtk_xft_rgba { owned get; set; }
 	}
 	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
@@ -3875,7 +3875,7 @@
 		[NoAccessorMethod]
 		public bool background_set { get; set; }
 		[NoAccessorMethod]
-		public Gdk.Pixmap background_stipple { get; set; }
+		public Gdk.Pixmap background_stipple { owned get; set; }
 		[NoAccessorMethod]
 		public bool background_stipple_set { get; set; }
 		[NoAccessorMethod]
@@ -3885,13 +3885,13 @@
 		[NoAccessorMethod]
 		public bool editable_set { get; set; }
 		[NoAccessorMethod]
-		public string family { get; set; }
+		public string family { owned get; set; }
 		[NoAccessorMethod]
 		public bool family_set { get; set; }
 		[NoAccessorMethod]
-		public string font { get; set; }
+		public string font { owned get; set; }
 		[NoAccessorMethod]
-		public Pango.FontDescription font_desc { get; set; }
+		public Pango.FontDescription font_desc { owned get; set; }
 		[NoAccessorMethod]
 		public string foreground { set; }
 		[NoAccessorMethod]
@@ -3899,7 +3899,7 @@
 		[NoAccessorMethod]
 		public bool foreground_set { get; set; }
 		[NoAccessorMethod]
-		public Gdk.Pixmap foreground_stipple { get; set; }
+		public Gdk.Pixmap foreground_stipple { owned get; set; }
 		[NoAccessorMethod]
 		public bool foreground_stipple_set { get; set; }
 		[NoAccessorMethod]
@@ -3915,7 +3915,7 @@
 		[NoAccessorMethod]
 		public bool justification_set { get; set; }
 		[NoAccessorMethod]
-		public string language { get; set; }
+		public string language { owned get; set; }
 		[NoAccessorMethod]
 		public bool language_set { get; set; }
 		[NoAccessorMethod]
@@ -3923,7 +3923,7 @@
 		[NoAccessorMethod]
 		public bool left_margin_set { get; set; }
 		[NoAccessorMethod]
-		public string name { get; construct; }
+		public string name { owned get; construct; }
 		[NoAccessorMethod]
 		public string paragraph_background { set; }
 		[NoAccessorMethod]
@@ -3973,7 +3973,7 @@
 		[NoAccessorMethod]
 		public bool style_set { get; set; }
 		[NoAccessorMethod]
-		public Pango.TabArray tabs { get; set; }
+		public Pango.TabArray tabs { owned get; set; }
 		[NoAccessorMethod]
 		public bool tabs_set { get; set; }
 		[NoAccessorMethod]
@@ -4314,9 +4314,9 @@
 		public void set_visible_column (int column);
 		public void set_visible_func (owned Gtk.TreeModelFilterVisibleFunc func);
 		[NoAccessorMethod]
-		public Gtk.TreeModel child_model { get; construct; }
+		public Gtk.TreeModel child_model { owned get; construct; }
 		[NoAccessorMethod]
-		public Gtk.TreePath virtual_root { get; construct; }
+		public Gtk.TreePath virtual_root { owned get; construct; }
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class TreeModelSort : GLib.Object, Gtk.TreeModel, Gtk.TreeSortable, Gtk.TreeDragSource {

Modified: trunk/vapi/gtksourceview-2.0.vapi
==============================================================================
--- trunk/vapi/gtksourceview-2.0.vapi	(original)
+++ trunk/vapi/gtksourceview-2.0.vapi	Wed Jan 14 22:44:41 2009
@@ -1,4 +1,4 @@
-/* gtksourceview-2.0.vapi generated by lt-vapigen, do not modify. */
+/* gtksourceview-2.0.vapi generated by vapigen, do not modify. */
 
 [CCode (cprefix = "Gtk", lower_case_cprefix = "gtk_")]
 namespace Gtk {
@@ -6,17 +6,17 @@
 	public class SourceBuffer : Gtk.TextBuffer {
 		public bool backward_iter_to_source_mark (Gtk.TextIter iter, string category);
 		public void begin_not_undoable_action ();
-		public weak Gtk.SourceMark create_source_mark (string name, string category, Gtk.TextIter where);
+		public unowned Gtk.SourceMark create_source_mark (string name, string category, Gtk.TextIter where);
 		public void end_not_undoable_action ();
 		public void ensure_highlight (Gtk.TextIter start, Gtk.TextIter end);
 		public bool forward_iter_to_source_mark (Gtk.TextIter iter, string category);
 		public bool get_highlight_matching_brackets ();
 		public bool get_highlight_syntax ();
-		public weak Gtk.SourceLanguage get_language ();
+		public unowned Gtk.SourceLanguage get_language ();
 		public int get_max_undo_levels ();
-		public weak GLib.SList get_source_marks_at_iter (Gtk.TextIter iter, string category);
-		public weak GLib.SList get_source_marks_at_line (int line, string category);
-		public weak Gtk.SourceStyleScheme get_style_scheme ();
+		public unowned GLib.SList get_source_marks_at_iter (Gtk.TextIter iter, string category);
+		public unowned GLib.SList get_source_marks_at_line (int line, string category);
+		public unowned Gtk.SourceStyleScheme get_style_scheme ();
 		[CCode (has_construct_function = false)]
 		public SourceBuffer (Gtk.TextTagTable table);
 		public void redo ();
@@ -42,15 +42,15 @@
 	}
 	[CCode (cheader_filename = "gtksourceview/gtksourceview.h")]
 	public class SourceLanguage : GLib.Object {
-		public weak string get_globs ();
+		public unowned string get_globs ();
 		public bool get_hidden ();
-		public weak string get_id ();
-		public weak string get_metadata (string name);
-		public weak string get_mime_types ();
-		public weak string get_name ();
-		public weak string get_section ();
-		public weak string get_style_ids ();
-		public weak string get_style_name (string style_id);
+		public unowned string get_id ();
+		public unowned string get_metadata (string name);
+		public unowned string get_mime_types ();
+		public unowned string get_name ();
+		public unowned string get_section ();
+		public unowned string get_style_ids ();
+		public unowned string get_style_name (string style_id);
 		public bool hidden { get; }
 		public string id { get; }
 		public string name { get; }
@@ -58,10 +58,10 @@
 	}
 	[CCode (cheader_filename = "gtksourceview/gtksourcelanguagemanager.h")]
 	public class SourceLanguageManager : GLib.Object {
-		public static weak Gtk.SourceLanguageManager get_default ();
-		public weak Gtk.SourceLanguage get_language (string id);
-		public weak string get_language_ids ();
-		public weak string get_search_path ();
+		public static unowned Gtk.SourceLanguageManager get_default ();
+		public unowned Gtk.SourceLanguage get_language (string id);
+		public unowned string get_language_ids ();
+		public unowned string get_search_path ();
 		[CCode (has_construct_function = false)]
 		public SourceLanguageManager ();
 		public void set_search_path (string dirs);
@@ -70,11 +70,11 @@
 	}
 	[CCode (cheader_filename = "gtksourceview/gtksourceview.h")]
 	public class SourceMark : Gtk.TextMark {
-		public weak string get_category ();
+		public unowned string get_category ();
 		[CCode (has_construct_function = false)]
 		public SourceMark (string name, string category);
-		public weak Gtk.SourceMark next (string category);
-		public weak Gtk.SourceMark prev (string category);
+		public unowned Gtk.SourceMark next (string category);
+		public unowned Gtk.SourceMark prev (string category);
 		[NoAccessorMethod]
 		public string category { get; construct; }
 	}
@@ -83,14 +83,14 @@
 		public void draw_page (Gtk.PrintContext context, int page_nr);
 		[CCode (has_construct_function = false)]
 		public SourcePrintCompositor.from_view (Gtk.SourceView view);
-		public weak string get_body_font_name ();
+		public unowned string get_body_font_name ();
 		public double get_bottom_margin (Gtk.Unit unit);
-		public weak Gtk.SourceBuffer get_buffer ();
-		public weak string get_footer_font_name ();
-		public weak string get_header_font_name ();
+		public unowned Gtk.SourceBuffer get_buffer ();
+		public unowned string get_footer_font_name ();
+		public unowned string get_header_font_name ();
 		public bool get_highlight_syntax ();
 		public double get_left_margin (Gtk.Unit unit);
-		public weak string get_line_numbers_font_name ();
+		public unowned string get_line_numbers_font_name ();
 		public int get_n_pages ();
 		public double get_pagination_progress ();
 		public bool get_print_footer ();
@@ -135,9 +135,9 @@
 	}
 	[CCode (cheader_filename = "gtksourceview/gtksourceview.h")]
 	public class SourceStyle : GLib.Object {
-		public weak Gtk.SourceStyle copy ();
+		public unowned Gtk.SourceStyle copy ();
 		[NoAccessorMethod]
-		public string background { get; construct; }
+		public string background { owned get; construct; }
 		[NoAccessorMethod]
 		public bool background_set { get; construct; }
 		[NoAccessorMethod]
@@ -145,7 +145,7 @@
 		[NoAccessorMethod]
 		public bool bold_set { get; construct; }
 		[NoAccessorMethod]
-		public string foreground { get; construct; }
+		public string foreground { owned get; construct; }
 		[NoAccessorMethod]
 		public bool foreground_set { get; construct; }
 		[NoAccessorMethod]
@@ -153,7 +153,7 @@
 		[NoAccessorMethod]
 		public bool italic_set { get; construct; }
 		[NoAccessorMethod]
-		public string line_background { get; construct; }
+		public string line_background { owned get; construct; }
 		[NoAccessorMethod]
 		public bool line_background_set { get; construct; }
 		[NoAccessorMethod]
@@ -167,12 +167,12 @@
 	}
 	[CCode (cheader_filename = "gtksourceview/gtksourceview.h")]
 	public class SourceStyleScheme : GLib.Object {
-		public weak string get_authors ();
-		public weak string get_description ();
-		public weak string get_filename ();
-		public weak string get_id ();
-		public weak string get_name ();
-		public weak Gtk.SourceStyle get_style (string style_id);
+		public unowned string get_authors ();
+		public unowned string get_description ();
+		public unowned string get_filename ();
+		public unowned string get_id ();
+		public unowned string get_name ();
+		public unowned Gtk.SourceStyle get_style (string style_id);
 		public string description { get; }
 		public string filename { get; }
 		[NoAccessorMethod]
@@ -183,10 +183,10 @@
 	public class SourceStyleSchemeManager : GLib.Object {
 		public void append_search_path (string path);
 		public void force_rescan ();
-		public static weak Gtk.SourceStyleSchemeManager get_default ();
-		public weak Gtk.SourceStyleScheme get_scheme (string scheme_id);
-		public weak string get_scheme_ids ();
-		public weak string get_search_path ();
+		public static unowned Gtk.SourceStyleSchemeManager get_default ();
+		public unowned Gtk.SourceStyleScheme get_scheme (string scheme_id);
+		public unowned string get_scheme_ids ();
+		public unowned string get_search_path ();
 		[CCode (has_construct_function = false)]
 		public SourceStyleSchemeManager ();
 		public void prepend_search_path (string path);
@@ -201,7 +201,7 @@
 		public bool get_indent_on_tab ();
 		public int get_indent_width ();
 		public bool get_insert_spaces_instead_of_tabs ();
-		public weak Gdk.Pixbuf get_mark_category_pixbuf (string category);
+		public unowned Gdk.Pixbuf get_mark_category_pixbuf (string category);
 		public int get_mark_category_priority (string category);
 		public uint get_right_margin_position ();
 		public bool get_show_line_marks ();

Modified: trunk/vapi/hildon-1.vapi
==============================================================================
--- trunk/vapi/hildon-1.vapi	(original)
+++ trunk/vapi/hildon-1.vapi	Wed Jan 14 22:44:41 2009
@@ -18,7 +18,7 @@
 		[NoAccessorMethod]
 		public bool is_timed { get; construct; }
 		[NoAccessorMethod]
-		public Gtk.Window parent_window { get; construct; }
+		public Gtk.Window parent_window { owned get; construct; }
 		[NoAccessorMethod]
 		public uint timeout { get; construct; }
 	}
@@ -137,7 +137,7 @@
 		public void set_size_group (Gtk.SizeGroup new_group);
 		public void set_status (Hildon.CaptionStatus flag);
 		[NoAccessorMethod]
-		public Gtk.Widget icon { get; set; }
+		public Gtk.Widget icon { owned get; set; }
 		public Hildon.CaptionIconPosition icon_position { get; set; }
 		public string label { get; set; }
 		[NoAccessorMethod]
@@ -240,13 +240,13 @@
 		[NoAccessorMethod]
 		public int history_limit { get; set construct; }
 		[NoAccessorMethod]
-		public string label { get; set construct; }
+		public string label { owned get; set construct; }
 		[NoAccessorMethod]
-		public Gtk.ListStore list { get; set; }
+		public Gtk.ListStore list { owned get; set; }
 		[NoAccessorMethod]
 		public int max_characters { get; set construct; }
 		[NoAccessorMethod]
-		public string prefix { get; set; }
+		public string prefix { owned get; set; }
 		public virtual signal void close ();
 		public virtual signal bool history_append ();
 		public virtual signal void invalid_input ();
@@ -267,7 +267,7 @@
 		[NoAccessorMethod]
 		public bool color_set { get; set construct; }
 		[NoAccessorMethod]
-		public string family { get; set; }
+		public string family { owned get; set; }
 		[NoAccessorMethod]
 		public bool family_set { get; set construct; }
 		[NoAccessorMethod]
@@ -305,13 +305,13 @@
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public GetPasswordDialog.with_default (Gtk.Window parent, string password, bool get_old);
 		[NoAccessorMethod]
-		public string caption_label { get; set; }
+		public string caption_label { owned get; set; }
 		[NoAccessorMethod]
 		public bool get_old { get; construct; }
 		[NoAccessorMethod]
 		public int max_characters { get; set; }
 		[NoAccessorMethod]
-		public string message { get; set; }
+		public string message { owned get; set; }
 		[NoAccessorMethod]
 		public bool numbers_only { get; set; }
 		[NoAccessorMethod]
@@ -332,7 +332,7 @@
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public LoginDialog.with_default (Gtk.Window parent, string name, string password);
 		[NoAccessorMethod]
-		public string message { get; set; }
+		public string message { owned get; set; }
 		[NoAccessorMethod]
 		public string password { get; set; }
 		[NoAccessorMethod]
@@ -355,13 +355,13 @@
 		public void set_button_text (string text);
 		public void set_button_texts (string text_ok, string text_cancel);
 		[NoAccessorMethod]
-		public string description { get; set; }
+		public string description { owned get; set; }
 		[NoAccessorMethod]
-		public string icon { get; set; }
+		public string icon { owned get; set; }
 		[NoAccessorMethod]
-		public Gtk.ProgressBar progressbar { get; set; }
+		public Gtk.ProgressBar progressbar { owned get; set; }
 		[NoAccessorMethod]
-		public string stock_icon { get; set; }
+		public string stock_icon { owned get; set; }
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class NumberEditor : Gtk.Container, Atk.Implementor, Gtk.Buildable {
@@ -437,7 +437,7 @@
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public SetPasswordDialog.with_default (Gtk.Window parent, string password, bool modify_protection);
 		[NoAccessorMethod]
-		public string message { get; set; }
+		public string message { owned get; set; }
 		[NoAccessorMethod]
 		public bool modify_protection { get; construct; }
 		[NoAccessorMethod]
@@ -557,9 +557,9 @@
 		[NoAccessorMethod]
 		public bool autotitle { get; set; }
 		[NoAccessorMethod]
-		public string wizard_name { get; set; }
+		public string wizard_name { owned get; set; }
 		[NoAccessorMethod]
-		public Gtk.Notebook wizard_notebook { get; set; }
+		public Gtk.Notebook wizard_notebook { owned get; set; }
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public interface BreadCrumb : Gtk.Widget {

Modified: trunk/vapi/hildon-fm-2.vapi
==============================================================================
--- trunk/vapi/hildon-fm-2.vapi	(original)
+++ trunk/vapi/hildon-fm-2.vapi	Wed Jan 14 22:44:41 2009
@@ -1,15 +1,15 @@
-/* hildon-fm-2.vapi generated by lt-vapigen, do not modify. */
+/* hildon-fm-2.vapi generated by vapigen, do not modify. */
 
 [CCode (cprefix = "Hildon", lower_case_cprefix = "hildon_")]
 namespace Hildon {
 	[CCode (cheader_filename = "hildon/hildon-file-chooser-dialog.h")]
 	public class FileChooserDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable, Gtk.FileChooser {
-		public weak Gtk.Widget add_extensions_combo (out weak string extensions, out weak string ext_names);
+		public unowned Gtk.Widget add_extensions_combo (out unowned string extensions, out unowned string ext_names);
 		public void add_extra (Gtk.Widget widget);
 		public void focus_to_input ();
-		public weak string get_extension ();
-		public weak string get_safe_folder ();
-		public weak string get_safe_folder_uri ();
+		public unowned string get_extension ();
+		public unowned string get_safe_folder ();
+		public unowned string get_safe_folder_uri ();
 		public bool get_show_upnp ();
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public FileChooserDialog (Gtk.Window parent, Gtk.FileChooserAction action);
@@ -22,17 +22,17 @@
 		[NoAccessorMethod]
 		public bool autonaming { get; set; }
 		[NoAccessorMethod]
-		public string empty_text { get; set; }
+		public string empty_text { owned get; set; }
 		[NoAccessorMethod]
-		public Hildon.FileSystemModel file_system_model { get; construct; }
+		public Hildon.FileSystemModel file_system_model { owned get; construct; }
 		[NoAccessorMethod]
 		public int max_full_path_length { get; set construct; }
 		[NoAccessorMethod]
 		public int max_name_length { get; set construct; }
 		[NoAccessorMethod]
-		public string open_button_text { get; set; }
+		public string open_button_text { owned get; set; }
 		[NoAccessorMethod]
-		public string save_multiple { get; set; }
+		public string save_multiple { owned get; set; }
 		[NoAccessorMethod]
 		public int selection_mode { get; set; }
 		[NoAccessorMethod]
@@ -49,13 +49,13 @@
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public FileDetailsDialog.with_model (Gtk.Window parent, Hildon.FileSystemModel model);
 		[NoAccessorMethod]
-		public Gtk.Widget additional_tab { get; set construct; }
+		public Gtk.Widget additional_tab { owned get; set construct; }
 		[NoAccessorMethod]
-		public string additional_tab_label { get; set; }
+		public string additional_tab_label { owned get; set; }
 		[NoAccessorMethod]
 		public bool enable_read_only_checkbox { get; set construct; }
 		[NoAccessorMethod]
-		public Hildon.FileSystemModel model { get; set; }
+		public Hildon.FileSystemModel model { owned get; set; }
 		[NoAccessorMethod]
 		public bool show_tabs { get; set construct; }
 		[NoAccessorMethod]
@@ -71,12 +71,12 @@
 		public bool get_column_headers_visible ();
 		public bool get_current_content_iter (Gtk.TreeIter iter);
 		public bool get_current_folder_iter (Gtk.TreeIter iter);
-		public weak string get_current_folder_uri ();
-		public weak Gtk.FileFilter get_filter ();
+		public unowned string get_current_folder_uri ();
+		public unowned Gtk.FileFilter get_filter ();
 		public Hildon.FileSelectionMode get_mode ();
 		public bool get_select_multiple ();
-		public weak GLib.SList get_selected_paths ();
-		public weak GLib.SList get_selected_uris ();
+		public unowned GLib.SList get_selected_paths ();
+		public unowned GLib.SList get_selected_uris ();
 		public void get_sort_key (Hildon.FileSelectionSortKey key, Gtk.SortType order);
 		public void hide_content_pane ();
 		public void move_cursor_to_uri (string uri);
@@ -99,11 +99,11 @@
 		[NoAccessorMethod]
 		public bool drag_enabled { get; construct; }
 		[NoAccessorMethod]
-		public string empty_text { get; set; }
+		public string empty_text { owned get; set; }
 		[NoAccessorMethod]
 		public bool local_only { get; set; }
 		[NoAccessorMethod]
-		public Hildon.FileSystemModel model { get; construct; }
+		public Hildon.FileSystemModel model { owned get; construct; }
 		[NoAccessorMethod]
 		public int pane_position { get; set construct; }
 		[NoAccessorMethod]
@@ -126,10 +126,10 @@
 	[CCode (cheader_filename = "hildon/hildon-file-system-info.h")]
 	public class FileSystemInfo {
 		public static void async_cancel (Hildon.FileSystemInfoHandle handle);
-		public static weak Hildon.FileSystemInfoHandle async_new (string uri, Hildon.FileSystemInfoCallback callback);
-		public weak string get_display_name ();
-		public weak Gdk.Pixbuf get_icon (Gtk.Widget ref_widget);
-		public weak Gdk.Pixbuf get_icon_at_size (Gtk.Widget ref_widget, int size);
+		public static unowned Hildon.FileSystemInfoHandle async_new (string uri, Hildon.FileSystemInfoCallback callback);
+		public unowned string get_display_name ();
+		public unowned Gdk.Pixbuf get_icon (Gtk.Widget ref_widget);
+		public unowned Gdk.Pixbuf get_icon_at_size (Gtk.Widget ref_widget, int size);
 		[CCode (has_construct_function = false)]
 		public FileSystemInfo (string uri) throws GLib.Error;
 	}
@@ -139,7 +139,7 @@
 	}
 	[CCode (cheader_filename = "hildon/hildon-file-system-model.h")]
 	public class FileSystemModel : GLib.Object, Gtk.TreeModel, Gtk.TreeDragSource {
-		public weak string autoname_uri (string uri) throws GLib.Error;
+		public unowned string autoname_uri (string uri) throws GLib.Error;
 		[CCode (type = "gchar*", has_construct_function = false)]
 		public FileSystemModel.item (Hildon.FileSystemModel model, Gtk.TreeIter parent, string stub_name, string extension);
 		public void iter_available (Gtk.TreeIter iter, bool available);
@@ -149,15 +149,15 @@
 		public bool search_local_path (string path, Gtk.TreeIter iter, Gtk.TreeIter start_iter, bool recursive);
 		public bool search_uri (string uri, Gtk.TreeIter iter, Gtk.TreeIter start_iter, bool recursive);
 		[NoAccessorMethod]
-		public string backend { get; construct; }
+		public string backend { owned get; construct; }
 		[NoAccessorMethod]
 		public void* backend_object { get; construct; }
 		[NoAccessorMethod]
 		public bool multi_root { get; construct; }
 		[NoAccessorMethod]
-		public Gtk.Widget ref_widget { get; set; }
+		public Gtk.Widget ref_widget { owned get; set; }
 		[NoAccessorMethod]
-		public string root_dir { get; construct; }
+		public string root_dir { owned get; construct; }
 		[NoAccessorMethod]
 		public void* thumbnail_callback { get; set; }
 		public virtual signal void device_disconnected (Gtk.TreeIter iter);

Modified: trunk/vapi/json-glib-1.0.vapi
==============================================================================
--- trunk/vapi/json-glib-1.0.vapi	(original)
+++ trunk/vapi/json-glib-1.0.vapi	Wed Jan 14 22:44:41 2009
@@ -1,18 +1,18 @@
-/* json-glib-1.0.vapi generated by lt-vapigen, do not modify. */
+/* json-glib-1.0.vapi generated by vapigen, do not modify. */
 
 [CCode (cprefix = "Json", lower_case_cprefix = "json_")]
 namespace Json {
 	[Compact]
 	[CCode (ref_function = "json_array_ref", unref_function = "json_array_unref", cheader_filename = "json-glib/json-glib.h")]
 	public class Array {
-		public void add_element (Json.Node# node);
-		public weak Json.Node get_element (uint index_);
+		public void add_element (owned Json.Node node);
+		public unowned Json.Node get_element (uint index_);
 		public GLib.List<weak Json.Node> get_elements ();
 		public uint get_length ();
 		[CCode (has_construct_function = false)]
 		public Array ();
 		public void remove_element (uint index_);
-		public static weak Json.Array sized_new (uint n_elements);
+		public static unowned Json.Array sized_new (uint n_elements);
 	}
 	[CCode (cheader_filename = "json-glib/json-glib.h")]
 	public class Generator : GLib.Object {
@@ -26,7 +26,7 @@
 		[NoAccessorMethod]
 		public bool pretty { get; set; }
 		[NoAccessorMethod]
-		public Json.Node root { get; set; }
+		public Json.Node root { owned get; set; }
 	}
 	[Compact]
 	[CCode (copy_function = "json_node_copy", cheader_filename = "json-glib/json-glib.h")]
@@ -38,13 +38,13 @@
 		public Json.Array dup_array ();
 		public Json.Object dup_object ();
 		public string dup_string ();
-		public weak Json.Array get_array ();
+		public unowned Json.Array get_array ();
 		public bool get_boolean ();
 		public double get_double ();
 		public int get_int ();
-		public weak Json.Object get_object ();
-		public weak Json.Node get_parent ();
-		public weak string get_string ();
+		public unowned Json.Object get_object ();
+		public unowned Json.Node get_parent ();
+		public unowned string get_string ();
 		public void get_value (GLib.Value value);
 		public GLib.Type get_value_type ();
 		[CCode (has_construct_function = false)]
@@ -56,15 +56,15 @@
 		public void set_object (Json.Object object);
 		public void set_string (string value);
 		public void set_value (GLib.Value value);
-		public void take_array (Json.Array# array);
-		public void take_object (Json.Object# object);
-		public weak string type_name ();
+		public void take_array (owned Json.Array array);
+		public void take_object (owned Json.Object object);
+		public unowned string type_name ();
 	}
 	[Compact]
 	[CCode (ref_function = "json_object_ref", unref_function = "json_object_unref", cheader_filename = "json-glib/json-glib.h")]
 	public class Object {
-		public void add_member (string member_name, Json.Node# node);
-		public weak Json.Node get_member (string member_name);
+		public void add_member (string member_name, owned Json.Node node);
+		public unowned Json.Node get_member (string member_name);
 		public GLib.List<weak string> get_members ();
 		public uint get_size ();
 		public GLib.List<weak Json.Node> get_values ();
@@ -78,8 +78,8 @@
 		public static GLib.Quark error_quark ();
 		public uint get_current_line ();
 		public uint get_current_pos ();
-		public weak Json.Node get_root ();
-		public bool has_assignment (out weak string variable_name);
+		public unowned Json.Node get_root ();
+		public bool has_assignment (out unowned string variable_name);
 		public bool load_from_data (string data, size_t length) throws GLib.Error;
 		public bool load_from_file (string filename) throws GLib.Error;
 		[CCode (has_construct_function = false)]

Modified: trunk/vapi/libglade-2.0.vapi
==============================================================================
--- trunk/vapi/libglade-2.0.vapi	(original)
+++ trunk/vapi/libglade-2.0.vapi	Wed Jan 14 22:44:41 2009
@@ -1,4 +1,4 @@
-/* libglade-2.0.vapi generated by lt-vapigen, do not modify. */
+/* libglade-2.0.vapi generated by vapigen, do not modify. */
 
 [CCode (cprefix = "Glade", lower_case_cprefix = "glade_")]
 namespace Glade {
@@ -78,21 +78,21 @@
 	[CCode (cheader_filename = "glade/glade.h")]
 	public class XML : GLib.Object {
 		public weak string filename;
-		public weak Gtk.Widget build_widget (Glade.WidgetInfo info);
+		public unowned Gtk.Widget build_widget (Glade.WidgetInfo info);
 		public bool @construct (string fname, string? root, string? domain);
 		public bool construct_from_buffer (string buffer, int size, string root, string domain);
-		public weak Gtk.AccelGroup ensure_accel ();
+		public unowned Gtk.AccelGroup ensure_accel ();
 		[CCode (has_construct_function = false)]
 		public XML.from_buffer (string buffer, int size, string? root, string? domain);
-		public weak Gtk.Widget get_widget (string name);
-		public weak GLib.List get_widget_prefix (string name);
+		public unowned Gtk.Widget get_widget (string name);
+		public unowned GLib.List get_widget_prefix (string name);
 		public void handle_internal_child (Gtk.Widget parent, Glade.ChildInfo child_info);
 		public void handle_widget_prop (Gtk.Widget widget, string prop_name, string value_name);
 		[NoWrapper]
 		public virtual GLib.Type lookup_type (string gtypename);
 		[CCode (has_construct_function = false)]
 		public XML (string fname, string? root, string? domain);
-		public weak string relative_file (string filename);
+		public unowned string relative_file (string filename);
 		public void set_common_params (Gtk.Widget widget, Glade.WidgetInfo info);
 		public void set_packing_property (Gtk.Widget parent, Gtk.Widget child, string name, string value);
 		public void set_toplevel (Gtk.Window window);
@@ -108,13 +108,13 @@
 	[CCode (cheader_filename = "glade/glade.h")]
 	public static delegate void BuildChildrenFunc (Glade.XML xml, Gtk.Widget parent, Glade.WidgetInfo info);
 	[CCode (cheader_filename = "glade/glade.h")]
-	public static delegate weak Gtk.Widget FindInternalChildFunc (Glade.XML xml, Gtk.Widget parent, string childname);
+	public static delegate unowned Gtk.Widget FindInternalChildFunc (Glade.XML xml, Gtk.Widget parent, string childname);
 	[CCode (cheader_filename = "glade/glade.h")]
-	public static delegate weak Gtk.Widget NewFunc (Glade.XML xml, GLib.Type widget_type, Glade.WidgetInfo info);
+	public static delegate unowned Gtk.Widget NewFunc (Glade.XML xml, GLib.Type widget_type, Glade.WidgetInfo info);
 	[CCode (cheader_filename = "glade/glade.h")]
 	public delegate void XMLConnectFunc (string handler_name, GLib.Object object, string signal_name, string signal_data, GLib.Object connect_object, bool after);
 	[CCode (cheader_filename = "glade/glade.h")]
-	public delegate weak Gtk.Widget XMLCustomWidgetHandler (Glade.XML xml, string func_name, string name, string string1, string string2, int int1, int int2);
+	public delegate unowned Gtk.Widget XMLCustomWidgetHandler (Glade.XML xml, string func_name, string name, string string1, string string2, int int1, int int2);
 	[CCode (cheader_filename = "glade/glade.h")]
 	public const int MODULE_API_VERSION;
 	[CCode (cheader_filename = "glade/glade.h")]
@@ -122,19 +122,19 @@
 	[CCode (cheader_filename = "glade/glade.h")]
 	public static uint flags_from_string (GLib.Type type, string str);
 	[CCode (cheader_filename = "glade/glade.h")]
-	public static weak string get_widget_name (Gtk.Widget widget);
+	public static unowned string get_widget_name (Gtk.Widget widget);
 	[CCode (cheader_filename = "glade/glade.h")]
-	public static weak Glade.XML get_widget_tree (Gtk.Widget widget);
+	public static unowned Glade.XML get_widget_tree (Gtk.Widget widget);
 	[CCode (cheader_filename = "glade/glade.h")]
 	public static void init ();
 	[CCode (cheader_filename = "glade/glade.h")]
-	public static weak string module_check_version (int version);
+	public static unowned string module_check_version (int version);
 	[CCode (cheader_filename = "glade/glade.h")]
 	public static void module_register_widgets ();
 	[CCode (cheader_filename = "glade/glade.h")]
-	public static weak Glade.Interface parser_parse_buffer (string buffer, int len, string domain);
+	public static unowned Glade.Interface parser_parse_buffer (string buffer, int len, string domain);
 	[CCode (cheader_filename = "glade/glade.h")]
-	public static weak Glade.Interface parser_parse_file (string file, string domain);
+	public static unowned Glade.Interface parser_parse_file (string file, string domain);
 	[CCode (cheader_filename = "glade/glade.h")]
 	public static void provide (string library);
 	[CCode (cheader_filename = "glade/glade.h")]
@@ -148,5 +148,5 @@
 	[CCode (cheader_filename = "glade/glade.h")]
 	public static void standard_build_children (Glade.XML self, Gtk.Widget parent, Glade.WidgetInfo info);
 	[CCode (cheader_filename = "glade/glade.h")]
-	public static weak Gtk.Widget standard_build_widget (Glade.XML xml, GLib.Type widget_type, Glade.WidgetInfo info);
+	public static unowned Gtk.Widget standard_build_widget (Glade.XML xml, GLib.Type widget_type, Glade.WidgetInfo info);
 }

Modified: trunk/vapi/libgnome-2.0.vapi
==============================================================================
--- trunk/vapi/libgnome-2.0.vapi	(original)
+++ trunk/vapi/libgnome-2.0.vapi	Wed Jan 14 22:44:41 2009
@@ -1,4 +1,4 @@
-/* libgnome-2.0.vapi generated by lt-vapigen, do not modify. */
+/* libgnome-2.0.vapi generated by vapigen, do not modify. */
 
 [CCode (cprefix = "Gnome", lower_case_cprefix = "gnome_")]
 namespace Gnome {
@@ -25,44 +25,44 @@
 	}
 	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public class Program : GLib.Object {
-		public static weak Gnome.Program get ();
-		public weak string get_app_id ();
-		public weak string get_app_version ();
-		public weak string get_human_readable_name ();
-		public static weak Gnome.Program init (string app_id, string app_version, Gnome.ModuleInfo module_info, [CCode (array_length_pos = 3.9)] string[] argv, ...);
-		public static weak Gnome.Program init_paramv (GLib.Type type, string app_id, string app_version, Gnome.ModuleInfo module_info, [CCode (array_length_pos = 4.9)] string[] argv, uint nparams, GLib.Parameter params);
-		public static weak Gnome.Program initv (GLib.Type type, string app_id, string app_version, Gnome.ModuleInfo module_info, [CCode (array_length_pos = 4.9)] string[] argv, string first_property_name, void* args);
+		public static unowned Gnome.Program get ();
+		public unowned string get_app_id ();
+		public unowned string get_app_version ();
+		public unowned string get_human_readable_name ();
+		public static unowned Gnome.Program init (string app_id, string app_version, Gnome.ModuleInfo module_info, [CCode (array_length_pos = 3.9)] string[] argv, ...);
+		public static unowned Gnome.Program init_paramv (GLib.Type type, string app_id, string app_version, Gnome.ModuleInfo module_info, [CCode (array_length_pos = 4.9)] string[] argv, uint nparams, GLib.Parameter params);
+		public static unowned Gnome.Program initv (GLib.Type type, string app_id, string app_version, Gnome.ModuleInfo module_info, [CCode (array_length_pos = 4.9)] string[] argv, string first_property_name, void* args);
 		public class uint install_property (GLib.ObjectGetPropertyFunc get_fn, GLib.ObjectSetPropertyFunc set_fn, GLib.ParamSpec pspec);
-		public weak string locate_file (Gnome.FileDomain domain, string file_name, bool only_if_exists, GLib.SList ret_locations);
-		public static weak Gnome.ModuleInfo module_load (string mod_name);
+		public unowned string locate_file (Gnome.FileDomain domain, string file_name, bool only_if_exists, GLib.SList ret_locations);
+		public static unowned Gnome.ModuleInfo module_load (string mod_name);
 		public static void module_register (Gnome.ModuleInfo module_info);
 		public static bool module_registered (Gnome.ModuleInfo module_info);
 		[NoAccessorMethod]
-		public string app_datadir { get; set; }
+		public string app_datadir { owned get; set; }
 		public string app_id { get; }
 		[NoAccessorMethod]
-		public string app_libdir { get; set; }
+		public string app_libdir { owned get; set; }
 		[NoAccessorMethod]
-		public string app_prefix { get; set; }
+		public string app_prefix { owned get; set; }
 		[NoAccessorMethod]
-		public string app_sysconfdir { get; set; }
+		public string app_sysconfdir { owned get; set; }
 		public string app_version { get; }
 		[NoAccessorMethod]
 		public bool create_directories { get; construct; }
 		[NoAccessorMethod]
 		public bool enable_sound { get; set; }
 		[NoAccessorMethod]
-		public string espeaker { get; set; }
+		public string espeaker { owned get; set; }
 		[NoAccessorMethod]
-		public string gnome_datadir { get; construct; }
+		public string gnome_datadir { owned get; construct; }
 		[NoAccessorMethod]
-		public string gnome_libdir { get; construct; }
+		public string gnome_libdir { owned get; construct; }
 		[NoAccessorMethod]
-		public string gnome_path { get; construct; }
+		public string gnome_path { owned get; construct; }
 		[NoAccessorMethod]
-		public string gnome_prefix { get; construct; }
+		public string gnome_prefix { owned get; construct; }
 		[NoAccessorMethod]
-		public string gnome_sysconfdir { get; construct; }
+		public string gnome_sysconfdir { owned get; construct; }
 		[NoAccessorMethod]
 		public void* goption_context { get; construct; }
 		[NoAccessorMethod]
@@ -122,7 +122,7 @@
 	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public static delegate void ModuleClassInitHook (void* klass, Gnome.ModuleInfo mod_info);
 	[CCode (cheader_filename = "libgnome/libgnome.h")]
-	public static delegate weak GLib.OptionGroup ModuleGetGOptionGroupFunc ();
+	public static delegate unowned GLib.OptionGroup ModuleGetGOptionGroupFunc ();
 	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public static delegate void ModuleHook (Gnome.Program program, Gnome.ModuleInfo mod_info);
 	[CCode (cheader_filename = "libgnome/libgnome.h")]
@@ -172,7 +172,7 @@
 	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public const string PARAM_POPT_TABLE;
 	[CCode (cheader_filename = "libgnome/libgnome.h")]
-	public static weak Gnome.ModuleInfo bonobo_module_info_get ();
+	public static unowned Gnome.ModuleInfo bonobo_module_info_get ();
 	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public static void clearenv ();
 	[CCode (cheader_filename = "libgnome/libgnome.h")]
@@ -192,31 +192,31 @@
 	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public static int execute_terminal_shell_fds (string dir, string commandline, bool close_fds);
 	[CCode (cname = "g_extension_pointer", cheader_filename = "libgnome/libgnome.h")]
-	public static weak string g_extension_pointer (string path);
+	public static unowned string g_extension_pointer (string path);
 	[CCode (cheader_filename = "libgnome/libgnome.h")]
-	public static weak string gconf_get_app_settings_relative (Gnome.Program program, string subkey);
+	public static unowned string gconf_get_app_settings_relative (Gnome.Program program, string subkey);
 	[CCode (cheader_filename = "libgnome/libgnome.h")]
-	public static weak string gconf_get_gnome_libs_settings_relative (string subkey);
+	public static unowned string gconf_get_gnome_libs_settings_relative (string subkey);
 	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public static bool help_display (string file_name, string link_id) throws GLib.Error;
 	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public static bool help_display_desktop (Gnome.Program program, string doc_id, string file_name, string link_id) throws GLib.Error;
 	[CCode (cheader_filename = "libgnome/libgnome.h")]
-	public static bool help_display_desktop_with_env (Gnome.Program program, string doc_id, string file_name, string link_id, out weak string envp) throws GLib.Error;
+	public static bool help_display_desktop_with_env (Gnome.Program program, string doc_id, string file_name, string link_id, out unowned string envp) throws GLib.Error;
 	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public static bool help_display_uri (string help_uri) throws GLib.Error;
 	[CCode (cheader_filename = "libgnome/libgnome.h")]
-	public static bool help_display_uri_with_env (string help_uri, out weak string envp) throws GLib.Error;
+	public static bool help_display_uri_with_env (string help_uri, out unowned string envp) throws GLib.Error;
 	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public static bool help_display_with_doc_id (Gnome.Program program, string doc_id, string file_name, string link_id) throws GLib.Error;
 	[CCode (cheader_filename = "libgnome/libgnome.h")]
-	public static bool help_display_with_doc_id_and_env (Gnome.Program program, string doc_id, string file_name, string link_id, out weak string envp) throws GLib.Error;
+	public static bool help_display_with_doc_id_and_env (Gnome.Program program, string doc_id, string file_name, string link_id, out unowned string envp) throws GLib.Error;
 	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public static GLib.Quark help_error_quark ();
 	[CCode (cname = "libgnome_module_info_get", cheader_filename = "libgnome/libgnome.h")]
-	public static weak Gnome.ModuleInfo libgnome_module_info_get ();
+	public static unowned Gnome.ModuleInfo libgnome_module_info_get ();
 	[CCode (cheader_filename = "libgnome/libgnome.h")]
-	public static void prepend_terminal_to_vector (int argc, out weak string argv);
+	public static void prepend_terminal_to_vector (int argc, out unowned string argv);
 	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public static int setenv (string name, string value, bool overwrite);
 	[CCode (cheader_filename = "libgnome/libgnome.h")]
@@ -244,13 +244,13 @@
 	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public static bool url_show (string url) throws GLib.Error;
 	[CCode (cheader_filename = "libgnome/libgnome.h")]
-	public static bool url_show_with_env (string url, out weak string envp) throws GLib.Error;
+	public static bool url_show_with_env (string url, out unowned string envp) throws GLib.Error;
 	[CCode (cheader_filename = "libgnome/libgnome.h")]
-	public static weak string user_accels_dir_get ();
+	public static unowned string user_accels_dir_get ();
 	[CCode (cheader_filename = "libgnome/libgnome.h")]
-	public static weak string user_dir_get ();
+	public static unowned string user_dir_get ();
 	[CCode (cheader_filename = "libgnome/libgnome.h")]
-	public static weak string user_private_dir_get ();
+	public static unowned string user_private_dir_get ();
 	[CCode (cheader_filename = "libgnome/libgnome.h")]
-	public static weak string util_user_shell ();
+	public static unowned string util_user_shell ();
 }

Modified: trunk/vapi/libgnome-menu.vapi
==============================================================================
--- trunk/vapi/libgnome-menu.vapi	(original)
+++ trunk/vapi/libgnome-menu.vapi	Wed Jan 14 22:44:41 2009
@@ -1,4 +1,4 @@
-/* libgnome-menu.vapi generated by lt-vapigen, do not modify. */
+/* libgnome-menu.vapi generated by vapigen, do not modify. */
 
 [CCode (cprefix = "GMenu", lower_case_cprefix = "gmenu_")]
 namespace GMenu {
@@ -6,58 +6,57 @@
 	[CCode (ref_function = "gmenu_tree_ref", unref_function = "gmenu_tree_unref", cheader_filename = "gnome-menus/gmenu-tree.h")]
 	public class Tree {
 		public void add_monitor (GMenu.TreeChangedFunc callback);
-		public weak GMenu.TreeDirectory get_directory_from_path (string path);
-		public weak string get_menu_file ();
-		public weak GMenu.TreeDirectory get_root_directory ();
+		public unowned GMenu.TreeDirectory get_directory_from_path (string path);
+		public unowned string get_menu_file ();
+		public unowned GMenu.TreeDirectory get_root_directory ();
 		public void* get_user_data ();
-		public static weak GMenu.Tree lookup (string menu_file, GMenu.TreeFlags flags);
+		public static unowned GMenu.Tree lookup (string menu_file, GMenu.TreeFlags flags);
 		public void remove_monitor (GMenu.TreeChangedFunc callback);
 		public void set_user_data (void* user_data, GLib.DestroyNotify dnotify);
 	}
 	[Compact]
 	[CCode (cheader_filename = "gnome-menus/gmenu-tree.h")]
 	public class TreeAlias : GMenu.TreeItem {
-		public weak GMenu.TreeDirectory get_directory ();
-		public weak GMenu.TreeItem get_item ();
+		public unowned GMenu.TreeDirectory get_directory ();
+		public unowned GMenu.TreeItem get_item ();
 	}
 	[Compact]
 	[CCode (cheader_filename = "gnome-menus/gmenu-tree.h")]
 	public class TreeDirectory : GMenu.TreeItem {
-		public weak string get_comment ();
-		public weak GLib.SList<GMenu.TreeItem> get_contents ();
-		public weak string get_desktop_file_path ();
-		public weak string get_icon ();
+		public unowned string get_comment ();
+		public unowned GLib.SList<GMenu.TreeItem> get_contents ();
+		public unowned string get_desktop_file_path ();
+		public unowned string get_icon ();
 		public bool get_is_nodisplay ();
-		public weak string get_menu_id ();
-		public weak string get_name ();
-		public weak GMenu.Tree get_tree ();
-		public weak string make_path (GMenu.TreeEntry entry);
+		public unowned string get_menu_id ();
+		public unowned string get_name ();
+		public unowned GMenu.Tree get_tree ();
+		public unowned string make_path (GMenu.TreeEntry entry);
 	}
 	[Compact]
 	[CCode (cheader_filename = "gnome-menus/gmenu-tree.h")]
 	public class TreeEntry : GMenu.TreeItem {
-		public weak string get_comment ();
-		public weak string get_desktop_file_id ();
-		public weak string get_desktop_file_path ();
-		public weak string get_exec ();
-		public weak string get_icon ();
+		public unowned string get_comment ();
+		public unowned string get_desktop_file_id ();
+		public unowned string get_desktop_file_path ();
+		public unowned string get_exec ();
+		public unowned string get_icon ();
 		public bool get_is_excluded ();
 		public bool get_is_nodisplay ();
 		public bool get_launch_in_terminal ();
-		public weak string get_name ();
+		public unowned string get_name ();
 	}
 	[Compact]
 	[CCode (cheader_filename = "gnome-menus/gmenu-tree.h")]
 	public class TreeHeader : GMenu.TreeItem {
-		public weak GMenu.TreeDirectory get_directory ();
+		public unowned GMenu.TreeDirectory get_directory ();
 	}
 	[Compact]
 	[CCode (ref_function = "gmenu_tree_item_ref", unref_function = "gmenu_tree_item_unref", cheader_filename = "gnome-menus/gmenu-tree.h")]
 	public class TreeItem {
-		public weak GMenu.TreeDirectory get_parent ();
+		public unowned GMenu.TreeDirectory get_parent ();
 		public GMenu.TreeItemType get_type ();
 		public void* get_user_data ();
-		public TreeItem ();
 		public void set_user_data (void* user_data, GLib.DestroyNotify dnotify);
 	}
 	[Compact]

Modified: trunk/vapi/libgnomeui-2.0.vapi
==============================================================================
--- trunk/vapi/libgnomeui-2.0.vapi	(original)
+++ trunk/vapi/libgnomeui-2.0.vapi	Wed Jan 14 22:44:41 2009
@@ -1,4 +1,4 @@
-/* libgnomeui-2.0.vapi generated by lt-vapigen, do not modify. */
+/* libgnomeui-2.0.vapi generated by vapigen, do not modify. */
 
 [CCode (cprefix = "Gnome", lower_case_cprefix = "gnome_")]
 namespace Gnome {
@@ -28,8 +28,8 @@
 		public static void fill_toolbar (Gtk.Toolbar toolbar, Gnome.UIInfo uiinfo, Gtk.AccelGroup accel_group);
 		public static void fill_toolbar_custom (Gtk.Toolbar toolbar, Gnome.UIInfo uiinfo, Gnome.UIBuilderData uibdata, Gtk.AccelGroup accel_group);
 		public static void fill_toolbar_with_data (Gtk.Toolbar toolbar, Gnome.UIInfo uiinfo, Gtk.AccelGroup accel_group);
-		public static weak Gtk.Widget find_menu_pos (Gtk.Widget parent, string path, int pos);
-		public static weak string helper_gettext (string str);
+		public static unowned Gtk.Widget find_menu_pos (Gtk.Widget parent, string path, int pos);
+		public static unowned string helper_gettext (string str);
 		public void insert_menus (string path, Gnome.UIInfo menuinfo);
 		public void insert_menus_custom (string path, Gnome.UIInfo uiinfo, Gnome.UIBuilderData uibdata);
 		public void insert_menus_interp (string path, Gnome.UIInfo menuinfo, Gtk.CallbackMarshal relay_func, void* data, Gtk.DestroyNotify destroy_func);
@@ -48,18 +48,18 @@
 		public void set_toolbar (Gtk.Toolbar toolbar);
 		public static void ui_configure_configurable (Gnome.UIInfo uiinfo);
 		[NoAccessorMethod]
-		public string app_id { get; set construct; }
+		public string app_id { owned get; set construct; }
 	}
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public class AppBar : Gtk.HBox, Atk.Implementor, Gtk.Buildable {
 		[CCode (cname = "gnome_appbar_clear_stack")]
 		public void clear_stack ();
 		[CCode (cname = "gnome_appbar_get_progress")]
-		public weak Gtk.ProgressBar get_progress ();
+		public unowned Gtk.ProgressBar get_progress ();
 		[CCode (cname = "gnome_appbar_get_response")]
-		public weak string get_response ();
+		public unowned string get_response ();
 		[CCode (cname = "gnome_appbar_get_status")]
-		public weak Gtk.Widget get_status ();
+		public unowned Gtk.Widget get_status ();
 		[CCode (cname = "gnome_appbar_new", type = "GtkWidget*", has_construct_function = false)]
 		public AppBar (bool has_progress, bool has_status, Gnome.PreferencesType interactivity);
 		[CCode (cname = "gnome_appbar_pop")]
@@ -122,13 +122,13 @@
 		public weak string user_id;
 		public void add_static_arg ();
 		public void flush ();
-		public weak string get_config_prefix ();
-		public weak string get_desktop_id ();
+		public unowned string get_config_prefix ();
+		public unowned string get_desktop_id ();
 		public Gnome.ClientFlags get_flags ();
-		public weak string get_global_config_prefix ();
-		public weak string get_id ();
-		public weak string get_previous_id ();
-		public static weak Gnome.ModuleInfo module_info_get ();
+		public unowned string get_global_config_prefix ();
+		public unowned string get_id ();
+		public unowned string get_previous_id ();
+		public static unowned Gnome.ModuleInfo module_info_get ();
 		[CCode (has_construct_function = false)]
 		public Client ();
 		public void request_interaction (Gnome.DialogType dialog_type, Gnome.InteractFunction function, void* data);
@@ -194,12 +194,12 @@
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public class IconEntry : Gtk.VBox, Atk.Implementor, Gtk.Buildable {
 		public void @construct (string history_id, string browse_dialog_title);
-		public weak string get_filename ();
+		public unowned string get_filename ();
 		[CCode (cname = "gnome_icon_entry_pick_dialog")]
-		public weak Gtk.Widget get_pick_dialog ();
-		public weak Gtk.Widget gnome_entry ();
-		public weak Gtk.Widget gnome_file_entry ();
-		public weak Gtk.Widget gtk_entry ();
+		public unowned Gtk.Widget get_pick_dialog ();
+		public unowned Gtk.Widget gnome_entry ();
+		public unowned Gtk.Widget gnome_file_entry ();
+		public unowned Gtk.Widget gtk_entry ();
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public IconEntry (string history_id, string browse_dialog_title);
 		public void set_browse_dialog_title (string browse_dialog_title);
@@ -209,14 +209,14 @@
 		public void set_max_saved (uint max_saved);
 		public void set_pixmap_subdir (string subdir);
 		[NoAccessorMethod]
-		public string browse_dialog_title { get; set; }
+		public string browse_dialog_title { owned get; set; }
 		public string filename { get; set; }
 		[NoAccessorMethod]
-		public string history_id { get; set; }
+		public string history_id { owned get; set; }
 		[NoAccessorMethod]
-		public Gtk.Dialog pick_dialog { get; }
+		public Gtk.Dialog pick_dialog { owned get; }
 		[NoAccessorMethod]
-		public string pixmap_subdir { get; set; }
+		public string pixmap_subdir { owned get; set; }
 		public virtual signal void browse ();
 		public virtual signal void changed ();
 	}
@@ -225,9 +225,9 @@
 		public void add_defaults ();
 		public void add_directory (string dir);
 		public void clear (bool not_shown);
-		public weak Gtk.Widget get_box ();
-		public weak Gtk.Widget get_gil ();
-		public weak string get_icon (bool full_path);
+		public unowned Gtk.Widget get_box ();
+		public unowned Gtk.Widget get_gil ();
+		public unowned string get_icon (bool full_path);
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public IconSelection ();
 		public void select_icon (string filename);
@@ -238,11 +238,11 @@
 	public class PasswordDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
 		public weak Gnome.PasswordDialogDetails details;
 		public bool anon_selected ();
-		public weak string get_domain ();
-		public weak string get_new_password ();
-		public weak string get_password ();
+		public unowned string get_domain ();
+		public unowned string get_new_password ();
+		public unowned string get_password ();
 		public Gnome.PasswordDialogRemember get_remember ();
-		public weak string get_username ();
+		public unowned string get_username ();
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public PasswordDialog (string dialog_title, string message, string username, string password, bool readonly_username);
 		public bool run_and_block ();
@@ -265,9 +265,9 @@
 		public bool anonymous { get; set; }
 		public string domain { get; set; }
 		[NoAccessorMethod]
-		public string message { get; set; }
+		public string message { owned get; set; }
 		[NoAccessorMethod]
-		public string message_markup { get; set; }
+		public string message_markup { owned get; set; }
 		public string new_password { get; set; }
 		public string password { get; set; }
 		[NoAccessorMethod]
@@ -300,9 +300,9 @@
 	public class ThumbnailFactory : GLib.Object {
 		public bool can_thumbnail (string uri, string mime_type, ulong mtime);
 		public void create_failed_thumbnail (string uri, ulong mtime);
-		public weak Gdk.Pixbuf generate_thumbnail (string uri, string mime_type);
+		public unowned Gdk.Pixbuf generate_thumbnail (string uri, string mime_type);
 		public bool has_valid_failed_thumbnail (string uri, ulong mtime);
-		public weak string lookup (string uri, ulong mtime);
+		public unowned string lookup (string uri, ulong mtime);
 		[CCode (has_construct_function = false)]
 		public ThumbnailFactory (Gnome.ThumbnailSize size);
 		public void save_thumbnail (Gdk.Pixbuf thumbnail, string uri, ulong original_mtime);
@@ -647,15 +647,15 @@
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public static void authentication_manager_init ();
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
-	public static weak Gdk.Pixbuf gdk_pixbuf_new_from_uri (string uri);
+	public static unowned Gdk.Pixbuf gdk_pixbuf_new_from_uri (string uri);
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
-	public static weak Gnome.GdkPixbufAsyncHandle gdk_pixbuf_new_from_uri_async (string uri, Gnome.GdkPixbufLoadCallback load_callback, Gnome.GdkPixbufDoneCallback done_callback, void* callback_data);
+	public static unowned Gnome.GdkPixbufAsyncHandle gdk_pixbuf_new_from_uri_async (string uri, Gnome.GdkPixbufLoadCallback load_callback, Gnome.GdkPixbufDoneCallback done_callback, void* callback_data);
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
-	public static weak Gdk.Pixbuf gdk_pixbuf_new_from_uri_at_scale (string uri, int width, int height, bool preserve_aspect_ratio);
+	public static unowned Gdk.Pixbuf gdk_pixbuf_new_from_uri_at_scale (string uri, int width, int height, bool preserve_aspect_ratio);
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public static void gdk_pixbuf_new_from_uri_cancel (Gnome.GdkPixbufAsyncHandle handle);
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
-	public static weak Gnome.ModuleInfo gtk_module_info_get ();
+	public static unowned Gnome.ModuleInfo gtk_module_info_get ();
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public static bool help_display_desktop_on_screen (Gnome.Program program, string doc_id, string file_name, string link_id, Gdk.Screen screen) throws GLib.Error;
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
@@ -667,25 +667,25 @@
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public static void ice_init ();
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
-	public static weak string icon_lookup (Gtk.IconTheme icon_theme, Gnome.ThumbnailFactory thumbnail_factory, string file_uri, string custom_icon, GnomeVFS.FileInfo file_info, string mime_type, Gnome.IconLookupFlags flags, Gnome.IconLookupResultFlags _result);
+	public static unowned string icon_lookup (Gtk.IconTheme icon_theme, Gnome.ThumbnailFactory thumbnail_factory, string file_uri, string custom_icon, GnomeVFS.FileInfo file_info, string mime_type, Gnome.IconLookupFlags flags, Gnome.IconLookupResultFlags _result);
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
-	public static weak string icon_lookup_sync (Gtk.IconTheme icon_theme, Gnome.ThumbnailFactory thumbnail_factory, string file_uri, string custom_icon, Gnome.IconLookupFlags flags, Gnome.IconLookupResultFlags _result);
+	public static unowned string icon_lookup_sync (Gtk.IconTheme icon_theme, Gnome.ThumbnailFactory thumbnail_factory, string file_uri, string custom_icon, Gnome.IconLookupFlags flags, Gnome.IconLookupResultFlags _result);
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public static void interaction_key_return (int key, bool cancel_shutdown);
 	[CCode (cname = "libgnomeui_module_info_get", cheader_filename = "libgnomeui/libgnomeui.h")]
-	public static weak Gnome.ModuleInfo libgnomeui_module_info_get ();
+	public static unowned Gnome.ModuleInfo libgnomeui_module_info_get ();
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
-	public static weak Gnome.Client master_client ();
+	public static unowned Gnome.Client master_client ();
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public static bool thumbnail_has_uri (Gdk.Pixbuf pixbuf, string uri);
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public static bool thumbnail_is_valid (Gdk.Pixbuf pixbuf, string uri, ulong mtime);
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
-	public static weak string thumbnail_md5 (string uri);
+	public static unowned string thumbnail_md5 (string uri);
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
-	public static weak string thumbnail_path_for_uri (string uri, Gnome.ThumbnailSize size);
+	public static unowned string thumbnail_path_for_uri (string uri, Gnome.ThumbnailSize size);
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
-	public static weak Gdk.Pixbuf thumbnail_scale_down_pixbuf (Gdk.Pixbuf pixbuf, int dest_width, int dest_height);
+	public static unowned Gdk.Pixbuf thumbnail_scale_down_pixbuf (Gdk.Pixbuf pixbuf, int dest_width, int dest_height);
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public static bool url_show_on_screen (string url, Gdk.Screen screen) throws GLib.Error;
 }

Modified: trunk/vapi/libnotify.vapi
==============================================================================
--- trunk/vapi/libnotify.vapi	(original)
+++ trunk/vapi/libnotify.vapi	Wed Jan 14 22:44:41 2009
@@ -1,10 +1,10 @@
-/* libnotify.vapi generated by lt-vapigen, do not modify. */
+/* libnotify.vapi generated by vapigen, do not modify. */
 
 [CCode (cprefix = "Notify", lower_case_cprefix = "notify_")]
 namespace Notify {
 	[CCode (cheader_filename = "libnotify/notify.h")]
 	public class Notification : GLib.Object {
-		public void add_action (string action, string label, Notify.ActionCallback# callback);
+		public void add_action (string action, string label, owned Notify.ActionCallback callback);
 		public void attach_to_status_icon (Gtk.StatusIcon status_icon);
 		public void attach_to_widget (Gtk.Widget attach);
 		public void clear_actions ();
@@ -27,15 +27,15 @@
 		[CCode (has_construct_function = false)]
 		public Notification.with_status_icon (string summary, string body, string icon, Gtk.StatusIcon status_icon);
 		[NoAccessorMethod]
-		public Gtk.Widget attach_widget { get; set construct; }
+		public Gtk.Widget attach_widget { owned get; set construct; }
 		[NoAccessorMethod]
-		public string body { get; set construct; }
+		public string body { owned get; set construct; }
 		[NoAccessorMethod]
-		public string icon_name { get; set construct; }
+		public string icon_name { owned get; set construct; }
 		[NoAccessorMethod]
-		public Gtk.StatusIcon status_icon { get; set construct; }
+		public Gtk.StatusIcon status_icon { owned get; set construct; }
 		[NoAccessorMethod]
-		public string summary { get; set construct; }
+		public string summary { owned get; set construct; }
 		public virtual signal void closed ();
 	}
 	[CCode (cprefix = "NOTIFY_URGENCY_", has_type_id = "0", cheader_filename = "libnotify/notify.h")]
@@ -51,11 +51,11 @@
 	[CCode (cheader_filename = "libnotify/notify.h")]
 	public const int EXPIRES_NEVER;
 	[CCode (cheader_filename = "libnotify/notify.h")]
-	public static weak string get_app_name ();
+	public static unowned string get_app_name ();
 	[CCode (cheader_filename = "libnotify/notify.h")]
-	public static weak GLib.List get_server_caps ();
+	public static unowned GLib.List get_server_caps ();
 	[CCode (cheader_filename = "libnotify/notify.h")]
-	public static bool get_server_info (out weak string ret_name, out weak string ret_vendor, out weak string ret_version, out weak string ret_spec_version);
+	public static bool get_server_info (out unowned string ret_name, out unowned string ret_vendor, out unowned string ret_version, out unowned string ret_spec_version);
 	[CCode (cheader_filename = "libnotify/notify.h")]
 	public static bool init (string app_name);
 	[CCode (cheader_filename = "libnotify/notify.h")]

Modified: trunk/vapi/liboobs-1.vapi
==============================================================================
--- trunk/vapi/liboobs-1.vapi	(original)
+++ trunk/vapi/liboobs-1.vapi	Wed Jan 14 22:44:41 2009
@@ -1,4 +1,4 @@
-/* liboobs-1.vapi generated by lt-vapigen, do not modify. */
+/* liboobs-1.vapi generated by vapigen, do not modify. */
 
 [CCode (cprefix = "Oobs", lower_case_cprefix = "oobs_")]
 namespace Oobs {
@@ -7,8 +7,8 @@
 		public void add_user (Oobs.User user);
 		public void clear_users ();
 		public long get_gid ();
-		public weak string get_name ();
-		public weak GLib.List get_users ();
+		public unowned string get_name ();
+		public unowned GLib.List get_users ();
 		[CCode (has_construct_function = false)]
 		public Group (string name);
 		public void remove_user (Oobs.User user);
@@ -16,7 +16,7 @@
 		public void set_gid (long gid);
 		public void set_password (string password);
 		[NoAccessorMethod]
-		public string crypted_password { get; set; }
+		public string crypted_password { owned get; set; }
 		public int gid { get; set; }
 		[NoAccessorMethod]
 		public string name { get; construct; }
@@ -24,8 +24,8 @@
 	}
 	[CCode (cheader_filename = "oobs/oobs.h")]
 	public class GroupsConfig : Oobs.Object {
-		public static weak Oobs.Object get ();
-		public weak Oobs.List get_groups ();
+		public static unowned Oobs.Object get ();
+		public unowned Oobs.List get_groups ();
 		[NoAccessorMethod]
 		public int maximum_gid { get; set; }
 		[NoAccessorMethod]
@@ -33,12 +33,12 @@
 	}
 	[CCode (cheader_filename = "oobs/oobs.h")]
 	public class HostsConfig : Oobs.Object {
-		public static weak Oobs.Object get ();
-		public weak GLib.List get_dns_servers ();
-		public weak string get_domainname ();
-		public weak string get_hostname ();
-		public weak GLib.List get_search_domains ();
-		public weak Oobs.List get_static_hosts ();
+		public static unowned Oobs.Object get ();
+		public unowned GLib.List get_dns_servers ();
+		public unowned string get_domainname ();
+		public unowned string get_hostname ();
+		public unowned GLib.List get_search_domains ();
+		public unowned Oobs.List get_static_hosts ();
 		public void set_dns_servers (GLib.List dns_list);
 		public void set_domainname (string domainname);
 		public void set_hostname (string hostname);
@@ -49,7 +49,7 @@
 		public bool get_active ();
 		public bool get_auto ();
 		public bool get_configured ();
-		public weak string get_device_name ();
+		public unowned string get_device_name ();
 		public virtual bool has_gateway ();
 		[NoWrapper]
 		public virtual bool is_configured ();
@@ -60,17 +60,17 @@
 		public bool auto { get; set; }
 		public bool configured { get; set; }
 		[NoAccessorMethod]
-		public string device { get; construct; }
+		public string device { owned get; construct; }
 		public virtual signal void state_changed ();
 	}
 	[CCode (cheader_filename = "oobs/oobs.h")]
 	public class IfaceEthernet : Oobs.Iface {
-		public weak string get_broadcast_address ();
-		public weak string get_configuration_method ();
-		public weak string get_gateway_address ();
-		public weak string get_ip_address ();
-		public weak string get_network_address ();
-		public weak string get_network_mask ();
+		public unowned string get_broadcast_address ();
+		public unowned string get_configuration_method ();
+		public unowned string get_gateway_address ();
+		public unowned string get_ip_address ();
+		public unowned string get_network_address ();
+		public unowned string get_network_mask ();
 		public void set_broadcast_address (string address);
 		public void set_configuration_method (string method);
 		public void set_gateway_address (string address);
@@ -79,11 +79,11 @@
 		public void set_network_mask (string mask);
 		public string broadcast_address { get; set; }
 		[NoAccessorMethod]
-		public string config_method { get; set; }
+		public string config_method { owned get; set; }
 		public string gateway_address { get; set; }
 		public string ip_address { get; set; }
 		[NoAccessorMethod]
-		public string ip_mask { get; set; }
+		public string ip_mask { owned get; set; }
 		public string network_address { get; set; }
 	}
 	[CCode (cheader_filename = "oobs/oobs.h")]
@@ -91,17 +91,17 @@
 	}
 	[CCode (cheader_filename = "oobs/oobs.h")]
 	public class IfacePPP : Oobs.Iface {
-		public weak string get_apn ();
-		public weak string get_connection_type ();
+		public unowned string get_apn ();
+		public unowned string get_connection_type ();
 		public bool get_default_gateway ();
 		public Oobs.DialType get_dial_type ();
-		public weak Oobs.IfaceEthernet get_ethernet ();
-		public weak string get_login ();
+		public unowned Oobs.IfaceEthernet get_ethernet ();
+		public unowned string get_login ();
 		public bool get_peer_noauth ();
 		public bool get_persistent ();
-		public weak string get_phone_number ();
-		public weak string get_phone_prefix ();
-		public weak string get_serial_port ();
+		public unowned string get_phone_number ();
+		public unowned string get_phone_prefix ();
+		public unowned string get_serial_port ();
 		public bool get_use_peer_dns ();
 		public Oobs.ModemVolume get_volume ();
 		public void set_apn (string apn);
@@ -124,10 +124,10 @@
 		public Oobs.DialType dial_type { get; set; }
 		public Oobs.IfaceEthernet ethernet { get; set; }
 		[NoAccessorMethod]
-		public string iface_section { get; set; }
+		public string iface_section { owned get; set; }
 		public string login { get; set; }
 		[NoAccessorMethod]
-		public string password { get; set; }
+		public string password { owned get; set; }
 		public bool peer_noauth { get; set; }
 		public bool persistent { get; set; }
 		public string phone_number { get; set; }
@@ -138,8 +138,8 @@
 	}
 	[CCode (cheader_filename = "oobs/oobs.h")]
 	public class IfacePlip : Oobs.Iface {
-		public weak string get_address ();
-		public weak string get_remote_address ();
+		public unowned string get_address ();
+		public unowned string get_remote_address ();
 		public void set_address (string address);
 		public void set_remote_address (string address);
 		public string address { get; set; }
@@ -147,9 +147,9 @@
 	}
 	[CCode (cheader_filename = "oobs/oobs.h")]
 	public class IfaceWireless : Oobs.IfaceEthernet {
-		public weak string get_essid ();
-		public weak string get_key ();
-		public weak string get_key_type ();
+		public unowned string get_essid ();
+		public unowned string get_key ();
+		public unowned string get_key_type ();
 		public void set_essid (string essid);
 		public void set_key (string key);
 		public void set_key_type (string key_type);
@@ -159,17 +159,17 @@
 	}
 	[CCode (cheader_filename = "oobs/oobs.h")]
 	public class IfacesConfig : Oobs.Object {
-		public static weak Oobs.Object get ();
-		public weak GLib.List get_available_configuration_methods ();
-		public weak GLib.List get_available_key_types ();
-		public weak GLib.List get_available_ppp_types ();
-		public weak Oobs.List get_ifaces (Oobs.IfaceType type);
+		public static unowned Oobs.Object get ();
+		public unowned GLib.List get_available_configuration_methods ();
+		public unowned GLib.List get_available_key_types ();
+		public unowned GLib.List get_available_ppp_types ();
+		public unowned Oobs.List get_ifaces (Oobs.IfaceType type);
 	}
 	[CCode (cheader_filename = "oobs/oobs.h")]
 	public class List : GLib.Object {
 		public void append (Oobs.ListIter iter);
 		public void clear ();
-		public weak GLib.Object get (Oobs.ListIter iter);
+		public unowned GLib.Object get (Oobs.ListIter iter);
 		public bool get_iter_first (Oobs.ListIter iter);
 		public int get_n_items ();
 		public void insert_after (Oobs.ListIter anchor, Oobs.ListIter iter);
@@ -185,22 +185,22 @@
 	public class ListIter {
 		public void* data;
 		public uint stamp;
-		public weak Oobs.ListIter copy ();
+		public unowned Oobs.ListIter copy ();
 		public static bool next (Oobs.List list, Oobs.ListIter iter);
 	}
 	[CCode (cheader_filename = "oobs/oobs.h")]
 	public class NFSConfig : Oobs.Object {
-		public static weak Oobs.Object get ();
-		public weak Oobs.List get_shares ();
+		public static unowned Oobs.Object get ();
+		public unowned Oobs.List get_shares ();
 	}
 	[CCode (cheader_filename = "oobs/oobs.h")]
 	public class NTPConfig : Oobs.Object {
-		public static weak Oobs.Object get ();
-		public weak Oobs.List get_servers ();
+		public static unowned Oobs.Object get ();
+		public unowned Oobs.List get_servers ();
 	}
 	[CCode (cheader_filename = "oobs/oobs.h")]
 	public class NTPServer : GLib.Object {
-		public weak string get_hostname ();
+		public unowned string get_hostname ();
 		[CCode (has_construct_function = false)]
 		public NTPServer (string hostname);
 		public void set_hostname (string hostname);
@@ -211,7 +211,7 @@
 		public virtual void commit ();
 		public Oobs.Result commit_async (Oobs.ObjectAsyncFunc func, void* data);
 		public void ensure_update ();
-		public virtual weak string get_authentication_action ();
+		public virtual unowned string get_authentication_action ();
 		public bool has_updated ();
 		public void process_requests ();
 		public virtual void update ();
@@ -233,12 +233,12 @@
 	[CCode (cheader_filename = "oobs/oobs.h")]
 	public class SMBConfig : Oobs.Object {
 		public void delete_user_password (Oobs.User user);
-		public static weak Oobs.Object get ();
-		public weak string get_description ();
+		public static unowned Oobs.Object get ();
+		public unowned string get_description ();
 		public bool get_is_wins_server ();
-		public weak Oobs.List get_shares ();
-		public weak string get_wins_server ();
-		public weak string get_workgroup ();
+		public unowned Oobs.List get_shares ();
+		public unowned string get_wins_server ();
+		public unowned string get_workgroup ();
 		public void set_description (string description);
 		public void set_is_wins_server (bool is_wins_server);
 		public void set_user_password (Oobs.User user, string password);
@@ -252,12 +252,12 @@
 	}
 	[CCode (cheader_filename = "oobs/oobs.h")]
 	public class SelfConfig : Oobs.Object {
-		public static weak Oobs.Object get ();
-		public weak Oobs.User get_user ();
+		public static unowned Oobs.Object get ();
+		public unowned Oobs.User get_user ();
 	}
 	[CCode (cheader_filename = "oobs/oobs.h")]
 	public class Service : GLib.Object {
-		public weak string get_name ();
+		public unowned string get_name ();
 		public void get_runlevel_configuration (Oobs.ServicesRunlevel runlevel, Oobs.ServiceStatus status, int priority);
 		public void set_runlevel_configuration (Oobs.ServicesRunlevel runlevel, Oobs.ServiceStatus status, int priority);
 		[NoAccessorMethod]
@@ -265,10 +265,10 @@
 	}
 	[CCode (cheader_filename = "oobs/oobs.h")]
 	public class ServicesConfig : Oobs.Object {
-		public static weak Oobs.Object get ();
-		public weak Oobs.ServicesRunlevel get_default_runlevel ();
-		public weak GLib.List get_runlevels ();
-		public weak Oobs.List get_services ();
+		public static unowned Oobs.Object get ();
+		public unowned Oobs.ServicesRunlevel get_default_runlevel ();
+		public unowned GLib.List get_runlevels ();
+		public unowned Oobs.List get_services ();
 	}
 	[Compact]
 	[CCode (cheader_filename = "oobs/oobs.h")]
@@ -279,8 +279,8 @@
 	[CCode (cheader_filename = "oobs/oobs.h")]
 	public class Session : GLib.Object {
 		public Oobs.Result commit ();
-		public static weak Oobs.Session get ();
-		public weak string get_authentication_action ();
+		public static unowned Oobs.Session get ();
+		public unowned string get_authentication_action ();
 		public bool get_connected ();
 		public Oobs.Result get_platform (string platform);
 		public Oobs.Result get_supported_platforms (GLib.List platforms);
@@ -290,7 +290,7 @@
 	}
 	[CCode (cheader_filename = "oobs/oobs.h")]
 	public class Share : GLib.Object {
-		public weak string get_path ();
+		public unowned string get_path ();
 		public void set_path (string path);
 		public string path { get; set; }
 	}
@@ -303,16 +303,16 @@
 	[CCode (cheader_filename = "oobs/oobs.h")]
 	public class ShareNFS : Oobs.Share {
 		public void add_acl_element (string element, bool read_only);
-		public weak GLib.SList get_acl ();
+		public unowned GLib.SList get_acl ();
 		[CCode (type = "OobsShare*", has_construct_function = false)]
 		public ShareNFS (string path);
 		public void set_acl (GLib.SList acl);
 	}
 	[CCode (cheader_filename = "oobs/oobs.h")]
 	public class ShareSMB : Oobs.Share {
-		public weak string get_comment ();
+		public unowned string get_comment ();
 		public Oobs.ShareSMBFlags get_flags ();
-		public weak string get_name ();
+		public unowned string get_name ();
 		[CCode (type = "OobsShare*", has_construct_function = false)]
 		public ShareSMB (string path, string name, string comment, Oobs.ShareSMBFlags flags);
 		public void set_comment (string comment);
@@ -324,8 +324,8 @@
 	}
 	[CCode (cheader_filename = "oobs/oobs.h")]
 	public class StaticHost : GLib.Object {
-		public weak GLib.List get_aliases ();
-		public weak string get_ip_address ();
+		public unowned GLib.List get_aliases ();
+		public unowned string get_ip_address ();
 		[CCode (has_construct_function = false)]
 		public StaticHost (string ip_address, GLib.List aliases);
 		public void set_aliases (GLib.List aliases);
@@ -334,9 +334,9 @@
 	}
 	[CCode (cheader_filename = "oobs/oobs.h")]
 	public class TimeConfig : Oobs.Object {
-		public static weak Oobs.Object get ();
+		public static unowned Oobs.Object get ();
 		public void get_time (int year, int month, int day, int hour, int minute, int second);
-		public weak string get_timezone ();
+		public unowned string get_timezone ();
 		public long get_unix_time ();
 		public void get_utc_time (int year, int month, int day, int hour, int minute, int second);
 		public void set_time (int year, int month, int day, int hour, int minute, int second);
@@ -349,16 +349,16 @@
 	[CCode (cheader_filename = "oobs/oobs.h")]
 	public class User : GLib.Object {
 		public bool get_active ();
-		public weak string get_full_name ();
-		public weak string get_home_directory ();
-		public weak string get_home_phone_number ();
-		public weak string get_login_name ();
-		public weak Oobs.Group get_main_group ();
-		public weak string get_other_data ();
-		public weak string get_room_number ();
-		public weak string get_shell ();
+		public unowned string get_full_name ();
+		public unowned string get_home_directory ();
+		public unowned string get_home_phone_number ();
+		public unowned string get_login_name ();
+		public unowned Oobs.Group get_main_group ();
+		public unowned string get_other_data ();
+		public unowned string get_room_number ();
+		public unowned string get_shell ();
 		public long get_uid ();
-		public weak string get_work_phone_number ();
+		public unowned string get_work_phone_number ();
 		[CCode (has_construct_function = false)]
 		public User (string name);
 		public void set_crypted_password (string crypted_password);
@@ -374,38 +374,38 @@
 		public void set_work_phone_number (string phone_number);
 		public bool active { get; }
 		[NoAccessorMethod]
-		public string crypted_password { get; set; }
+		public string crypted_password { owned get; set; }
 		public string full_name { get; set; }
 		public string home_directory { get; set; }
 		[NoAccessorMethod]
-		public string home_phone { get; set; }
+		public string home_phone { owned get; set; }
 		[NoAccessorMethod]
-		public string name { get; construct; }
+		public string name { owned get; construct; }
 		public string other_data { get; set; }
 		public string password { set; }
 		public string room_number { get; set; }
 		public string shell { get; set; }
 		public int uid { get; set; }
 		[NoAccessorMethod]
-		public string work_phone { get; set; }
+		public string work_phone { owned get; set; }
 	}
 	[CCode (cheader_filename = "oobs/oobs.h")]
 	public class UsersConfig : Oobs.Object {
-		public static weak Oobs.Object get ();
-		public weak GLib.List get_available_shells ();
-		public weak Oobs.Group get_default_group ();
-		public weak string get_default_home_dir ();
-		public weak string get_default_shell ();
+		public static unowned Oobs.Object get ();
+		public unowned GLib.List get_available_shells ();
+		public unowned Oobs.Group get_default_group ();
+		public unowned string get_default_home_dir ();
+		public unowned string get_default_shell ();
 		public long get_maximum_users_uid ();
 		public long get_minimum_users_uid ();
-		public weak Oobs.List get_users ();
+		public unowned Oobs.List get_users ();
 		public void set_default_home_dir (string home_dir);
 		public void set_default_shell (string shell);
 		public void set_maximum_users_uid (long uid);
 		public void set_minimum_users_uid (long uid);
 		public Oobs.Group default_group { get; }
 		[NoAccessorMethod]
-		public string default_home { get; set; }
+		public string default_home { owned get; set; }
 		public string default_shell { get; set; }
 		[NoAccessorMethod]
 		public int maximum_uid { get; set; }

Modified: trunk/vapi/libsexy.vapi
==============================================================================
--- trunk/vapi/libsexy.vapi	(original)
+++ trunk/vapi/libsexy.vapi	Wed Jan 14 22:44:41 2009
@@ -1,11 +1,11 @@
-/* libsexy.vapi generated by lt-vapigen, do not modify. */
+/* libsexy.vapi generated by vapigen, do not modify. */
 
 [CCode (cprefix = "Sexy", lower_case_cprefix = "sexy_")]
 namespace Sexy {
 	[CCode (cheader_filename = "libsexy/sexy.h")]
 	public class IconEntry : Gtk.Entry, Atk.Implementor, Gtk.Buildable, Gtk.Editable, Gtk.CellEditable {
 		public void add_clear_button ();
-		public weak Gtk.Image get_icon (Sexy.IconEntryPosition position);
+		public unowned Gtk.Image get_icon (Sexy.IconEntryPosition position);
 		public bool get_icon_highlight (Sexy.IconEntryPosition position);
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public IconEntry ();
@@ -19,9 +19,9 @@
 		public void activate_default_languages ();
 		public bool activate_language (string lang) throws GLib.Error;
 		public void deactivate_language (string lang);
-		public weak GLib.SList get_active_languages ();
-		public weak string get_language_name (string lang);
-		public weak GLib.SList get_languages ();
+		public unowned GLib.SList get_active_languages ();
+		public unowned string get_language_name (string lang);
+		public unowned GLib.SList get_languages ();
 		public bool is_checked ();
 		public bool language_is_active (string lang);
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
@@ -44,7 +44,7 @@
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public TreeView ();
 		public void set_tooltip_label_column (uint column);
-		public virtual signal weak Gtk.Widget get_tooltip (Gtk.TreePath path, Gtk.TreeViewColumn column);
+		public virtual signal unowned Gtk.Widget get_tooltip (Gtk.TreePath path, Gtk.TreeViewColumn column);
 	}
 	[CCode (cheader_filename = "libsexy/sexy.h")]
 	public class UrlLabel : Gtk.Label, Atk.Implementor, Gtk.Buildable {

Modified: trunk/vapi/libsoup-2.2.vapi
==============================================================================
--- trunk/vapi/libsoup-2.2.vapi	(original)
+++ trunk/vapi/libsoup-2.2.vapi	Wed Jan 14 22:44:41 2009
@@ -1,4 +1,4 @@
-/* libsoup-2.2.vapi generated by lt-vapigen, do not modify. */
+/* libsoup-2.2.vapi generated by vapigen, do not modify. */
 
 [CCode (cprefix = "Soup", lower_case_cprefix = "soup_")]
 namespace Soup {
@@ -6,8 +6,8 @@
 	public class Address : GLib.Object {
 		[CCode (has_construct_function = false)]
 		public Address.any (Soup.AddressFamily family, uint port);
-		public weak string get_name ();
-		public weak string get_physical ();
+		public unowned string get_name ();
+		public unowned string get_physical ();
 		public uint get_port ();
 		public void* get_sockaddr (int len);
 		[CCode (has_construct_function = false)]
@@ -58,7 +58,7 @@
 		public weak GLib.HashTable response_headers;
 		public Soup.MessageStatus status;
 		public uint status_code;
-		public void add_chunk (Soup.Ownership owner, string# body, uint length);
+		public void add_chunk (Soup.Ownership owner, owned string body, uint length);
 		public void add_final_chunk ();
 		public void add_handler (Soup.HandlerPhase phase, Soup.MessageCallbackFn handler_cb);
 		public static void add_header (GLib.HashTable hash, string name, string value);
@@ -69,12 +69,12 @@
 		[CCode (has_construct_function = false)]
 		public Message.from_uri (string method, Soup.Uri uri);
 		public uint get_flags ();
-		public static weak string get_header (GLib.HashTable hash, string name);
-		public static weak GLib.SList get_header_list (GLib.HashTable hash, string name);
+		public static unowned string get_header (GLib.HashTable hash, string name);
+		public static unowned GLib.SList get_header_list (GLib.HashTable hash, string name);
 		public Soup.HttpVersion get_http_version ();
 		public Soup.TransferEncoding get_request_encoding (uint content_length);
 		public Soup.TransferEncoding get_response_encoding (uint content_length);
-		public weak Soup.Uri get_uri ();
+		public unowned Soup.Uri get_uri ();
 		public bool io_in_progress ();
 		public void io_pause ();
 		public void io_stop ();
@@ -88,8 +88,8 @@
 		public void send_request (Soup.Socket sock, bool is_via_proxy);
 		public void set_flags (uint flags);
 		public void set_http_version (Soup.HttpVersion version);
-		public void set_request (string content_type, Soup.Ownership req_owner, string# req_body, ulong req_length);
-		public void set_response (string content_type, Soup.Ownership resp_owner, string# resp_body, ulong resp_length);
+		public void set_request (string content_type, Soup.Ownership req_owner, owned string req_body, ulong req_length);
+		public void set_response (string content_type, Soup.Ownership resp_owner, owned string resp_body, ulong resp_length);
 		public void set_status (uint status_code);
 		public void set_status_full (uint status_code, string reason_phrase);
 		public void set_uri (Soup.Uri uri);
@@ -118,12 +118,12 @@
 	[CCode (free_function = "soup_message_queue_destroy", cheader_filename = "libsoup/soup.h")]
 	public class MessageQueue {
 		public void append (Soup.Message msg);
-		public weak Soup.Message first (Soup.MessageQueueIter iter);
+		public unowned Soup.Message first (Soup.MessageQueueIter iter);
 		public void free_iter (Soup.MessageQueueIter iter);
 		[CCode (has_construct_function = false)]
 		public MessageQueue ();
-		public weak Soup.Message next (Soup.MessageQueueIter iter);
-		public weak Soup.Message remove (Soup.MessageQueueIter iter);
+		public unowned Soup.Message next (Soup.MessageQueueIter iter);
+		public unowned Soup.Message remove (Soup.MessageQueueIter iter);
 		public void remove_message (Soup.Message msg);
 	}
 	[Compact]
@@ -139,12 +139,12 @@
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public class Server : GLib.Object {
 		public void add_handler (string path, Soup.ServerAuthContext auth_ctx, Soup.ServerCallbackFn callback, Soup.ServerUnregisterFn unreg, void* data);
-		public weak GLib.MainContext get_async_context ();
-		public weak Soup.ServerHandler get_handler (string path);
-		public weak Soup.Socket get_listener ();
+		public unowned GLib.MainContext get_async_context ();
+		public unowned Soup.ServerHandler get_handler (string path);
+		public unowned Soup.Socket get_listener ();
 		public uint get_port ();
-		public weak Soup.Protocol get_protocol ();
-		public weak GLib.SList list_handlers ();
+		public unowned Soup.Protocol get_protocol ();
+		public unowned GLib.SList list_handlers ();
 		[CCode (has_construct_function = false)]
 		public Server (string optname1, ...);
 		public void quit ();
@@ -154,13 +154,13 @@
 		[NoAccessorMethod]
 		public void* async_context { get; construct; }
 		[NoAccessorMethod]
-		public Soup.Address @interface { get; construct; }
+		public Soup.Address @interface { owned get; construct; }
 		[NoAccessorMethod]
 		public uint port { get; construct; }
 		[NoAccessorMethod]
-		public string ssl_cert_file { get; construct; }
+		public string ssl_cert_file { owned get; construct; }
 		[NoAccessorMethod]
-		public string ssl_key_file { get; construct; }
+		public string ssl_key_file { owned get; construct; }
 	}
 	[Compact]
 	[CCode (cheader_filename = "libsoup/soup.h")]
@@ -169,7 +169,7 @@
 		public weak Soup.ServerAuthDigest digest;
 		public Soup.AuthType type;
 		public bool check_passwd (string passwd);
-		public weak string get_user ();
+		public unowned string get_user ();
 		[CCode (has_construct_function = false)]
 		public ServerAuth (Soup.ServerAuthContext auth_ctx, GLib.SList auth_hdrs, Soup.Message msg);
 	}
@@ -215,8 +215,8 @@
 		public weak string path;
 		public weak Soup.Server server;
 		public weak Soup.Socket sock;
-		public weak Soup.Address get_client_address ();
-		public weak string get_client_host ();
+		public unowned Soup.Address get_client_address ();
+		public unowned string get_client_host ();
 	}
 	[Compact]
 	[CCode (cheader_filename = "libsoup/soup.h")]
@@ -231,7 +231,7 @@
 	public class ServerMessage : Soup.Message {
 		public void finish ();
 		public Soup.TransferEncoding get_encoding ();
-		public weak Soup.Server get_server ();
+		public unowned Soup.Server get_server ();
 		public bool is_finished ();
 		public bool is_started ();
 		[CCode (has_construct_function = false)]
@@ -245,9 +245,9 @@
 		public void abort ();
 		public void add_filter (Soup.MessageFilter filter);
 		public virtual void cancel_message (Soup.Message msg);
-		public weak GLib.MainContext get_async_context ();
-		public weak Soup.Connection get_connection (Soup.Message msg, bool try_pruning, bool is_new);
-		public virtual void queue_message (Soup.Message# msg, Soup.MessageCallbackFn callback);
+		public unowned GLib.MainContext get_async_context ();
+		public unowned Soup.Connection get_connection (Soup.Message msg, bool try_pruning, bool is_new);
+		public virtual void queue_message (owned Soup.Message msg, Soup.MessageCallbackFn callback);
 		public void remove_filter (Soup.MessageFilter filter);
 		public virtual void requeue_message (Soup.Message msg);
 		public virtual uint send_message (Soup.Message msg);
@@ -261,7 +261,7 @@
 		[NoAccessorMethod]
 		public void* proxy_uri { get; set; }
 		[NoAccessorMethod]
-		public string ssl_ca_file { get; set; }
+		public string ssl_ca_file { owned get; set; }
 		[NoAccessorMethod]
 		public uint timeout { get; set; }
 		[NoAccessorMethod]
@@ -286,33 +286,33 @@
 	[Compact]
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public class SoapParameter {
-		public weak Soup.SoapParameter get_first_child ();
-		public weak Soup.SoapParameter get_first_child_by_name (string name);
+		public unowned Soup.SoapParameter get_first_child ();
+		public unowned Soup.SoapParameter get_first_child_by_name (string name);
 		public int get_int_value ();
-		public weak string get_name ();
-		public weak Soup.SoapParameter get_next_child ();
-		public weak Soup.SoapParameter get_next_child_by_name (string name);
-		public weak string get_property (string prop_name);
-		public weak string get_string_value ();
+		public unowned string get_name ();
+		public unowned Soup.SoapParameter get_next_child ();
+		public unowned Soup.SoapParameter get_next_child_by_name (string name);
+		public unowned string get_property (string prop_name);
+		public unowned string get_string_value ();
 	}
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public class Socket : GLib.Object {
-		public static weak Soup.Socket client_new_async (string hostname, uint port, void* ssl_creds, Soup.SocketCallback callback);
-		public static weak Soup.Socket client_new_sync (string hostname, uint port, void* ssl_creds, uint status_ret);
+		public static unowned Soup.Socket client_new_async (string hostname, uint port, void* ssl_creds, Soup.SocketCallback callback);
+		public static unowned Soup.Socket client_new_sync (string hostname, uint port, void* ssl_creds, uint status_ret);
 		public uint connect (Soup.Address remote_addr);
 		public void disconnect ();
-		public weak Soup.Address get_local_address ();
-		public weak Soup.Address get_remote_address ();
+		public unowned Soup.Address get_local_address ();
+		public unowned Soup.Address get_remote_address ();
 		public bool is_connected ();
 		public bool listen (Soup.Address local_addr);
 		[CCode (has_construct_function = false)]
 		public Socket (string optname1);
-		public Soup.SocketIOStatus read (void* buffer, ulong len, ulong nread);
-		public Soup.SocketIOStatus read_until (void* buffer, ulong len, void* boundary, ulong boundary_len, ulong nread, bool got_boundary);
-		public static weak Soup.Socket server_new (Soup.Address local_addr, void* ssl_creds, Soup.SocketListenerCallback callback);
+		public Soup.SocketIOStatus read (void* buffer, size_t len, size_t nread);
+		public Soup.SocketIOStatus read_until (void* buffer, size_t len, void* boundary, size_t boundary_len, size_t nread, bool got_boundary);
+		public static unowned Soup.Socket server_new (Soup.Address local_addr, void* ssl_creds, Soup.SocketListenerCallback callback);
 		public bool start_proxy_ssl (string ssl_host);
 		public bool start_ssl ();
-		public Soup.SocketIOStatus write (void* buffer, ulong len, ulong nwrote);
+		public Soup.SocketIOStatus write (void* buffer, size_t len, size_t nwrote);
 		[NoAccessorMethod]
 		public void* async_context { get; construct; }
 		[NoAccessorMethod]
@@ -347,14 +347,14 @@
 		public weak Soup.Protocol protocol;
 		public weak string query;
 		public weak string user;
-		public weak Soup.Uri copy ();
-		public weak Soup.Uri copy_root ();
+		public unowned Soup.Uri copy ();
+		public unowned Soup.Uri copy_root ();
 		public static void decode (string part);
 		public static string encode (string part, string escape_extra);
 		public bool equal (Soup.Uri uri2);
 		[CCode (has_construct_function = false)]
 		public Uri (string uri_string);
-		public weak string to_string (bool just_path);
+		public unowned string to_string (bool just_path);
 		public bool uses_default_port ();
 		[CCode (has_construct_function = false)]
 		public Uri.with_base (Soup.Uri @base, string uri_string);
@@ -362,28 +362,28 @@
 	[Compact]
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public class XmlrpcValue {
-		public bool array_get_iterator (out weak Soup.XmlrpcValueArrayIterator iter);
+		public bool array_get_iterator (out unowned Soup.XmlrpcValueArrayIterator iter);
 		public void dump ();
-		public bool get_base64 (out weak GLib.ByteArray data);
+		public bool get_base64 (out unowned GLib.ByteArray data);
 		public bool get_boolean (bool b);
 		public bool get_datetime (ulong timeval);
 		public bool get_double (double b);
 		public bool get_int (long i);
-		public bool get_string (out weak string str);
+		public bool get_string (out unowned string str);
 		public bool get_struct (GLib.HashTable table);
 	}
 	[Compact]
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public class XmlrpcValueArrayIterator {
-		public bool get_value (out weak Soup.XmlrpcValue value);
-		public weak Soup.XmlrpcValueArrayIterator next ();
-		public weak Soup.XmlrpcValueArrayIterator prev ();
+		public bool get_value (out unowned Soup.XmlrpcValue value);
+		public unowned Soup.XmlrpcValueArrayIterator next ();
+		public unowned Soup.XmlrpcValueArrayIterator prev ();
 	}
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public interface MessageFilter {
 		public abstract void setup_message (Soup.Message msg);
 	}
-	[CCode (cheader_filename = "libsoup/soup.h")]
+	[CCode (type_id = "SOUP_TYPE_DATA_BUFFER", cheader_filename = "libsoup/soup.h")]
 	public struct DataBuffer {
 		public Soup.Ownership owner;
 		public string body;
@@ -700,21 +700,21 @@
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const int URI_H;
 	[CCode (cheader_filename = "libsoup/soup.h")]
-	public static weak GLib.TimeoutSource add_idle (GLib.MainContext async_context, GLib.SourceFunc function, void* data);
+	public static unowned GLib.TimeoutSource add_idle (GLib.MainContext async_context, GLib.SourceFunc function, void* data);
 	[CCode (cheader_filename = "libsoup/soup.h")]
-	public static weak GLib.TimeoutSource add_timeout (GLib.MainContext async_context, uint interval, GLib.SourceFunc function, void* data);
+	public static unowned GLib.TimeoutSource add_timeout (GLib.MainContext async_context, uint interval, GLib.SourceFunc function, void* data);
 	[CCode (cheader_filename = "libsoup/soup.h")]
-	public static weak string base64_decode (string text, int out_len);
+	public static unowned string base64_decode (string text, int out_len);
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static int base64_decode_step (uchar[] @in, int len, uchar[] @out, int state, uint save);
 	[CCode (cheader_filename = "libsoup/soup.h")]
-	public static weak string base64_encode (string text, int len);
+	public static unowned string base64_encode (string text, int len);
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static int base64_encode_close (uchar[] @in, int inlen, bool break_lines, uchar[] @out, int state, int save);
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static int base64_encode_step (uchar[] @in, int len, bool break_lines, uchar[] @out, int state, int save);
 	[CCode (cheader_filename = "libsoup/soup.h")]
-	public static weak string date_generate (ulong when);
+	public static unowned string date_generate (ulong when);
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static ulong date_iso8601_parse (string timestamp);
 	[CCode (cheader_filename = "libsoup/soup.h")]
@@ -722,25 +722,25 @@
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static void gmtime (ulong when, void* tm);
 	[CCode (cheader_filename = "libsoup/soup.h")]
-	public static weak string header_param_copy_token (GLib.HashTable tokens, string t);
+	public static unowned string header_param_copy_token (GLib.HashTable tokens, string t);
 	[CCode (cheader_filename = "libsoup/soup.h")]
-	public static weak string header_param_decode_token (out weak string @in);
+	public static unowned string header_param_decode_token (out unowned string @in);
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static void header_param_destroy_hash (GLib.HashTable table);
 	[CCode (cheader_filename = "libsoup/soup.h")]
-	public static weak GLib.HashTable header_param_parse_list (string header);
+	public static unowned GLib.HashTable header_param_parse_list (string header);
 	[CCode (cheader_filename = "libsoup/soup.h")]
-	public static bool headers_parse_request (string str, int len, GLib.HashTable dest, out weak string req_method, out weak string req_path, Soup.HttpVersion ver);
+	public static bool headers_parse_request (string str, int len, GLib.HashTable dest, out unowned string req_method, out unowned string req_path, Soup.HttpVersion ver);
 	[CCode (cheader_filename = "libsoup/soup.h")]
-	public static bool headers_parse_response (string str, int len, GLib.HashTable dest, Soup.HttpVersion ver, uint status_code, out weak string reason_phrase);
+	public static bool headers_parse_response (string str, int len, GLib.HashTable dest, Soup.HttpVersion ver, uint status_code, out unowned string reason_phrase);
 	[CCode (cheader_filename = "libsoup/soup.h")]
-	public static bool headers_parse_status_line (string status_line, Soup.HttpVersion ver, uint status_code, out weak string reason_phrase);
+	public static bool headers_parse_status_line (string status_line, Soup.HttpVersion ver, uint status_code, out unowned string reason_phrase);
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static Soup.MethodId method_get_id (string method);
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static uint signal_connect_once (void* instance, string detailed_signal, GLib.Callback c_handler, void* data);
 	[CCode (cheader_filename = "libsoup/soup.h")]
-	public static weak string status_get_phrase (uint status_code);
+	public static unowned string status_get_phrase (uint status_code);
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static bool str_case_equal (void* v1, void* v2);
 	[CCode (cheader_filename = "libsoup/soup.h")]

Modified: trunk/vapi/libsoup-2.4.vapi
==============================================================================
--- trunk/vapi/libsoup-2.4.vapi	(original)
+++ trunk/vapi/libsoup-2.4.vapi	Wed Jan 14 22:44:41 2009
@@ -1,4 +1,4 @@
-/* libsoup-2.4.vapi generated by lt-vapigen, do not modify. */
+/* libsoup-2.4.vapi generated by vapigen, do not modify. */
 
 [CCode (cprefix = "Soup", lower_case_cprefix = "soup_")]
 namespace Soup {
@@ -10,8 +10,8 @@
 		public static bool equal_by_name (void* addr1, void* addr2);
 		[CCode (has_construct_function = false)]
 		public Address.from_sockaddr (void* sa, int len);
-		public weak string get_name ();
-		public weak string get_physical ();
+		public unowned string get_name ();
+		public unowned string get_physical ();
 		public uint get_port ();
 		public void* get_sockaddr (int len);
 		public static uint hash_by_ip (void* addr);
@@ -35,12 +35,12 @@
 	public class Auth : GLib.Object {
 		public virtual void authenticate (string username, string password);
 		public void free_protection_space (GLib.SList space);
-		public virtual weak string get_authorization (Soup.Message msg);
-		public weak string get_host ();
-		public weak string get_info ();
-		public virtual weak GLib.SList get_protection_space (Soup.URI source_uri);
-		public weak string get_realm ();
-		public weak string get_scheme_name ();
+		public virtual unowned string get_authorization (Soup.Message msg);
+		public unowned string get_host ();
+		public unowned string get_info ();
+		public virtual unowned GLib.SList get_protection_space (Soup.URI source_uri);
+		public unowned string get_realm ();
+		public unowned string get_scheme_name ();
 		[CCode (has_construct_function = false)]
 		public Auth (GLib.Type type, Soup.Message msg, string auth_header);
 		public virtual bool update (Soup.Message msg, string auth_header);
@@ -56,12 +56,12 @@
 	}
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public class AuthDomain : GLib.Object {
-		public virtual weak string accepts (Soup.Message msg);
+		public virtual unowned string accepts (Soup.Message msg);
 		public void add_path (string path);
-		public virtual weak string challenge (Soup.Message msg);
+		public virtual unowned string challenge (Soup.Message msg);
 		public virtual bool check_password (Soup.Message msg, string username, string password);
 		public bool covers (Soup.Message msg);
-		public weak string get_realm ();
+		public unowned string get_realm ();
 		public void remove_path (string path);
 		public void set_filter (Soup.AuthDomainFilter filter, void* filter_data, GLib.DestroyNotify dnotify);
 		public void set_generic_auth_callback (Soup.AuthDomainGenericAuthCallback auth_callback, void* auth_data, GLib.DestroyNotify dnotify);
@@ -91,7 +91,7 @@
 	}
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public class AuthDomainDigest : Soup.AuthDomain {
-		public static weak string encode_password (string username, string realm, string password);
+		public static unowned string encode_password (string username, string realm, string password);
 		[CCode (type = "SoupAuthDomain*", has_construct_function = false)]
 		public AuthDomainDigest (string optname1);
 		public static void set_auth_callback (Soup.AuthDomain domain, Soup.AuthDomainDigestAuthCallback callback, GLib.DestroyNotify dnotify);
@@ -105,7 +105,7 @@
 	public class Buffer {
 		public weak string data;
 		public size_t length;
-		public weak Soup.Buffer copy ();
+		public unowned Soup.Buffer copy ();
 		public void* get_owner ();
 		[CCode (has_construct_function = false)]
 		public Buffer (Soup.MemoryUse use, void* data, size_t length);
@@ -121,11 +121,11 @@
 	[Compact]
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public class ClientContext {
-		public weak Soup.Address get_address ();
-		public weak Soup.AuthDomain get_auth_domain ();
-		public weak string get_auth_user ();
-		public weak string get_host ();
-		public weak Soup.Socket get_socket ();
+		public unowned Soup.Address get_address ();
+		public unowned Soup.AuthDomain get_auth_domain ();
+		public unowned string get_auth_user ();
+		public unowned string get_host ();
+		public unowned Soup.Socket get_socket ();
 	}
 	[Compact]
 	[CCode (copy_function = "soup_cookie_copy", cheader_filename = "libsoup/soup.h")]
@@ -138,11 +138,11 @@
 		public bool secure;
 		public weak string value;
 		public bool applies_to_uri (Soup.URI uri);
-		public weak Soup.Cookie copy ();
+		public unowned Soup.Cookie copy ();
 		public bool equal (Soup.Cookie cookie2);
 		[CCode (has_construct_function = false)]
 		public Cookie (string name, string value, string domain, string path, int max_age);
-		public static weak Soup.Cookie parse (string header, Soup.URI origin);
+		public static unowned Soup.Cookie parse (string header, Soup.URI origin);
 		public void set_domain (string domain);
 		public void set_expires (Soup.Date expires);
 		public void set_http_only (bool http_only);
@@ -151,15 +151,15 @@
 		public void set_path (string path);
 		public void set_secure (bool secure);
 		public void set_value (string value);
-		public weak string to_cookie_header ();
-		public weak string to_set_cookie_header ();
+		public unowned string to_cookie_header ();
+		public unowned string to_set_cookie_header ();
 	}
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public class CookieJar : GLib.Object, Soup.SessionFeature {
 		public void add_cookie (Soup.Cookie cookie);
-		public weak GLib.SList all_cookies ();
+		public unowned GLib.SList all_cookies ();
 		public void delete_cookie (Soup.Cookie cookie);
-		public weak string get_cookies (Soup.URI uri, bool for_http);
+		public unowned string get_cookies (Soup.URI uri, bool for_http);
 		[CCode (has_construct_function = false)]
 		public CookieJar ();
 		public virtual void save ();
@@ -173,7 +173,7 @@
 		[CCode (type = "SoupCookieJar*", has_construct_function = false)]
 		public CookieJarText (string filename, bool read_only);
 		[NoAccessorMethod]
-		public string filename { get; construct; }
+		public string filename { owned get; construct; }
 	}
 	[Compact]
 	[CCode (copy_function = "soup_date_copy", cheader_filename = "libsoup/soup.h")]
@@ -186,7 +186,7 @@
 		public int second;
 		public bool utc;
 		public int year;
-		public weak Soup.Date copy ();
+		public unowned Soup.Date copy ();
 		[CCode (has_construct_function = false)]
 		public Date.from_now (int offset_seconds);
 		[CCode (has_construct_function = false)]
@@ -196,7 +196,7 @@
 		public bool is_past ();
 		[CCode (has_construct_function = false)]
 		public Date (int year, int month, int day, int hour, int minute, int second);
-		public weak string to_string (Soup.DateFormat format);
+		public unowned string to_string (Soup.DateFormat format);
 		public ulong to_time_t ();
 		public void to_timeval (GLib.TimeVal time);
 	}
@@ -218,10 +218,10 @@
 		public uint add_status_code_handler (string @signal, uint status_code, GLib.Callback callback);
 		[CCode (has_construct_function = false)]
 		public Message.from_uri (string method, Soup.URI uri);
-		public weak Soup.Address get_address ();
+		public unowned Soup.Address get_address ();
 		public Soup.MessageFlags get_flags ();
 		public Soup.HTTPVersion get_http_version ();
-		public weak Soup.URI get_uri ();
+		public unowned Soup.URI get_uri ();
 		public bool is_keepalive ();
 		[CCode (has_construct_function = false)]
 		public Message (string method, string uri_string);
@@ -236,9 +236,9 @@
 		public Soup.MessageFlags flags { get; set; }
 		public Soup.HTTPVersion http_version { get; set; }
 		[NoAccessorMethod]
-		public string method { get; set; }
+		public string method { owned get; set; }
 		[NoAccessorMethod]
-		public string reason_phrase { get; set; }
+		public string reason_phrase { owned get; set; }
 		[NoAccessorMethod]
 		public bool server_side { get; construct; }
 		[NoAccessorMethod]
@@ -275,9 +275,9 @@
 		public void append (Soup.MemoryUse use, void* data, size_t length);
 		public void append_buffer (Soup.Buffer buffer);
 		public void complete ();
-		public weak Soup.Buffer flatten ();
+		public unowned Soup.Buffer flatten ();
 		public bool get_accumulate ();
-		public weak Soup.Buffer get_chunk (int64 offset);
+		public unowned Soup.Buffer get_chunk (int64 offset);
 		public void got_chunk (Soup.Buffer chunk);
 		[CCode (has_construct_function = false)]
 		public MessageBody ();
@@ -292,14 +292,14 @@
 		public void clear ();
 		public void @foreach (Soup.MessageHeadersForeachFunc func);
 		public void free_ranges (Soup.Range ranges);
-		public weak string get (string name);
-		public bool get_content_disposition (out weak string disposition, GLib.HashTable params);
+		public unowned string get (string name);
+		public bool get_content_disposition (out unowned string disposition, GLib.HashTable params);
 		public int64 get_content_length ();
 		public bool get_content_range (int64 start, int64 end, int64 total_length);
-		public weak string get_content_type (GLib.HashTable params);
+		public unowned string get_content_type (GLib.HashTable params);
 		public Soup.Encoding get_encoding ();
 		public Soup.Expectation get_expectations ();
-		public bool get_ranges (int64 total_length, out weak Soup.Range ranges, int length);
+		public bool get_ranges (int64 total_length, out unowned Soup.Range ranges, int length);
 		[CCode (has_construct_function = false)]
 		public MessageHeaders (Soup.MessageHeadersType type);
 		public void remove (string name);
@@ -318,7 +318,7 @@
 	public class MessageHeadersIter {
 		public void* dummy;
 		public void init (Soup.MessageHeaders hdrs);
-		public bool next (out weak string name, out weak string value);
+		public bool next (out unowned string name, out unowned string value);
 	}
 	[Compact]
 	[CCode (cheader_filename = "libsoup/soup.h")]
@@ -329,7 +329,7 @@
 		[CCode (has_construct_function = false)]
 		public Multipart.from_message (Soup.MessageHeaders headers, Soup.MessageBody body);
 		public int get_length ();
-		public bool get_part (int part, out weak Soup.MessageHeaders headers, out weak Soup.Buffer body);
+		public bool get_part (int part, out unowned Soup.MessageHeaders headers, out unowned Soup.Buffer body);
 		[CCode (has_construct_function = false)]
 		public Multipart (string mime_type);
 		public void to_message (Soup.MessageHeaders dest_headers, Soup.MessageBody dest_body);
@@ -343,9 +343,9 @@
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public class Server : GLib.Object {
 		public void add_auth_domain (Soup.AuthDomain auth_domain);
-		public void add_handler (string path, Soup.ServerCallback# callback);
-		public weak GLib.MainContext get_async_context ();
-		public weak Soup.Socket get_listener ();
+		public void add_handler (string path, owned Soup.ServerCallback callback);
+		public unowned GLib.MainContext get_async_context ();
+		public unowned Soup.Socket get_listener ();
 		public uint get_port ();
 		public bool is_https ();
 		[CCode (has_construct_function = false)]
@@ -360,17 +360,17 @@
 		[NoAccessorMethod]
 		public void* async_context { get; construct; }
 		[NoAccessorMethod]
-		public Soup.Address @interface { get; construct; }
+		public Soup.Address @interface { owned get; construct; }
 		[NoAccessorMethod]
 		public uint port { get; construct; }
 		[NoAccessorMethod]
 		public bool raw_paths { get; construct; }
 		[NoAccessorMethod]
-		public string server_header { get; set construct; }
+		public string server_header { owned get; set construct; }
 		[NoAccessorMethod]
-		public string ssl_cert_file { get; construct; }
+		public string ssl_cert_file { owned get; construct; }
 		[NoAccessorMethod]
-		public string ssl_key_file { get; construct; }
+		public string ssl_key_file { owned get; construct; }
 		public virtual signal void request_aborted (Soup.Message msg, Soup.ClientContext client);
 		public virtual signal void request_finished (Soup.Message msg, Soup.ClientContext client);
 		public virtual signal void request_read (Soup.Message msg, Soup.ClientContext client);
@@ -380,15 +380,15 @@
 	public class Session : GLib.Object {
 		public void abort ();
 		public virtual void cancel_message (Soup.Message msg, uint status_code);
-		public weak GLib.MainContext get_async_context ();
+		public unowned GLib.MainContext get_async_context ();
 		public void pause_message (Soup.Message msg);
-		public virtual void queue_message (Soup.Message# msg, Soup.SessionCallback callback);
+		public virtual void queue_message (owned Soup.Message msg, Soup.SessionCallback callback);
 		public void remove_feature (Soup.SessionFeature feature);
 		public virtual void requeue_message (Soup.Message msg);
 		public virtual uint send_message (Soup.Message msg);
 		public void unpause_message (Soup.Message msg);
 		[NoAccessorMethod]
-		public Soup.SessionFeature add_feature { get; set; }
+		public Soup.SessionFeature add_feature { owned get; set; }
 		[NoAccessorMethod]
 		public GLib.Type add_feature_by_type { get; set; }
 		[NoAccessorMethod]
@@ -400,17 +400,17 @@
 		[NoAccessorMethod]
 		public int max_conns_per_host { get; set; }
 		[NoAccessorMethod]
-		public Soup.URI proxy_uri { get; set; }
+		public Soup.URI proxy_uri { owned get; set; }
 		[NoAccessorMethod]
 		public GLib.Type remove_feature_by_type { get; set; }
 		[NoAccessorMethod]
-		public string ssl_ca_file { get; set; }
+		public string ssl_ca_file { owned get; set; }
 		[NoAccessorMethod]
 		public uint timeout { get; set; }
 		[NoAccessorMethod]
 		public bool use_ntlm { get; set; }
 		[NoAccessorMethod]
-		public string user_agent { get; set; }
+		public string user_agent { owned get; set; }
 		public virtual signal void authenticate (Soup.Message msg, Soup.Auth auth, bool retrying);
 		public virtual signal void request_queued (Soup.Message p0);
 		public virtual signal void request_started (Soup.Message msg, Soup.Socket socket);
@@ -435,8 +435,8 @@
 		public void connect_async (GLib.Cancellable cancellable, Soup.SocketCallback callback);
 		public uint connect_sync (GLib.Cancellable cancellable);
 		public void disconnect ();
-		public weak Soup.Address get_local_address ();
-		public weak Soup.Address get_remote_address ();
+		public unowned Soup.Address get_local_address ();
+		public unowned Soup.Address get_remote_address ();
 		public bool is_connected ();
 		public bool is_ssl ();
 		public bool listen ();
@@ -502,7 +502,7 @@
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public interface ProxyResolver : Soup.SessionFeature, GLib.Object {
 		public abstract void get_proxy_async (Soup.Message msg, GLib.MainContext async_context, GLib.Cancellable cancellable, Soup.ProxyResolverCallback callback);
-		public abstract uint get_proxy_sync (Soup.Message msg, GLib.Cancellable cancellable, out weak Soup.Address addr);
+		public abstract uint get_proxy_sync (Soup.Message msg, GLib.Cancellable cancellable, out unowned Soup.Address addr);
 	}
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public interface SessionFeature : GLib.Object {
@@ -677,13 +677,13 @@
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public delegate bool AuthDomainBasicAuthCallback (Soup.AuthDomain domain, Soup.Message msg, string username, string password);
 	[CCode (cheader_filename = "libsoup/soup.h")]
-	public delegate weak string AuthDomainDigestAuthCallback (Soup.AuthDomain domain, Soup.Message msg, string username);
+	public delegate unowned string AuthDomainDigestAuthCallback (Soup.AuthDomain domain, Soup.Message msg, string username);
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public delegate bool AuthDomainFilter (Soup.AuthDomain domain, Soup.Message msg);
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public delegate bool AuthDomainGenericAuthCallback (Soup.AuthDomain domain, Soup.Message msg, string username);
 	[CCode (cheader_filename = "libsoup/soup.h")]
-	public delegate weak Soup.Buffer ChunkAllocator (Soup.Message msg, size_t max_len);
+	public delegate unowned Soup.Buffer ChunkAllocator (Soup.Message msg, size_t max_len);
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public delegate Soup.LoggerLogLevel LoggerFilter (Soup.Logger logger, Soup.Message msg);
 	[CCode (cheader_filename = "libsoup/soup.h")]
@@ -889,43 +889,43 @@
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const int XMLRPC_H;
 	[CCode (cheader_filename = "libsoup/soup.h")]
-	public static weak GLib.TimeoutSource add_completion (GLib.MainContext async_context, GLib.SourceFunc function, void* data);
+	public static unowned GLib.TimeoutSource add_completion (GLib.MainContext async_context, GLib.SourceFunc function, void* data);
 	[CCode (cheader_filename = "libsoup/soup.h")]
-	public static weak GLib.TimeoutSource add_idle (GLib.MainContext async_context, GLib.SourceFunc function, void* data);
+	public static unowned GLib.TimeoutSource add_idle (GLib.MainContext async_context, GLib.SourceFunc function, void* data);
 	[CCode (cheader_filename = "libsoup/soup.h")]
-	public static weak GLib.TimeoutSource add_timeout (GLib.MainContext async_context, uint interval, GLib.SourceFunc function, void* data);
+	public static unowned GLib.TimeoutSource add_timeout (GLib.MainContext async_context, uint interval, GLib.SourceFunc function, void* data);
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static void cookies_free (GLib.SList cookies);
 	[CCode (cheader_filename = "libsoup/soup.h")]
-	public static weak GLib.SList cookies_from_request (Soup.Message msg);
+	public static unowned GLib.SList cookies_from_request (Soup.Message msg);
 	[CCode (cheader_filename = "libsoup/soup.h")]
-	public static weak GLib.SList cookies_from_response (Soup.Message msg);
+	public static unowned GLib.SList cookies_from_response (Soup.Message msg);
 	[CCode (cheader_filename = "libsoup/soup.h")]
-	public static weak string cookies_to_cookie_header (GLib.SList cookies);
+	public static unowned string cookies_to_cookie_header (GLib.SList cookies);
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static void cookies_to_request (GLib.SList cookies, Soup.Message msg);
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static void cookies_to_response (GLib.SList cookies, Soup.Message msg);
 	[CCode (cheader_filename = "libsoup/soup.h")]
-	public static weak GLib.HashTable form_decode (string encoded_form);
+	public static unowned GLib.HashTable form_decode (string encoded_form);
 	[CCode (cheader_filename = "libsoup/soup.h")]
-	public static weak GLib.HashTable form_decode_multipart (Soup.Message msg, string file_control_name, out weak string filename, out weak string content_type, out weak Soup.Buffer file);
+	public static unowned GLib.HashTable form_decode_multipart (Soup.Message msg, string file_control_name, out unowned string filename, out unowned string content_type, out unowned Soup.Buffer file);
 	[CCode (cheader_filename = "libsoup/soup.h")]
-	public static weak string form_encode (...);
+	public static unowned string form_encode (...);
 	[CCode (cheader_filename = "libsoup/soup.h")]
-	public static weak string form_encode_datalist (void* form_data_set);
+	public static unowned string form_encode_datalist (void* form_data_set);
 	[CCode (cheader_filename = "libsoup/soup.h")]
-	public static weak string form_encode_hash (GLib.HashTable form_data_set);
+	public static unowned string form_encode_hash (GLib.HashTable form_data_set);
 	[CCode (cheader_filename = "libsoup/soup.h")]
-	public static weak string form_encode_valist (string first_field, void* args);
+	public static unowned string form_encode_valist (string first_field, void* args);
 	[CCode (cheader_filename = "libsoup/soup.h")]
-	public static weak Soup.Message form_request_new (string method, string uri, ...);
+	public static unowned Soup.Message form_request_new (string method, string uri, ...);
 	[CCode (cheader_filename = "libsoup/soup.h")]
-	public static weak Soup.Message form_request_new_from_datalist (string method, string uri, void* form_data_set);
+	public static unowned Soup.Message form_request_new_from_datalist (string method, string uri, void* form_data_set);
 	[CCode (cheader_filename = "libsoup/soup.h")]
-	public static weak Soup.Message form_request_new_from_hash (string method, string uri, GLib.HashTable form_data_set);
+	public static unowned Soup.Message form_request_new_from_hash (string method, string uri, GLib.HashTable form_data_set);
 	[CCode (cheader_filename = "libsoup/soup.h")]
-	public static weak Soup.Message form_request_new_from_multipart (string uri, Soup.Multipart multipart);
+	public static unowned Soup.Message form_request_new_from_multipart (string uri, Soup.Multipart multipart);
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static bool header_contains (string header, string token);
 	[CCode (cheader_filename = "libsoup/soup.h")]
@@ -935,27 +935,27 @@
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static void header_g_string_append_param (GLib.StringBuilder str, string name, string value);
 	[CCode (cheader_filename = "libsoup/soup.h")]
-	public static weak GLib.SList header_parse_list (string header);
+	public static unowned GLib.SList header_parse_list (string header);
 	[CCode (cheader_filename = "libsoup/soup.h")]
-	public static weak GLib.HashTable header_parse_param_list (string header);
+	public static unowned GLib.HashTable header_parse_param_list (string header);
 	[CCode (cheader_filename = "libsoup/soup.h")]
-	public static weak GLib.SList header_parse_quality_list (string header, GLib.SList unacceptable);
+	public static unowned GLib.SList header_parse_quality_list (string header, GLib.SList unacceptable);
 	[CCode (cheader_filename = "libsoup/soup.h")]
-	public static weak GLib.HashTable header_parse_semi_param_list (string header);
+	public static unowned GLib.HashTable header_parse_semi_param_list (string header);
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static bool headers_parse (string str, int len, Soup.MessageHeaders dest);
 	[CCode (cheader_filename = "libsoup/soup.h")]
-	public static uint headers_parse_request (string str, int len, Soup.MessageHeaders req_headers, out weak string req_method, out weak string req_path, Soup.HTTPVersion ver);
+	public static uint headers_parse_request (string str, int len, Soup.MessageHeaders req_headers, out unowned string req_method, out unowned string req_path, Soup.HTTPVersion ver);
 	[CCode (cheader_filename = "libsoup/soup.h")]
-	public static bool headers_parse_response (string str, int len, Soup.MessageHeaders headers, Soup.HTTPVersion ver, uint status_code, out weak string reason_phrase);
+	public static bool headers_parse_response (string str, int len, Soup.MessageHeaders headers, Soup.HTTPVersion ver, uint status_code, out unowned string reason_phrase);
 	[CCode (cheader_filename = "libsoup/soup.h")]
-	public static bool headers_parse_status_line (string status_line, Soup.HTTPVersion ver, uint status_code, out weak string reason_phrase);
+	public static bool headers_parse_status_line (string status_line, Soup.HTTPVersion ver, uint status_code, out unowned string reason_phrase);
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static GLib.Quark http_error_quark ();
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static GLib.Quark ssl_error_quark ();
 	[CCode (cheader_filename = "libsoup/soup.h")]
-	public static weak string status_get_phrase (uint status_code);
+	public static unowned string status_get_phrase (uint status_code);
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static uint status_proxify (uint status_code);
 	[CCode (cheader_filename = "libsoup/soup.h")]
@@ -967,15 +967,15 @@
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static void value_array_append_vals (GLib.ValueArray array, ...);
 	[CCode (cheader_filename = "libsoup/soup.h")]
-	public static weak GLib.ValueArray value_array_from_args (void* args);
+	public static unowned GLib.ValueArray value_array_from_args (void* args);
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static bool value_array_get_nth (GLib.ValueArray array, uint index_, GLib.Type type);
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static void value_array_insert (GLib.ValueArray array, uint index_, GLib.Type type);
 	[CCode (cheader_filename = "libsoup/soup.h")]
-	public static weak GLib.ValueArray value_array_new ();
+	public static unowned GLib.ValueArray value_array_new ();
 	[CCode (cheader_filename = "libsoup/soup.h")]
-	public static weak GLib.ValueArray value_array_new_with_vals (...);
+	public static unowned GLib.ValueArray value_array_new_with_vals (...);
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static bool value_array_to_args (GLib.ValueArray array, void* args);
 	[CCode (cheader_filename = "libsoup/soup.h")]
@@ -989,29 +989,29 @@
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static bool value_hash_lookup_vals (GLib.HashTable hash, ...);
 	[CCode (cheader_filename = "libsoup/soup.h")]
-	public static weak GLib.HashTable value_hash_new ();
+	public static unowned GLib.HashTable value_hash_new ();
 	[CCode (cheader_filename = "libsoup/soup.h")]
-	public static weak GLib.HashTable value_hash_new_with_vals (...);
+	public static unowned GLib.HashTable value_hash_new_with_vals (...);
 	[CCode (cheader_filename = "libsoup/soup.h")]
-	public static weak string xmlrpc_build_fault (int fault_code, string fault_format);
+	public static unowned string xmlrpc_build_fault (int fault_code, string fault_format);
 	[CCode (cheader_filename = "libsoup/soup.h")]
-	public static weak string xmlrpc_build_method_call (string method_name, GLib.Value[] params);
+	public static unowned string xmlrpc_build_method_call (string method_name, GLib.Value[] params);
 	[CCode (cheader_filename = "libsoup/soup.h")]
-	public static weak string xmlrpc_build_method_response (GLib.Value value);
+	public static unowned string xmlrpc_build_method_response (GLib.Value value);
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static GLib.Quark xmlrpc_error_quark ();
 	[CCode (cheader_filename = "libsoup/soup.h")]
-	public static bool xmlrpc_extract_method_call (string method_call, int length, out weak string method_name);
+	public static bool xmlrpc_extract_method_call (string method_call, int length, out unowned string method_name);
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static bool xmlrpc_extract_method_response (string method_response, int length, GLib.Type type) throws GLib.Error;
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static GLib.Quark xmlrpc_fault_quark ();
 	[CCode (cheader_filename = "libsoup/soup.h")]
-	public static bool xmlrpc_parse_method_call (string method_call, int length, out weak string method_name, out weak GLib.ValueArray params);
+	public static bool xmlrpc_parse_method_call (string method_call, int length, out unowned string method_name, out unowned GLib.ValueArray params);
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static bool xmlrpc_parse_method_response (string method_response, int length, GLib.Value value) throws GLib.Error;
 	[CCode (cheader_filename = "libsoup/soup.h")]
-	public static weak Soup.Message xmlrpc_request_new (string uri, string method_name);
+	public static unowned Soup.Message xmlrpc_request_new (string uri, string method_name);
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static void xmlrpc_set_fault (Soup.Message msg, int fault_code, string fault_format);
 	[CCode (cheader_filename = "libsoup/soup.h")]

Modified: trunk/vapi/libwnck-1.0.vapi
==============================================================================
--- trunk/vapi/libwnck-1.0.vapi	(original)
+++ trunk/vapi/libwnck-1.0.vapi	Wed Jan 14 22:44:41 2009
@@ -1,4 +1,4 @@
-/* libwnck-1.0.vapi generated by lt-vapigen, do not modify. */
+/* libwnck-1.0.vapi generated by vapigen, do not modify. */
 
 [CCode (cprefix = "Wnck", lower_case_cprefix = "wnck_")]
 namespace Wnck {
@@ -19,16 +19,16 @@
 	}
 	[CCode (cheader_filename = "libwnck/libwnck.h")]
 	public class Application : GLib.Object {
-		public static weak Wnck.Application get (ulong xwindow);
-		public weak Gdk.Pixbuf get_icon ();
+		public static unowned Wnck.Application get (ulong xwindow);
+		public unowned Gdk.Pixbuf get_icon ();
 		public bool get_icon_is_fallback ();
-		public weak string get_icon_name ();
-		public weak Gdk.Pixbuf get_mini_icon ();
+		public unowned string get_icon_name ();
+		public unowned Gdk.Pixbuf get_mini_icon ();
 		public int get_n_windows ();
-		public weak string get_name ();
+		public unowned string get_name ();
 		public int get_pid ();
-		public weak string get_startup_id ();
-		public weak GLib.List get_windows ();
+		public unowned string get_startup_id ();
+		public unowned GLib.List get_windows ();
 		public ulong get_xid ();
 		[NoWrapper]
 		public virtual void pad1 ();
@@ -43,12 +43,12 @@
 	}
 	[CCode (cheader_filename = "libwnck/libwnck.h")]
 	public class ClassGroup : GLib.Object {
-		public static weak Wnck.ClassGroup get (string res_class);
-		public weak Gdk.Pixbuf get_icon ();
-		public weak Gdk.Pixbuf get_mini_icon ();
-		public weak string get_name ();
-		public weak string get_res_class ();
-		public weak GLib.List get_windows ();
+		public static unowned Wnck.ClassGroup get (string res_class);
+		public unowned Gdk.Pixbuf get_icon ();
+		public unowned Gdk.Pixbuf get_mini_icon ();
+		public unowned string get_name ();
+		public unowned string get_res_class ();
+		public unowned GLib.List get_windows ();
 		[NoWrapper]
 		public virtual void pad1 ();
 		[NoWrapper]
@@ -110,25 +110,25 @@
 		public void change_workspace_count (int count);
 		public void force_update ();
 		public static void free_workspace_layout (Wnck.WorkspaceLayout layout);
-		public static weak Wnck.Screen get (int index);
-		public weak Wnck.Window get_active_window ();
-		public weak Wnck.Workspace get_active_workspace ();
+		public static unowned Wnck.Screen get (int index);
+		public unowned Wnck.Window get_active_window ();
+		public unowned Wnck.Workspace get_active_workspace ();
 		public ulong get_background_pixmap ();
-		public static weak Wnck.Screen get_default ();
-		public static weak Wnck.Screen get_for_root (ulong root_window_id);
+		public static unowned Wnck.Screen get_default ();
+		public static unowned Wnck.Screen get_for_root (ulong root_window_id);
 		public int get_height ();
 		public int get_number ();
-		public weak Wnck.Window get_previously_active_window ();
+		public unowned Wnck.Window get_previously_active_window ();
 		public bool get_showing_desktop ();
 		public int get_width ();
-		public weak string get_window_manager_name ();
-		public weak GLib.List get_windows ();
-		public weak GLib.List get_windows_stacked ();
-		public weak Wnck.Workspace get_workspace (int workspace);
+		public unowned string get_window_manager_name ();
+		public unowned GLib.List get_windows ();
+		public unowned GLib.List get_windows_stacked ();
+		public unowned Wnck.Workspace get_workspace (int workspace);
 		public int get_workspace_count ();
 		public int get_workspace_index (Wnck.Workspace space);
-		public weak Wnck.Workspace get_workspace_neighbor (Wnck.Workspace space, Wnck.MotionDirection direction);
-		public weak GLib.List get_workspaces ();
+		public unowned Wnck.Workspace get_workspace_neighbor (Wnck.Workspace space, Wnck.MotionDirection direction);
+		public unowned GLib.List get_workspaces ();
 		public void move_viewport (int x, int y);
 		public bool net_wm_supports (string atom);
 		[NoWrapper]
@@ -200,30 +200,30 @@
 	}
 	[CCode (cheader_filename = "libwnck/libwnck.h")]
 	public class Window : GLib.Object {
-		public void activate (uint timestamp);
-		public void activate_transient (uint timestamp);
-		public void close (uint timestamp);
-		public static weak Wnck.Window get (ulong xwindow);
+		public void activate (uint32 timestamp);
+		public void activate_transient (uint32 timestamp);
+		public void close (uint32 timestamp);
+		public static unowned Wnck.Window get (ulong xwindow);
 		public Wnck.WindowActions get_actions ();
-		public weak Wnck.Application get_application ();
-		public weak Wnck.ClassGroup get_class_group ();
+		public unowned Wnck.Application get_application ();
+		public unowned Wnck.ClassGroup get_class_group ();
 		public void get_client_window_geometry (int xp, int yp, int widthp, int heightp);
 		public void get_geometry (int xp, int yp, int widthp, int heightp);
 		public ulong get_group_leader ();
-		public weak Gdk.Pixbuf get_icon ();
+		public unowned Gdk.Pixbuf get_icon ();
 		public bool get_icon_is_fallback ();
-		public weak string get_icon_name ();
-		public weak Gdk.Pixbuf get_mini_icon ();
-		public weak string get_name ();
+		public unowned string get_icon_name ();
+		public unowned Gdk.Pixbuf get_mini_icon ();
+		public unowned string get_name ();
 		public int get_pid ();
-		public weak Wnck.Screen get_screen ();
-		public weak string get_session_id ();
-		public weak string get_session_id_utf8 ();
+		public unowned Wnck.Screen get_screen ();
+		public unowned string get_session_id ();
+		public unowned string get_session_id_utf8 ();
 		public int get_sort_order ();
 		public Wnck.WindowState get_state ();
-		public weak Wnck.Window get_transient ();
+		public unowned Wnck.Window get_transient ();
 		public Wnck.WindowType get_window_type ();
-		public weak Wnck.Workspace get_workspace ();
+		public unowned Wnck.Workspace get_workspace ();
 		public ulong get_xid ();
 		public bool has_icon_name ();
 		public bool has_name ();
@@ -279,7 +279,7 @@
 		public void unmaximize ();
 		public void unmaximize_horizontally ();
 		public void unmaximize_vertically ();
-		public void unminimize (uint timestamp);
+		public void unminimize (uint32 timestamp);
 		public void unpin ();
 		public void unshade ();
 		public void unstick ();
@@ -292,15 +292,15 @@
 	}
 	[CCode (cheader_filename = "libwnck/libwnck.h")]
 	public class Workspace : GLib.Object {
-		public void activate (uint timestamp);
+		public void activate (uint32 timestamp);
 		public void change_name (string name);
 		public int get_height ();
 		public int get_layout_column ();
 		public int get_layout_row ();
-		public weak string get_name ();
-		public weak Wnck.Workspace get_neighbor (Wnck.MotionDirection direction);
+		public unowned string get_name ();
+		public unowned Wnck.Workspace get_neighbor (Wnck.MotionDirection direction);
 		public int get_number ();
-		public weak Wnck.Screen get_screen ();
+		public unowned Wnck.Screen get_screen ();
 		public int get_viewport_x ();
 		public int get_viewport_y ();
 		public int get_width ();
@@ -422,9 +422,9 @@
 		SPLASHSCREEN
 	}
 	[CCode (cheader_filename = "libwnck/libwnck.h")]
-	public delegate weak Gdk.Pixbuf LoadIconFunction (string icon_name, int size, uint flags);
+	public delegate unowned Gdk.Pixbuf LoadIconFunction (string icon_name, int size, uint flags);
 	[CCode (cheader_filename = "libwnck/libwnck.h")]
-	public static weak Gtk.Widget create_window_action_menu (Wnck.Window window);
+	public static unowned Gtk.Widget create_window_action_menu (Wnck.Window window);
 	[CCode (cheader_filename = "libwnck/libwnck.h")]
 	public static void gtk_window_set_dock_type (Gtk.Window window);
 	[CCode (cheader_filename = "libwnck/libwnck.h")]

Modified: trunk/vapi/pango.vapi
==============================================================================
--- trunk/vapi/pango.vapi	(original)
+++ trunk/vapi/pango.vapi	Wed Jan 14 22:44:41 2009
@@ -1,4 +1,4 @@
-/* pango.vapi generated by lt-vapigen, do not modify. */
+/* pango.vapi generated by vapigen, do not modify. */
 
 [CCode (cprefix = "Pango", lower_case_cprefix = "pango_")]
 namespace Pango {
@@ -148,13 +148,13 @@
 	[CCode (ref_function = "pango_coverage_ref", unref_function = "pango_coverage_unref", cheader_filename = "pango/pango.h")]
 	public class Coverage {
 		public unowned Pango.Coverage copy ();
-		public static unowned Pango.Coverage from_bytes (uchar[][] bytes);
+		public static unowned Pango.Coverage from_bytes (uchar[] bytes);
 		public Pango.CoverageLevel get (int index_);
 		public void max (Pango.Coverage other);
 		[CCode (has_construct_function = false)]
 		public Coverage ();
 		public void set (int index_, Pango.CoverageLevel level);
-		public void to_bytes (uchar[][] bytes);
+		public void to_bytes (uchar[] bytes);
 	}
 	[Compact]
 	[CCode (cheader_filename = "pango/pango.h")]

Modified: trunk/vapi/poppler-glib.vapi
==============================================================================
--- trunk/vapi/poppler-glib.vapi	(original)
+++ trunk/vapi/poppler-glib.vapi	Wed Jan 14 22:44:41 2009
@@ -1,4 +1,4 @@
-/* poppler-glib.vapi generated by lt-vapigen, do not modify. */
+/* poppler-glib.vapi generated by vapigen, do not modify. */
 
 [CCode (cprefix = "Poppler", lower_case_cprefix = "poppler_")]
 namespace Poppler {
@@ -13,7 +13,7 @@
 		public weak Poppler.ActionNamed named;
 		public Poppler.ActionType type;
 		public weak Poppler.ActionUri uri;
-		public weak Poppler.Action copy ();
+		public unowned Poppler.Action copy ();
 	}
 	[Compact]
 	[CCode (cheader_filename = "poppler.h")]
@@ -71,7 +71,7 @@
 		public weak string description;
 		public GLib.Time mtime;
 		public weak string name;
-		public ulong size;
+		public size_t size;
 		public bool save (string filename) throws GLib.Error;
 		public bool save_to_callback (Poppler.AttachmentSaveFunc save_func) throws GLib.Error;
 	}
@@ -89,36 +89,36 @@
 		public double top;
 		public Poppler.DestType type;
 		public double zoom;
-		public weak Poppler.Dest copy ();
+		public unowned Poppler.Dest copy ();
 	}
 	[CCode (cheader_filename = "poppler.h")]
 	public class Document : GLib.Object {
-		public weak Poppler.Dest find_dest (string link_name);
+		public unowned Poppler.Dest find_dest (string link_name);
 		[CCode (has_construct_function = false)]
 		public Document.from_data (string data, int length, string password) throws GLib.Error;
 		[CCode (has_construct_function = false)]
 		public Document.from_file (string uri, string? password) throws GLib.Error;
-		public weak GLib.List get_attachments ();
-		public weak Poppler.FormField get_form_field (int id);
+		public unowned GLib.List get_attachments ();
+		public unowned Poppler.FormField get_form_field (int id);
 		public int get_n_pages ();
-		public weak Poppler.Page get_page (int index);
-		public weak Poppler.Page get_page_by_label (string label);
+		public unowned Poppler.Page get_page (int index);
+		public unowned Poppler.Page get_page_by_label (string label);
 		public bool has_attachments ();
 		public bool save (string uri) throws GLib.Error;
 		[NoAccessorMethod]
-		public string author { get; }
+		public string author { owned get; }
 		[NoAccessorMethod]
 		public int creation_date { get; }
 		[NoAccessorMethod]
-		public string creator { get; }
+		public string creator { owned get; }
 		[NoAccessorMethod]
-		public string format { get; }
+		public string format { owned get; }
 		[NoAccessorMethod]
-		public string keywords { get; }
+		public string keywords { owned get; }
 		[NoAccessorMethod]
-		public string linearized { get; }
+		public string linearized { owned get; }
 		[NoAccessorMethod]
-		public string metadata { get; }
+		public string metadata { owned get; }
 		[NoAccessorMethod]
 		public int mod_date { get; }
 		[NoAccessorMethod]
@@ -128,11 +128,11 @@
 		[NoAccessorMethod]
 		public Poppler.Permissions permissions { get; }
 		[NoAccessorMethod]
-		public string producer { get; }
+		public string producer { owned get; }
 		[NoAccessorMethod]
-		public string subject { get; }
+		public string subject { owned get; }
 		[NoAccessorMethod]
-		public string title { get; }
+		public string title { owned get; }
 		[NoAccessorMethod]
 		public Poppler.ViewerPreferences viewer_preferences { get; }
 	}
@@ -141,16 +141,16 @@
 		public void free ();
 		[CCode (has_construct_function = false)]
 		public FontInfo (Poppler.Document document);
-		public bool scan (int n_pages, out weak Poppler.FontsIter iter);
+		public bool scan (int n_pages, out unowned Poppler.FontsIter iter);
 	}
 	[Compact]
 	[CCode (copy_function = "poppler_fonts_iter_copy", cheader_filename = "poppler.h")]
 	public class FontsIter {
-		public weak Poppler.FontsIter copy ();
-		public weak string get_file_name ();
+		public unowned Poppler.FontsIter copy ();
+		public unowned string get_file_name ();
 		public Poppler.FontType get_font_type ();
-		public weak string get_full_name ();
-		public weak string get_name ();
+		public unowned string get_full_name ();
+		public unowned string get_name ();
 		public bool is_embedded ();
 		public bool is_subset ();
 		public bool next ();
@@ -164,9 +164,9 @@
 		public bool choice_commit_on_change ();
 		public bool choice_do_spell_check ();
 		public Poppler.FormChoiceType choice_get_choice_type ();
-		public weak string choice_get_item (int index);
+		public unowned string choice_get_item (int index);
 		public int choice_get_n_items ();
-		public weak string choice_get_text ();
+		public unowned string choice_get_text ();
 		public bool choice_is_editable ();
 		public bool choice_is_item_selected (int index);
 		public void choice_select_item (int index);
@@ -180,7 +180,7 @@
 		public bool text_do_scroll ();
 		public bool text_do_spell_check ();
 		public int text_get_max_len ();
-		public weak string text_get_text ();
+		public unowned string text_get_text ();
 		public Poppler.FormTextType text_get_text_type ();
 		public bool text_is_password ();
 		public bool text_is_rich_text ();
@@ -191,7 +191,7 @@
 	public class FormFieldMapping {
 		public weak Poppler.Rectangle area;
 		public weak Poppler.FormField field;
-		public weak Poppler.FormFieldMapping copy ();
+		public unowned Poppler.FormFieldMapping copy ();
 		[CCode (has_construct_function = false)]
 		public FormFieldMapping ();
 	}
@@ -200,16 +200,16 @@
 	public class ImageMapping {
 		public weak Poppler.Rectangle area;
 		public weak Gdk.Pixbuf image;
-		public weak Poppler.ImageMapping copy ();
+		public unowned Poppler.ImageMapping copy ();
 		[CCode (has_construct_function = false)]
 		public ImageMapping ();
 	}
 	[Compact]
 	[CCode (copy_function = "poppler_index_iter_copy", cheader_filename = "poppler.h")]
 	public class IndexIter {
-		public weak Poppler.IndexIter copy ();
-		public weak Poppler.Action get_action ();
-		public weak Poppler.IndexIter get_child ();
+		public unowned Poppler.IndexIter copy ();
+		public unowned Poppler.Action get_action ();
+		public unowned Poppler.IndexIter get_child ();
 		public bool is_open ();
 		[CCode (has_construct_function = false)]
 		public IndexIter (Poppler.Document document);
@@ -220,7 +220,7 @@
 	public class LinkMapping {
 		public weak Poppler.Action action;
 		public weak Poppler.Rectangle area;
-		public weak Poppler.LinkMapping copy ();
+		public unowned Poppler.LinkMapping copy ();
 		[CCode (has_construct_function = false)]
 		public LinkMapping ();
 	}
@@ -234,29 +234,29 @@
 	}
 	[CCode (cheader_filename = "poppler.h")]
 	public class Page : GLib.Object {
-		public weak GLib.List find_text (string text);
+		public unowned GLib.List find_text (string text);
 		public static void free_form_field_mapping (GLib.List list);
 		public static void free_image_mapping (GLib.List list);
 		public static void free_link_mapping (GLib.List list);
 		public void get_crop_box (Poppler.Rectangle rect);
 		public double get_duration ();
-		public weak GLib.List get_form_field_mapping ();
-		public weak GLib.List get_image_mapping ();
+		public unowned GLib.List get_form_field_mapping ();
+		public unowned GLib.List get_image_mapping ();
 		public int get_index ();
-		public weak GLib.List get_link_mapping ();
-		public weak Gdk.Region get_selection_region (double scale, Poppler.SelectionStyle style, Poppler.Rectangle selection);
+		public unowned GLib.List get_link_mapping ();
+		public unowned Gdk.Region get_selection_region (double scale, Poppler.SelectionStyle style, Poppler.Rectangle selection);
 		public void get_size (out double width, out double height);
-		public weak string get_text (Poppler.SelectionStyle style, Poppler.Rectangle rect);
-		public weak Gdk.Pixbuf get_thumbnail ();
+		public unowned string get_text (Poppler.SelectionStyle style, Poppler.Rectangle rect);
+		public unowned Gdk.Pixbuf get_thumbnail ();
 		public bool get_thumbnail_size (int width, int height);
-		public weak Poppler.PageTransition get_transition ();
+		public unowned Poppler.PageTransition get_transition ();
 		public void render (Cairo.Context cairo);
 		public void render_selection (Cairo.Context cairo, Poppler.Rectangle selection, Poppler.Rectangle old_selection, Poppler.SelectionStyle style, Gdk.Color glyph_color, Gdk.Color background_color);
 		public void render_selection_to_pixbuf (double scale, int rotation, Gdk.Pixbuf pixbuf, Poppler.Rectangle selection, Poppler.Rectangle old_selection, Poppler.SelectionStyle style, Gdk.Color glyph_color, Gdk.Color background_color);
 		public void render_to_pixbuf (int src_x, int src_y, int src_width, int src_height, double scale, int rotation, Gdk.Pixbuf pixbuf);
 		public void render_to_ps (Poppler.PSFile ps_file);
 		[NoAccessorMethod]
-		public string label { get; }
+		public string label { owned get; }
 	}
 	[Compact]
 	[CCode (copy_function = "poppler_page_transition_copy", cheader_filename = "poppler.h")]
@@ -268,7 +268,7 @@
 		public bool rectangular;
 		public double scale;
 		public Poppler.PageTransitionType type;
-		public weak Poppler.PageTransition copy ();
+		public unowned Poppler.PageTransition copy ();
 		[CCode (has_construct_function = false)]
 		public PageTransition ();
 	}
@@ -279,7 +279,7 @@
 		public double x2;
 		public double y1;
 		public double y2;
-		public weak Poppler.Rectangle copy ();
+		public unowned Poppler.Rectangle copy ();
 		[CCode (has_construct_function = false)]
 		public Rectangle ();
 	}
@@ -437,7 +437,7 @@
 		DIRECTION_RTL
 	}
 	[CCode (cheader_filename = "poppler.h")]
-	public static delegate bool AttachmentSaveFunc (string buf, ulong count, void* data, GLib.Error error);
+	public static delegate bool AttachmentSaveFunc (string buf, size_t count, void* data, GLib.Error error);
 	[CCode (cheader_filename = "poppler.h")]
 	public const int HAS_CAIRO;
 	[CCode (cheader_filename = "poppler.h")]
@@ -445,5 +445,5 @@
 	[CCode (cheader_filename = "poppler.h")]
 	public static Poppler.Backend get_backend ();
 	[CCode (cheader_filename = "poppler.h")]
-	public static weak string get_version ();
+	public static unowned string get_version ();
 }

Modified: trunk/vapi/webkit-1.0.vapi
==============================================================================
--- trunk/vapi/webkit-1.0.vapi	(original)
+++ trunk/vapi/webkit-1.0.vapi	Wed Jan 14 22:44:41 2009
@@ -1,10 +1,10 @@
-/* webkit-1.0.vapi generated by lt-vapigen, do not modify. */
+/* webkit-1.0.vapi generated by vapigen, do not modify. */
 
 [CCode (cprefix = "WebKit", lower_case_cprefix = "webkit_")]
 namespace WebKit {
 	[CCode (cheader_filename = "webkit/webkit.h")]
 	public class NetworkRequest : GLib.Object {
-		public weak string get_uri ();
+		public unowned string get_uri ();
 		[CCode (has_construct_function = false)]
 		public NetworkRequest (string uri);
 		public void set_uri (string uri);
@@ -12,15 +12,15 @@
 	[CCode (cheader_filename = "webkit/webkit.h")]
 	public class WebBackForwardList : GLib.Object {
 		public bool contains_item (WebKit.WebHistoryItem history_item);
-		public weak WebKit.WebHistoryItem get_back_item ();
+		public unowned WebKit.WebHistoryItem get_back_item ();
 		public int get_back_length ();
-		public weak GLib.List get_back_list_with_limit (int limit);
-		public weak WebKit.WebHistoryItem get_current_item ();
-		public weak WebKit.WebHistoryItem get_forward_item ();
+		public unowned GLib.List get_back_list_with_limit (int limit);
+		public unowned WebKit.WebHistoryItem get_current_item ();
+		public unowned WebKit.WebHistoryItem get_forward_item ();
 		public int get_forward_length ();
-		public weak GLib.List get_forward_list_with_limit (int limit);
+		public unowned GLib.List get_forward_list_with_limit (int limit);
 		public int get_limit ();
-		public weak WebKit.WebHistoryItem get_nth_item (int index);
+		public unowned WebKit.WebHistoryItem get_nth_item (int index);
 		public void go_back ();
 		public void go_forward ();
 		public void go_to_item (WebKit.WebHistoryItem history_item);
@@ -30,12 +30,12 @@
 	}
 	[CCode (cheader_filename = "webkit/webkit.h")]
 	public class WebFrame : GLib.Object {
-		public weak WebKit.WebFrame find_frame (string name);
-		public weak string get_name ();
-		public weak WebKit.WebFrame get_parent ();
-		public weak string get_title ();
-		public weak string get_uri ();
-		public weak WebKit.WebView get_web_view ();
+		public unowned WebKit.WebFrame find_frame (string name);
+		public unowned string get_name ();
+		public unowned WebKit.WebFrame get_parent ();
+		public unowned string get_title ();
+		public unowned string get_uri ();
+		public unowned WebKit.WebView get_web_view ();
 		public void load_request (WebKit.NetworkRequest request);
 		[CCode (has_construct_function = false)]
 		public WebFrame (WebKit.WebView web_view);
@@ -52,11 +52,11 @@
 	}
 	[CCode (cheader_filename = "webkit/webkit.h")]
 	public class WebHistoryItem : GLib.Object {
-		public weak string get_alternate_title ();
+		public unowned string get_alternate_title ();
 		public double get_last_visited_time ();
-		public weak string get_original_uri ();
-		public weak string get_title ();
-		public weak string get_uri ();
+		public unowned string get_original_uri ();
+		public unowned string get_title ();
+		public unowned string get_uri ();
 		[CCode (has_construct_function = false)]
 		public WebHistoryItem ();
 		public void set_alternate_title (string title);
@@ -65,7 +65,7 @@
 	}
 	[CCode (cheader_filename = "webkit/webkit.h")]
 	public class WebSettings : GLib.Object {
-		public weak WebKit.WebSettings copy ();
+		public unowned WebKit.WebSettings copy ();
 		[CCode (has_construct_function = false)]
 		public WebSettings ();
 		[NoAccessorMethod]
@@ -73,11 +73,11 @@
 		[NoAccessorMethod]
 		public bool auto_shrink_images { get; set construct; }
 		[NoAccessorMethod]
-		public string cursive_font_family { get; set construct; }
+		public string cursive_font_family { owned get; set construct; }
 		[NoAccessorMethod]
-		public string default_encoding { get; set construct; }
+		public string default_encoding { owned get; set construct; }
 		[NoAccessorMethod]
-		public string default_font_family { get; set construct; }
+		public string default_font_family { owned get; set construct; }
 		[NoAccessorMethod]
 		public int default_font_size { get; set construct; }
 		[NoAccessorMethod]
@@ -87,23 +87,23 @@
 		[NoAccessorMethod]
 		public bool enable_scripts { get; set construct; }
 		[NoAccessorMethod]
-		public string fantasy_font_family { get; set construct; }
+		public string fantasy_font_family { owned get; set construct; }
 		[NoAccessorMethod]
 		public int minimum_font_size { get; set construct; }
 		[NoAccessorMethod]
 		public int minimum_logical_font_size { get; set construct; }
 		[NoAccessorMethod]
-		public string monospace_font_family { get; set construct; }
+		public string monospace_font_family { owned get; set construct; }
 		[NoAccessorMethod]
 		public bool print_backgrounds { get; set construct; }
 		[NoAccessorMethod]
 		public bool resizable_text_areas { get; set construct; }
 		[NoAccessorMethod]
-		public string sans_serif_font_family { get; set construct; }
+		public string sans_serif_font_family { owned get; set construct; }
 		[NoAccessorMethod]
-		public string serif_font_family { get; set construct; }
+		public string serif_font_family { owned get; set construct; }
 		[NoAccessorMethod]
-		public string user_stylesheet_uri { get; set construct; }
+		public string user_stylesheet_uri { owned get; set construct; }
 	}
 	[CCode (cheader_filename = "webkit/webkit.h")]
 	public class WebView : Gtk.Container, Atk.Implementor, Gtk.Buildable {
@@ -115,18 +115,18 @@
 		public bool can_go_forward ();
 		public bool can_paste_clipboard ();
 		[NoWrapper]
-		public virtual weak string choose_file (WebKit.WebFrame frame, string old_file);
+		public virtual unowned string choose_file (WebKit.WebFrame frame, string old_file);
 		[NoWrapper]
-		public virtual weak WebKit.WebView create_web_view ();
+		public virtual unowned WebKit.WebView create_web_view ();
 		public void delete_selection ();
 		public void execute_script (string script);
-		public weak WebKit.WebBackForwardList get_back_forward_list ();
-		public weak Gtk.TargetList get_copy_target_list ();
+		public unowned WebKit.WebBackForwardList get_back_forward_list ();
+		public unowned Gtk.TargetList get_copy_target_list ();
 		public bool get_editable ();
-		public weak WebKit.WebFrame get_focused_frame ();
-		public weak WebKit.WebFrame get_main_frame ();
-		public weak Gtk.TargetList get_paste_target_list ();
-		public weak WebKit.WebSettings get_settings ();
+		public unowned WebKit.WebFrame get_focused_frame ();
+		public unowned WebKit.WebFrame get_main_frame ();
+		public unowned Gtk.TargetList get_paste_target_list ();
+		public unowned WebKit.WebSettings get_settings ();
 		public bool get_transparent ();
 		public void go_back ();
 		public void go_back_or_forward (int steps);

Modified: trunk/vapigen/valagidlparser.vala
==============================================================================
--- trunk/vapigen/valagidlparser.vala	(original)
+++ trunk/vapigen/valagidlparser.vala	Wed Jan 14 22:44:41 2009
@@ -967,6 +967,7 @@
 			
 			if (prop.get_accessor != null && !current_type_symbol_set.contains (getter)) {
 				prop.no_accessor_method = true;
+				prop.get_accessor.value_type.value_owned = true;
 			}
 			
 			var setter = "set_%s".printf (prop.name);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]