vala r2231 - in trunk: . vapi



Author: juergbi
Date: Fri Dec 19 21:56:41 2008
New Revision: 2231
URL: http://svn.gnome.org/viewvc/vala?rev=2231&view=rev

Log:
2008-12-19  JÃrg Billeter  <j bitron ch>

	* vapi/atk.vapi:
	* vapi/gdk-2.0.vapi:
	* vapi/gdk-pixbuf-2.0.vapi:
	* vapi/gio-2.0.vapi:
	* vapi/gio-unix-2.0.vapi:
	* vapi/gstreamer-0.10.vapi:
	* vapi/gstreamer-audio-0.10.vapi:
	* vapi/gstreamer-base-0.10.vapi:
	* vapi/gstreamer-check-0.10.vapi:
	* vapi/gstreamer-controller-0.10.vapi:
	* vapi/gstreamer-dataprotocol-0.10.vapi:
	* vapi/gstreamer-fft-0.10.vapi:
	* vapi/gstreamer-interfaces-0.10.vapi:
	* vapi/gstreamer-net-0.10.vapi:
	* vapi/gstreamer-pbutils-0.10.vapi:
	* vapi/gstreamer-riff-0.10.vapi:
	* vapi/gstreamer-rtp-0.10.vapi:
	* vapi/gstreamer-rtsp-0.10.vapi:
	* vapi/gstreamer-sdp-0.10.vapi:
	* vapi/gstreamer-tag-0.10.vapi:
	* vapi/gstreamer-video-0.10.vapi:
	* vapi/gtk+-2.0.vapi:
	* vapi/pango.vapi:
	* vapi/pangocairo.vapi:

	Regenerated


Modified:
   trunk/ChangeLog
   trunk/vapi/atk.vapi
   trunk/vapi/gdk-2.0.vapi
   trunk/vapi/gdk-pixbuf-2.0.vapi
   trunk/vapi/gio-2.0.vapi
   trunk/vapi/gio-unix-2.0.vapi
   trunk/vapi/gstreamer-0.10.vapi
   trunk/vapi/gstreamer-audio-0.10.vapi
   trunk/vapi/gstreamer-base-0.10.vapi
   trunk/vapi/gstreamer-check-0.10.vapi
   trunk/vapi/gstreamer-controller-0.10.vapi
   trunk/vapi/gstreamer-dataprotocol-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/gstreamer-pbutils-0.10.vapi
   trunk/vapi/gstreamer-riff-0.10.vapi
   trunk/vapi/gstreamer-rtp-0.10.vapi
   trunk/vapi/gstreamer-rtsp-0.10.vapi
   trunk/vapi/gstreamer-sdp-0.10.vapi
   trunk/vapi/gstreamer-tag-0.10.vapi
   trunk/vapi/gstreamer-video-0.10.vapi
   trunk/vapi/gtk+-2.0.vapi
   trunk/vapi/pango.vapi
   trunk/vapi/pangocairo.vapi

Modified: trunk/vapi/atk.vapi
==============================================================================
--- trunk/vapi/atk.vapi	(original)
+++ trunk/vapi/atk.vapi	Fri Dec 19 21:56:41 2008
@@ -14,16 +14,16 @@
 	}
 	[CCode (cheader_filename = "atk/atk.h")]
 	public class GObjectAccessible : Atk.Object {
-		public static weak Atk.Object for_object (GLib.Object obj);
-		public weak GLib.Object get_object ();
+		public static unowned Atk.Object for_object (GLib.Object obj);
+		public unowned GLib.Object get_object ();
 	}
 	[CCode (cheader_filename = "atk/atk.h")]
 	public class Hyperlink : GLib.Object, Atk.Action {
 		public virtual int get_end_index ();
 		public virtual int get_n_anchors ();
-		public virtual weak Atk.Object get_object (int i);
+		public virtual unowned Atk.Object get_object (int i);
 		public virtual int get_start_index ();
-		public virtual weak string get_uri (int i);
+		public virtual unowned string get_uri (int i);
 		public bool is_inline ();
 		public virtual bool is_selected_link ();
 		public virtual bool is_valid ();
@@ -40,18 +40,18 @@
 	[Compact]
 	[CCode (cheader_filename = "atk/atk.h")]
 	public class KeyEventStruct {
-		public ushort keycode;
+		public uint16 keycode;
 		public uint keyval;
 		public int length;
 		public uint state;
 		[CCode (cname = "string")]
 		public weak string str;
-		public uint timestamp;
+		public uint32 timestamp;
 		public int type;
 	}
 	[CCode (cheader_filename = "atk/atk.h")]
 	public class Misc : GLib.Object {
-		public static weak Atk.Misc get_instance ();
+		public static unowned Atk.Misc get_instance ();
 		public virtual void threads_enter ();
 		public virtual void threads_leave ();
 	}
@@ -74,24 +74,24 @@
 		public Atk.Role role;
 		public bool add_relationship (Atk.RelationType relationship, Atk.Object target);
 		public virtual uint connect_property_change_handler (Atk.PropertyChangeHandler handler);
-		public virtual weak Atk.AttributeSet get_attributes ();
-		public virtual weak string get_description ();
+		public virtual unowned Atk.AttributeSet get_attributes ();
+		public virtual unowned string get_description ();
 		public virtual int get_index_in_parent ();
 		public virtual Atk.Layer get_layer ();
 		public virtual int get_mdi_zorder ();
 		public int get_n_accessible_children ();
 		[NoWrapper]
 		public virtual int get_n_children ();
-		public virtual weak string get_name ();
-		public virtual weak Atk.Object get_parent ();
+		public virtual unowned string get_name ();
+		public virtual unowned Atk.Object get_parent ();
 		public virtual Atk.Role get_role ();
 		public virtual void initialize (void* data);
 		public void notify_state_change (Atk.State state, bool value);
-		public weak Atk.Object ref_accessible_child (int i);
+		public unowned Atk.Object ref_accessible_child (int i);
 		[NoWrapper]
-		public virtual weak Atk.Object ref_child (int i);
-		public virtual weak Atk.RelationSet ref_relation_set ();
-		public virtual weak Atk.StateSet ref_state_set ();
+		public virtual unowned Atk.Object ref_child (int i);
+		public virtual unowned Atk.RelationSet ref_relation_set ();
+		public virtual unowned Atk.StateSet ref_state_set ();
 		public virtual void remove_property_change_handler (uint handler_id);
 		public bool remove_relationship (Atk.RelationType relationship, Atk.Object target);
 		public virtual void set_description (string description);
@@ -137,7 +137,7 @@
 	}
 	[CCode (cheader_filename = "atk/atk.h")]
 	public class ObjectFactory : GLib.Object {
-		public virtual weak Atk.Object create_accessible (GLib.Object obj);
+		public virtual unowned Atk.Object create_accessible (GLib.Object obj);
 		public virtual GLib.Type get_accessible_type ();
 		public virtual void invalidate ();
 	}
@@ -152,7 +152,7 @@
 	public class Registry : GLib.Object {
 		public weak GLib.HashTable factory_singleton_cache;
 		public weak GLib.HashTable factory_type_registry;
-		public weak Atk.ObjectFactory get_factory (GLib.Type type);
+		public unowned Atk.ObjectFactory get_factory (GLib.Type type);
 		public GLib.Type get_factory_type (GLib.Type type);
 		public void set_factory_type (GLib.Type type, GLib.Type factory_type);
 	}
@@ -161,11 +161,11 @@
 		public Atk.RelationType relationship;
 		public void add_target (Atk.Object target);
 		public Atk.RelationType get_relation_type ();
-		public weak GLib.PtrArray get_target ();
+		public unowned GLib.PtrArray get_target ();
 		[CCode (has_construct_function = false)]
 		public Relation (Atk.Object[] targets, Atk.RelationType relationship);
 		public static Atk.RelationType type_for_name (string name);
-		public static weak string type_get_name (Atk.RelationType type);
+		public static unowned string type_get_name (Atk.RelationType type);
 		public static Atk.RelationType type_register (string name);
 		[NoAccessorMethod]
 		public Atk.RelationType relation_type { get; set; }
@@ -179,8 +179,8 @@
 		public void add_relation_by_type (Atk.RelationType relationship, Atk.Object target);
 		public bool contains (Atk.RelationType relationship);
 		public int get_n_relations ();
-		public weak Atk.Relation get_relation (int i);
-		public weak Atk.Relation get_relation_by_type (Atk.RelationType relationship);
+		public unowned Atk.Relation get_relation (int i);
+		public unowned Atk.Relation get_relation_by_type (Atk.RelationType relationship);
 		[CCode (has_construct_function = false)]
 		public RelationSet ();
 		public void remove (Atk.Relation relation);
@@ -189,23 +189,23 @@
 	[CCode (cheader_filename = "atk/atk.h")]
 	public class State {
 		public static Atk.StateType type_for_name (string name);
-		public static weak string type_get_name (Atk.StateType type);
+		public static unowned string type_get_name (Atk.StateType type);
 		public static Atk.StateType type_register (string name);
 	}
 	[CCode (cheader_filename = "atk/atk.h")]
 	public class StateSet : GLib.Object {
 		public bool add_state (Atk.StateType type);
 		public void add_states (Atk.StateType[] types);
-		public weak Atk.StateSet and_sets (Atk.StateSet compare_set);
+		public unowned Atk.StateSet and_sets (Atk.StateSet compare_set);
 		public void clear_states ();
 		public bool contains_state (Atk.StateType type);
 		public bool contains_states (Atk.StateType[] types);
 		public bool is_empty ();
 		[CCode (has_construct_function = false)]
 		public StateSet ();
-		public weak Atk.StateSet or_sets (Atk.StateSet compare_set);
+		public unowned Atk.StateSet or_sets (Atk.StateSet compare_set);
 		public bool remove_state (Atk.StateType type);
-		public weak Atk.StateSet xor_sets (Atk.StateSet compare_set);
+		public unowned Atk.StateSet xor_sets (Atk.StateSet compare_set);
 	}
 	[Compact]
 	[CCode (cheader_filename = "atk/atk.h")]
@@ -230,11 +230,11 @@
 		[NoWrapper]
 		public virtual uint add_key_event_listener (Atk.KeySnoopFunc listener, void* data);
 		[NoWrapper]
-		public virtual weak Atk.Object get_root ();
+		public virtual unowned Atk.Object get_root ();
 		[NoWrapper]
-		public virtual weak string get_toolkit_name ();
+		public virtual unowned string get_toolkit_name ();
 		[NoWrapper]
-		public virtual weak string get_toolkit_version ();
+		public virtual unowned string get_toolkit_version ();
 		[NoWrapper]
 		public virtual void remove_global_event_listener (uint listener_id);
 		[NoWrapper]
@@ -243,11 +243,11 @@
 	[CCode (cheader_filename = "atk/atk.h")]
 	public interface Action {
 		public abstract bool do_action (int i);
-		public abstract weak string get_description (int i);
-		public abstract weak string get_keybinding (int i);
-		public abstract weak string get_localized_name (int i);
+		public abstract unowned string get_description (int i);
+		public abstract unowned string get_keybinding (int i);
+		public abstract unowned string get_localized_name (int i);
 		public abstract int get_n_actions ();
-		public abstract weak string get_name (int i);
+		public abstract unowned string get_name (int i);
 		public abstract bool set_description (int i, string desc);
 	}
 	[CCode (cheader_filename = "atk/atk.h")]
@@ -261,7 +261,7 @@
 		public abstract void get_position (int x, int y, Atk.CoordType coord_type);
 		public abstract void get_size (int width, int height);
 		public abstract bool grab_focus ();
-		public abstract weak Atk.Object ref_accessible_at_point (int x, int y, Atk.CoordType coord_type);
+		public abstract unowned Atk.Object ref_accessible_at_point (int x, int y, Atk.CoordType coord_type);
 		public abstract void remove_focus_handler (uint handler_id);
 		public abstract bool set_extents (int x, int y, int width, int height, Atk.CoordType coord_type);
 		public abstract bool set_position (int x, int y, Atk.CoordType coord_type);
@@ -270,17 +270,17 @@
 	}
 	[CCode (cheader_filename = "atk/atk.h")]
 	public interface Document {
-		public weak string get_attribute_value (string attribute_name);
-		public weak Atk.AttributeSet get_attributes ();
+		public unowned string get_attribute_value (string attribute_name);
+		public unowned Atk.AttributeSet get_attributes ();
 		public abstract void* get_document ();
 		[NoWrapper]
-		public abstract weak string get_document_attribute_value (string attribute_name);
+		public abstract unowned string get_document_attribute_value (string attribute_name);
 		[NoWrapper]
-		public abstract weak Atk.AttributeSet get_document_attributes ();
+		public abstract unowned Atk.AttributeSet get_document_attributes ();
 		[NoWrapper]
-		public abstract weak string get_document_locale ();
-		public abstract weak string get_document_type ();
-		public weak string get_locale ();
+		public abstract unowned string get_document_locale ();
+		public abstract unowned string get_document_type ();
+		public unowned string get_locale ();
 		public bool set_attribute_value (string attribute_name, string attribute_value);
 		[NoWrapper]
 		public abstract bool set_document_attribute (string attribute_name, string attribute_value);
@@ -300,26 +300,26 @@
 	}
 	[CCode (cheader_filename = "atk/atk.h")]
 	public interface HyperlinkImpl {
-		public abstract weak Atk.Hyperlink get_hyperlink ();
+		public abstract unowned Atk.Hyperlink get_hyperlink ();
 	}
 	[CCode (cheader_filename = "atk/atk.h")]
 	public interface Hypertext {
-		public abstract weak Atk.Hyperlink get_link (int link_index);
+		public abstract unowned Atk.Hyperlink get_link (int link_index);
 		public abstract int get_link_index (int char_index);
 		public abstract int get_n_links ();
 		public virtual signal void link_selected (int link_index);
 	}
 	[CCode (cheader_filename = "atk/atk.h")]
 	public interface Image {
-		public abstract weak string get_image_description ();
-		public abstract weak string get_image_locale ();
+		public abstract unowned string get_image_description ();
+		public abstract unowned string get_image_locale ();
 		public abstract void get_image_position (int x, int y, Atk.CoordType coord_type);
 		public abstract void get_image_size (int width, int height);
 		public abstract bool set_image_description (string description);
 	}
 	[CCode (cheader_filename = "atk/atk.h")]
 	public interface Implementor {
-		public abstract weak Atk.Object ref_accessible ();
+		public abstract unowned Atk.Object ref_accessible ();
 	}
 	[CCode (cheader_filename = "atk/atk.h")]
 	public interface Selection {
@@ -327,41 +327,41 @@
 		public abstract bool clear_selection ();
 		public abstract int get_selection_count ();
 		public abstract bool is_child_selected (int i);
-		public abstract weak Atk.Object ref_selection (int i);
+		public abstract unowned Atk.Object ref_selection (int i);
 		public abstract bool remove_selection (int i);
 		public abstract bool select_all_selection ();
 		public virtual signal void selection_changed ();
 	}
 	[CCode (cheader_filename = "atk/atk.h")]
 	public interface StreamableContent {
-		public abstract weak string get_mime_type (int i);
+		public abstract unowned string get_mime_type (int i);
 		public abstract int get_n_mime_types ();
-		public abstract weak GLib.IOChannel get_stream (string mime_type);
-		public abstract weak string get_uri (string mime_type);
+		public abstract unowned GLib.IOChannel get_stream (string mime_type);
+		public abstract unowned string get_uri (string mime_type);
 	}
 	[CCode (cheader_filename = "atk/atk.h")]
 	public interface Table {
 		public abstract bool add_column_selection (int column);
 		public abstract bool add_row_selection (int row);
-		public abstract weak Atk.Object get_caption ();
+		public abstract unowned Atk.Object get_caption ();
 		public abstract int get_column_at_index (int index_);
-		public abstract weak string get_column_description (int column);
+		public abstract unowned string get_column_description (int column);
 		public abstract int get_column_extent_at (int row, int column);
-		public abstract weak Atk.Object get_column_header (int column);
+		public abstract unowned Atk.Object get_column_header (int column);
 		public abstract int get_index_at (int row, int column);
 		public abstract int get_n_columns ();
 		public abstract int get_n_rows ();
 		public abstract int get_row_at_index (int index_);
-		public abstract weak string get_row_description (int row);
+		public abstract unowned string get_row_description (int row);
 		public abstract int get_row_extent_at (int row, int column);
-		public abstract weak Atk.Object get_row_header (int row);
+		public abstract unowned Atk.Object get_row_header (int row);
 		public abstract int get_selected_columns (int selected);
 		public abstract int get_selected_rows (int selected);
-		public abstract weak Atk.Object get_summary ();
+		public abstract unowned Atk.Object get_summary ();
 		public abstract bool is_column_selected (int column);
 		public abstract bool is_row_selected (int row);
 		public abstract bool is_selected (int row, int column);
-		public abstract weak Atk.Object ref_at (int row, int column);
+		public abstract unowned Atk.Object ref_at (int row, int column);
 		public abstract bool remove_column_selection (int column);
 		public abstract bool remove_row_selection (int row);
 		public abstract void set_caption (Atk.Object caption);
@@ -382,25 +382,25 @@
 	public interface Text {
 		public abstract bool add_selection (int start_offset, int end_offset);
 		public static Atk.TextAttribute attribute_for_name (string name);
-		public static weak string attribute_get_name (Atk.TextAttribute attr);
-		public static weak string attribute_get_value (Atk.TextAttribute attr, int index_);
+		public static unowned string attribute_get_name (Atk.TextAttribute attr);
+		public static unowned string attribute_get_value (Atk.TextAttribute attr, int index_);
 		public static Atk.TextAttribute attribute_register (string name);
-		public static void free_ranges (out weak Atk.TextRange ranges);
-		public abstract weak Atk.TextRange get_bounded_ranges (Atk.TextRectangle rect, Atk.CoordType coord_type, Atk.TextClipType x_clip_type, Atk.TextClipType y_clip_type);
+		public static void free_ranges (out unowned Atk.TextRange ranges);
+		public abstract unowned Atk.TextRange get_bounded_ranges (Atk.TextRectangle rect, Atk.CoordType coord_type, Atk.TextClipType x_clip_type, Atk.TextClipType y_clip_type);
 		public abstract int get_caret_offset ();
 		public abstract unichar get_character_at_offset (int offset);
 		public abstract int get_character_count ();
 		public abstract void get_character_extents (int offset, int x, int y, int width, int height, Atk.CoordType coords);
-		public abstract weak Atk.AttributeSet get_default_attributes ();
+		public abstract unowned Atk.AttributeSet get_default_attributes ();
 		public abstract int get_n_selections ();
 		public abstract int get_offset_at_point (int x, int y, Atk.CoordType coords);
 		public abstract void get_range_extents (int start_offset, int end_offset, Atk.CoordType coord_type, Atk.TextRectangle rect);
-		public abstract weak Atk.AttributeSet get_run_attributes (int offset, int start_offset, int end_offset);
-		public abstract weak string get_selection (int selection_num, int start_offset, int end_offset);
-		public abstract weak string get_text (int start_offset, int end_offset);
-		public abstract weak string get_text_after_offset (int offset, Atk.TextBoundary boundary_type, int start_offset, int end_offset);
-		public abstract weak string get_text_at_offset (int offset, Atk.TextBoundary boundary_type, int start_offset, int end_offset);
-		public abstract weak string get_text_before_offset (int offset, Atk.TextBoundary boundary_type, int start_offset, int end_offset);
+		public abstract unowned Atk.AttributeSet get_run_attributes (int offset, int start_offset, int end_offset);
+		public abstract unowned string get_selection (int selection_num, int start_offset, int end_offset);
+		public abstract unowned string get_text (int start_offset, int end_offset);
+		public abstract unowned string get_text_after_offset (int offset, Atk.TextBoundary boundary_type, int start_offset, int end_offset);
+		public abstract unowned string get_text_at_offset (int offset, Atk.TextBoundary boundary_type, int start_offset, int end_offset);
+		public abstract unowned string get_text_before_offset (int offset, Atk.TextBoundary boundary_type, int start_offset, int end_offset);
 		public abstract bool remove_selection (int selection_num);
 		public abstract bool set_caret_offset (int offset);
 		public abstract bool set_selection (int selection_num, int start_offset, int end_offset);
@@ -678,17 +678,17 @@
 	[CCode (cheader_filename = "atk/atk.h")]
 	public static void focus_tracker_notify (Atk.Object object);
 	[CCode (cheader_filename = "atk/atk.h")]
-	public static weak Atk.Registry get_default_registry ();
+	public static unowned Atk.Registry get_default_registry ();
 	[CCode (cheader_filename = "atk/atk.h")]
-	public static weak Atk.Object get_focus_object ();
+	public static unowned Atk.Object get_focus_object ();
 	[CCode (cheader_filename = "atk/atk.h")]
-	public static weak Atk.Object get_root ();
+	public static unowned Atk.Object get_root ();
 	[CCode (cheader_filename = "atk/atk.h")]
-	public static weak string get_toolkit_name ();
+	public static unowned string get_toolkit_name ();
 	[CCode (cheader_filename = "atk/atk.h")]
-	public static weak string get_toolkit_version ();
+	public static unowned string get_toolkit_version ();
 	[CCode (cheader_filename = "atk/atk.h")]
-	public static weak string get_version ();
+	public static unowned string get_version ();
 	[CCode (cheader_filename = "atk/atk.h")]
 	public static void remove_focus_tracker (uint tracker_id);
 	[CCode (cheader_filename = "atk/atk.h")]
@@ -698,9 +698,9 @@
 	[CCode (cheader_filename = "atk/atk.h")]
 	public static Atk.Role role_for_name (string name);
 	[CCode (cheader_filename = "atk/atk.h")]
-	public static weak string role_get_localized_name (Atk.Role role);
+	public static unowned string role_get_localized_name (Atk.Role role);
 	[CCode (cheader_filename = "atk/atk.h")]
-	public static weak string role_get_name (Atk.Role role);
+	public static unowned string role_get_name (Atk.Role role);
 	[CCode (cheader_filename = "atk/atk.h")]
 	public static Atk.Role role_register (string name);
 }

Modified: trunk/vapi/gdk-2.0.vapi
==============================================================================
--- trunk/vapi/gdk-2.0.vapi	(original)
+++ trunk/vapi/gdk-2.0.vapi	Fri Dec 19 21:56:41 2008
@@ -11,7 +11,7 @@
 		public void set_icon (GLib.Icon icon);
 		public void set_icon_name (string icon_name);
 		public void set_screen (Gdk.Screen screen);
-		public void set_timestamp (uint timestamp);
+		public void set_timestamp (uint32 timestamp);
 	}
 	[CCode (ref_function = "g_object_ref", unref_function = "g_object_unref", cheader_filename = "gdk/gdk.h")]
 	public class Bitmap {
@@ -28,9 +28,9 @@
 		public int alloc_colors (Gdk.Color[][] colors, bool writeable, bool best_match, bool success);
 		public void change (int ncolors);
 		public void free_colors (Gdk.Color[][] colors);
-		public weak Gdk.Screen get_screen ();
-		public static weak Gdk.Colormap get_system ();
-		public weak Gdk.Visual get_visual ();
+		public unowned Gdk.Screen get_screen ();
+		public static unowned Gdk.Colormap get_system ();
+		public unowned Gdk.Visual get_visual ();
 		[CCode (has_construct_function = false)]
 		public Colormap (Gdk.Visual visual, bool allocate);
 		public void query_color (ulong pixel, out Gdk.Color _result);
@@ -48,8 +48,8 @@
 		public Cursor.from_pixbuf (Gdk.Display display, Gdk.Pixbuf pixbuf, int x, int y);
 		[CCode (has_construct_function = false)]
 		public Cursor.from_pixmap (Gdk.Pixmap source, Gdk.Pixmap mask, Gdk.Color fg, Gdk.Color bg, int x, int y);
-		public weak Gdk.Display get_display ();
-		public weak Gdk.Pixbuf get_image ();
+		public unowned Gdk.Display get_display ();
+		public unowned Gdk.Pixbuf get_image ();
 		[CCode (has_construct_function = false)]
 		public Cursor (Gdk.CursorType cursor_type);
 	}
@@ -67,8 +67,8 @@
 		public Gdk.InputSource source;
 		public static void free_history (Gdk.TimeCoord[] events);
 		public bool get_axis (double axes, Gdk.AxisUse use, double value);
-		public static weak Gdk.Device get_core_pointer ();
-		public bool get_history (Gdk.Window window, uint start, uint stop, Gdk.TimeCoord[] events);
+		public static unowned Gdk.Device get_core_pointer ();
+		public bool get_history (Gdk.Window window, uint32 start, uint32 stop, Gdk.TimeCoord[] events);
 		public void get_state (Gdk.Window window, double axes, Gdk.ModifierType mask);
 		public void set_axis_use (uint index_, Gdk.AxisUse use);
 		public void set_key (uint index_, uint keyval, Gdk.ModifierType modifiers);
@@ -78,7 +78,7 @@
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public class Display : GLib.Object {
 		[NoArrayLength]
-		public weak uint[] button_click_time;
+		public weak uint32[] button_click_time;
 		[NoArrayLength]
 		public weak int[] button_number;
 		[NoArrayLength]
@@ -97,33 +97,33 @@
 		public void beep ();
 		public void close ();
 		public void flush ();
-		public weak Gdk.Device get_core_pointer ();
-		public static weak Gdk.Display get_default ();
+		public unowned Gdk.Device get_core_pointer ();
+		public static unowned Gdk.Display get_default ();
 		public uint get_default_cursor_size ();
-		public weak Gdk.Window get_default_group ();
-		public virtual weak Gdk.Screen get_default_screen ();
+		public unowned Gdk.Window get_default_group ();
+		public virtual unowned Gdk.Screen get_default_screen ();
 		[NoWrapper]
-		public virtual weak string get_display_name ();
+		public virtual unowned string get_display_name ();
 		public Gdk.Event get_event ();
 		public void get_maximal_cursor_size (out uint width, out uint height);
 		public virtual int get_n_screens ();
-		public weak string get_name ();
-		public void get_pointer (out weak Gdk.Screen screen, int x, int y, Gdk.ModifierType mask);
-		public virtual weak Gdk.Screen get_screen (int screen_num);
-		public weak Gdk.Window get_window_at_pointer (int win_x, int win_y);
-		public void keyboard_ungrab (uint time_);
-		public weak GLib.List list_devices ();
-		public static weak Gdk.Display open (string display_name);
-		public static weak Gdk.Display open_default_libgtk_only ();
+		public unowned string get_name ();
+		public void get_pointer (out unowned Gdk.Screen screen, int x, int y, Gdk.ModifierType mask);
+		public virtual unowned Gdk.Screen get_screen (int screen_num);
+		public unowned Gdk.Window get_window_at_pointer (int win_x, int win_y);
+		public void keyboard_ungrab (uint32 time_);
+		public unowned GLib.List list_devices ();
+		public static unowned Gdk.Display open (string display_name);
+		public static unowned Gdk.Display open_default_libgtk_only ();
 		public Gdk.Event peek_event ();
 		public bool pointer_is_grabbed ();
-		public void pointer_ungrab (uint time_);
+		public void pointer_ungrab (uint32 time_);
 		public void put_event (Gdk.Event event);
 		public bool request_selection_notification (Gdk.Atom selection);
 		public void set_double_click_distance (uint distance);
 		public void set_double_click_time (uint msec);
-		public weak Gdk.DisplayPointerHooks set_pointer_hooks (Gdk.DisplayPointerHooks new_hooks);
-		public void store_clipboard (Gdk.Window clipboard_window, uint time_, Gdk.Atom[] targets);
+		public unowned Gdk.DisplayPointerHooks set_pointer_hooks (Gdk.DisplayPointerHooks new_hooks);
+		public void store_clipboard (Gdk.Window clipboard_window, uint32 time_, Gdk.Atom[] targets);
 		public bool supports_clipboard_persistence ();
 		public bool supports_composite ();
 		public bool supports_cursor_alpha ();
@@ -137,9 +137,9 @@
 	}
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public class DisplayManager : GLib.Object {
-		public static weak Gdk.DisplayManager get ();
-		public weak Gdk.Display get_default_display ();
-		public weak GLib.SList list_displays ();
+		public static unowned Gdk.DisplayManager get ();
+		public unowned Gdk.Display get_default_display ();
+		public unowned GLib.SList list_displays ();
 		public void set_default_display (Gdk.Display display);
 		public Gdk.Display default_display { get; set; }
 		public virtual signal void display_opened (Gdk.Display display);
@@ -159,7 +159,7 @@
 		public bool is_source;
 		public Gdk.DragProtocol protocol;
 		public weak Gdk.Window source_window;
-		public uint start_time;
+		public uint32 start_time;
 		public Gdk.DragAction suggested_action;
 		public weak GLib.List targets;
 		public void* windowing_data;
@@ -168,9 +168,9 @@
 	}
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public class Drawable : GLib.Object {
-		public weak Gdk.Image copy_to_image (Gdk.Image image, int src_x, int src_y, int dest_x, int dest_y, int width, int height);
+		public unowned Gdk.Image copy_to_image (Gdk.Image image, int src_x, int src_y, int dest_x, int dest_y, int width, int height);
 		[NoWrapper]
-		public virtual weak Gdk.GC create_gc (Gdk.GCValues values, Gdk.GCValuesMask mask);
+		public virtual unowned Gdk.GC create_gc (Gdk.GCValues values, Gdk.GCValuesMask mask);
 		[NoWrapper]
 		public virtual void draw_arc (Gdk.GC gc, bool filled, int x, int y, int width, int height, int angle1, int angle2);
 		[NoWrapper]
@@ -199,19 +199,19 @@
 		public virtual void draw_text_wc (Gdk.Font font, Gdk.GC gc, int x, int y, Gdk.WChar text, int text_length);
 		[NoWrapper]
 		public virtual void draw_trapezoids (Gdk.GC gc, Gdk.Trapezoid[] trapezoids);
-		public virtual weak Gdk.Region get_clip_region ();
-		public virtual weak Gdk.Colormap get_colormap ();
+		public virtual unowned Gdk.Region get_clip_region ();
+		public virtual unowned Gdk.Colormap get_colormap ();
 		[NoWrapper]
-		public virtual weak Gdk.Drawable get_composite_drawable (int x, int y, int width, int height, int composite_x_offset, int composite_y_offset);
+		public virtual unowned Gdk.Drawable get_composite_drawable (int x, int y, int width, int height, int composite_x_offset, int composite_y_offset);
 		public virtual int get_depth ();
-		public weak Gdk.Display get_display ();
-		public virtual weak Gdk.Image get_image (int x, int y, int width, int height);
-		public virtual weak Gdk.Screen get_screen ();
+		public unowned Gdk.Display get_display ();
+		public virtual unowned Gdk.Image get_image (int x, int y, int width, int height);
+		public virtual unowned Gdk.Screen get_screen ();
 		public virtual void get_size (out int width, out int height);
-		public virtual weak Gdk.Region get_visible_region ();
-		public virtual weak Gdk.Visual get_visual ();
+		public virtual unowned Gdk.Region get_visible_region ();
+		public virtual unowned Gdk.Visual get_visual ();
 		[NoWrapper]
-		public virtual weak Cairo.Surface ref_cairo_surface ();
+		public virtual unowned Cairo.Surface ref_cairo_surface ();
 		public virtual void set_colormap (Gdk.Colormap colormap);
 	}
 	[Compact]
@@ -221,9 +221,9 @@
 		public int descent;
 		public Gdk.FontType type;
 		public bool equal (Gdk.Font fontb);
-		public static weak Gdk.Font from_description_for_display (Gdk.Display display, Pango.FontDescription font_desc);
+		public static unowned Gdk.Font from_description_for_display (Gdk.Display display, Pango.FontDescription font_desc);
 		public int id ();
-		public static weak Gdk.Font load_for_display (Gdk.Display display, string font_name);
+		public static unowned Gdk.Font load_for_display (Gdk.Display display, string font_name);
 	}
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public class GC : GLib.Object {
@@ -233,8 +233,8 @@
 		public int ts_x_origin;
 		public int ts_y_origin;
 		public void copy (Gdk.GC src_gc);
-		public weak Gdk.Colormap get_colormap ();
-		public weak Gdk.Screen get_screen ();
+		public unowned Gdk.Colormap get_colormap ();
+		public unowned Gdk.Screen get_screen ();
 		public virtual void get_values (Gdk.GCValues values);
 		[CCode (has_construct_function = false)]
 		public GC (Gdk.Drawable drawable);
@@ -263,33 +263,33 @@
 	}
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public class Image : GLib.Object {
-		public ushort bits_per_pixel;
-		public ushort bpl;
-		public ushort bpp;
+		public uint16 bits_per_pixel;
+		public uint16 bpl;
+		public uint16 bpp;
 		public Gdk.ByteOrder byte_order;
 		public weak Gdk.Colormap colormap;
-		public ushort depth;
+		public uint16 depth;
 		public int height;
 		public void* mem;
 		public Gdk.ImageType type;
 		public weak Gdk.Visual visual;
 		public int width;
 		public void* windowing_data;
-		public weak Gdk.Colormap get_colormap ();
-		public uint get_pixel (int x, int y);
+		public unowned Gdk.Colormap get_colormap ();
+		public uint32 get_pixel (int x, int y);
 		[CCode (has_construct_function = false)]
 		public Image (Gdk.ImageType type, Gdk.Visual visual, int width, int height);
-		public void put_pixel (int x, int y, uint pixel);
+		public void put_pixel (int x, int y, uint32 pixel);
 		public void set_colormap (Gdk.Colormap colormap);
 	}
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public class Keymap : GLib.Object {
 		public weak Gdk.Display display;
-		public static weak Gdk.Keymap get_default ();
+		public static unowned Gdk.Keymap get_default ();
 		public Pango.Direction get_direction ();
-		public bool get_entries_for_keycode (uint hardware_keycode, out weak Gdk.KeymapKey[]? keys, out weak uint[]? keyvals, int n_entries);
+		public bool get_entries_for_keycode (uint hardware_keycode, out unowned Gdk.KeymapKey[]? keys, out unowned uint[]? keyvals, int n_entries);
 		public bool get_entries_for_keyval (uint keyval, Gdk.KeymapKey[] keys);
-		public static weak Gdk.Keymap get_for_display (Gdk.Display display);
+		public static unowned Gdk.Keymap get_for_display (Gdk.Display display);
 		public bool have_bidi_layouts ();
 		public uint lookup_key (Gdk.KeymapKey key);
 		public bool translate_keyboard_state (uint hardware_keycode, Gdk.ModifierType state, int group, uint keyval, int effective_group, int level, Gdk.ModifierType consumed_modifiers);
@@ -298,7 +298,7 @@
 	}
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public class PangoRenderer : Pango.Renderer {
-		public static weak Pango.Renderer get_default (Gdk.Screen screen);
+		public static unowned Pango.Renderer get_default (Gdk.Screen screen);
 		[CCode (type = "PangoRenderer*", has_construct_function = false)]
 		public PangoRenderer (Gdk.Screen screen);
 		public void set_drawable (Gdk.Drawable drawable);
@@ -310,16 +310,16 @@
 	}
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public class Pixmap : Gdk.Drawable {
-		public static weak Gdk.Pixmap colormap_create_from_xpm (Gdk.Drawable drawable, Gdk.Colormap colormap, out weak Gdk.Bitmap mask, Gdk.Color transparent_color, string filename);
-		public static weak Gdk.Pixmap colormap_create_from_xpm_d (Gdk.Drawable drawable, Gdk.Colormap colormap, out weak Gdk.Bitmap mask, Gdk.Color transparent_color, string data);
-		public static weak Gdk.Pixmap create_from_data (Gdk.Drawable drawable, string data, int width, int height, int depth, Gdk.Color fg, Gdk.Color bg);
-		public static weak Gdk.Pixmap create_from_xpm (Gdk.Drawable drawable, out weak Gdk.Bitmap mask, Gdk.Color transparent_color, string filename);
-		public static weak Gdk.Pixmap create_from_xpm_d (Gdk.Drawable drawable, out weak Gdk.Bitmap mask, Gdk.Color transparent_color, string data);
-		public static weak Gdk.Pixmap foreign_new (Gdk.NativeWindow anid);
-		public static weak Gdk.Pixmap foreign_new_for_display (Gdk.Display display, Gdk.NativeWindow anid);
-		public static weak Gdk.Pixmap foreign_new_for_screen (Gdk.Screen screen, Gdk.NativeWindow anid, int width, int height, int depth);
-		public static weak Gdk.Pixmap lookup (Gdk.NativeWindow anid);
-		public static weak Gdk.Pixmap lookup_for_display (Gdk.Display display, Gdk.NativeWindow anid);
+		public static unowned Gdk.Pixmap colormap_create_from_xpm (Gdk.Drawable drawable, Gdk.Colormap colormap, out unowned Gdk.Bitmap mask, Gdk.Color transparent_color, string filename);
+		public static unowned Gdk.Pixmap colormap_create_from_xpm_d (Gdk.Drawable drawable, Gdk.Colormap colormap, out unowned Gdk.Bitmap mask, Gdk.Color transparent_color, string data);
+		public static unowned Gdk.Pixmap create_from_data (Gdk.Drawable drawable, string data, int width, int height, int depth, Gdk.Color fg, Gdk.Color bg);
+		public static unowned Gdk.Pixmap create_from_xpm (Gdk.Drawable drawable, out unowned Gdk.Bitmap mask, Gdk.Color transparent_color, string filename);
+		public static unowned Gdk.Pixmap create_from_xpm_d (Gdk.Drawable drawable, out unowned Gdk.Bitmap mask, Gdk.Color transparent_color, string data);
+		public static unowned Gdk.Pixmap foreign_new (Gdk.NativeWindow anid);
+		public static unowned Gdk.Pixmap foreign_new_for_display (Gdk.Display display, Gdk.NativeWindow anid);
+		public static unowned Gdk.Pixmap foreign_new_for_screen (Gdk.Screen screen, Gdk.NativeWindow anid, int width, int height, int depth);
+		public static unowned Gdk.Pixmap lookup (Gdk.NativeWindow anid);
+		public static unowned Gdk.Pixmap lookup_for_display (Gdk.Display display, Gdk.NativeWindow anid);
 		[CCode (has_construct_function = false)]
 		public Pixmap (Gdk.Drawable drawable, int width, int height, int depth);
 	}
@@ -332,7 +332,7 @@
 	[Compact]
 	[CCode (copy_function = "gdk_region_copy", free_function = "gdk_region_destroy", cheader_filename = "gdk/gdk.h")]
 	public class Region {
-		public weak Gdk.Region copy ();
+		public unowned Gdk.Region copy ();
 		public bool empty ();
 		public bool equal (Gdk.Region region2);
 		public void get_clipbox (out Gdk.Rectangle rectangle);
@@ -360,39 +360,39 @@
 		[NoArrayLength]
 		public weak Gdk.GC[] normal_gcs;
 		public void broadcast_client_message (Gdk.Event event);
-		public weak Gdk.Window get_active_window ();
-		public static weak Gdk.Screen get_default ();
-		public weak Gdk.Colormap get_default_colormap ();
-		public weak Gdk.Display get_display ();
-		public weak Cairo.FontOptions get_font_options ();
+		public unowned Gdk.Window get_active_window ();
+		public static unowned Gdk.Screen get_default ();
+		public unowned Gdk.Colormap get_default_colormap ();
+		public unowned Gdk.Display get_display ();
+		public unowned Cairo.FontOptions get_font_options ();
 		public int get_height ();
 		public int get_height_mm ();
 		public int get_monitor_at_point (int x, int y);
 		public int get_monitor_at_window (Gdk.Window window);
 		public void get_monitor_geometry (int monitor_num, out Gdk.Rectangle dest);
 		public int get_monitor_height_mm (int monitor_num);
-		public weak string get_monitor_plug_name (int monitor_num);
+		public unowned string get_monitor_plug_name (int monitor_num);
 		public int get_monitor_width_mm (int monitor_num);
 		public int get_n_monitors ();
 		public int get_number ();
 		public double get_resolution ();
-		public weak Gdk.Colormap get_rgb_colormap ();
-		public weak Gdk.Visual get_rgb_visual ();
-		public weak Gdk.Colormap get_rgba_colormap ();
-		public weak Gdk.Visual get_rgba_visual ();
-		public weak Gdk.Window get_root_window ();
+		public unowned Gdk.Colormap get_rgb_colormap ();
+		public unowned Gdk.Visual get_rgb_visual ();
+		public unowned Gdk.Colormap get_rgba_colormap ();
+		public unowned Gdk.Visual get_rgba_visual ();
+		public unowned Gdk.Window get_root_window ();
 		public bool get_setting (string name, GLib.Value value);
-		public weak Gdk.Colormap get_system_colormap ();
-		public weak Gdk.Visual get_system_visual ();
-		public weak GLib.List get_toplevel_windows ();
+		public unowned Gdk.Colormap get_system_colormap ();
+		public unowned Gdk.Visual get_system_visual ();
+		public unowned GLib.List get_toplevel_windows ();
 		public int get_width ();
 		public int get_width_mm ();
-		public weak GLib.List get_window_stack ();
+		public unowned GLib.List get_window_stack ();
 		public static int height ();
 		public static int height_mm ();
 		public bool is_composited ();
-		public weak GLib.List list_visuals ();
-		public weak string make_display_name ();
+		public unowned GLib.List list_visuals ();
+		public unowned string make_display_name ();
 		public void set_default_colormap (Gdk.Colormap colormap);
 		public void set_font_options (Cairo.FontOptions options);
 		public void set_resolution (double dpi);
@@ -407,37 +407,37 @@
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public class Visual : GLib.Object {
 		public int bits_per_rgb;
-		public uint blue_mask;
+		public uint32 blue_mask;
 		public int blue_prec;
 		public int blue_shift;
 		public Gdk.ByteOrder byte_order;
 		public int colormap_size;
 		public int depth;
-		public uint green_mask;
+		public uint32 green_mask;
 		public int green_prec;
 		public int green_shift;
-		public uint red_mask;
+		public uint32 red_mask;
 		public int red_prec;
 		public int red_shift;
 		public Gdk.VisualType type;
-		public static weak Gdk.Visual get_best ();
+		public static unowned Gdk.Visual get_best ();
 		public static int get_best_depth ();
 		public static Gdk.VisualType get_best_type ();
-		public static weak Gdk.Visual get_best_with_both (int depth, Gdk.VisualType visual_type);
-		public static weak Gdk.Visual get_best_with_depth (int depth);
-		public static weak Gdk.Visual get_best_with_type (Gdk.VisualType visual_type);
-		public weak Gdk.Screen get_screen ();
-		public static weak Gdk.Visual get_system ();
+		public static unowned Gdk.Visual get_best_with_both (int depth, Gdk.VisualType visual_type);
+		public static unowned Gdk.Visual get_best_with_depth (int depth);
+		public static unowned Gdk.Visual get_best_with_type (Gdk.VisualType visual_type);
+		public unowned Gdk.Screen get_screen ();
+		public static unowned Gdk.Visual get_system ();
 	}
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public class Window : Gdk.Drawable {
 		public void add_filter (Gdk.FilterFunc function);
-		public static weak Gdk.Window at_pointer (out int win_x, out int win_y);
+		public static unowned Gdk.Window at_pointer (out int win_x, out int win_y);
 		public void beep ();
-		public void begin_move_drag (int button, int root_x, int root_y, uint timestamp);
+		public void begin_move_drag (int button, int root_x, int root_y, uint32 timestamp);
 		public void begin_paint_rect (Gdk.Rectangle rectangle);
 		public void begin_paint_region (Gdk.Region region);
-		public void begin_resize_drag (Gdk.WindowEdge edge, int button, int root_x, int root_y, uint timestamp);
+		public void begin_resize_drag (Gdk.WindowEdge edge, int button, int root_x, int root_y, uint32 timestamp);
 		public void clear ();
 		public void clear_area (int x, int y, int width, int height);
 		public void clear_area_e (int x, int y, int width, int height);
@@ -448,29 +448,29 @@
 		public void destroy_notify ();
 		public void enable_synchronized_configure ();
 		public void end_paint ();
-		public void focus (uint timestamp);
-		public static weak Gdk.Window foreign_new (Gdk.NativeWindow anid);
-		public static weak Gdk.Window foreign_new_for_display (Gdk.Display display, Gdk.NativeWindow anid);
+		public void focus (uint32 timestamp);
+		public static unowned Gdk.Window foreign_new (Gdk.NativeWindow anid);
+		public static unowned Gdk.Window foreign_new_for_display (Gdk.Display display, Gdk.NativeWindow anid);
 		public void freeze_toplevel_updates_libgtk_only ();
 		public void freeze_updates ();
 		public void fullscreen ();
-		public weak GLib.List get_children ();
+		public unowned GLib.List get_children ();
 		public bool get_decorations (out Gdk.WMDecoration decorations);
 		public Gdk.EventMask get_events ();
 		public void get_frame_extents (out Gdk.Rectangle rect);
 		public void get_geometry (out int x, out int y, out int width, out int height, out int depth);
-		public weak Gdk.Window get_group ();
-		public void get_internal_paint_info (out weak Gdk.Drawable real_drawable, out int x_offset, out int y_offset);
+		public unowned Gdk.Window get_group ();
+		public void get_internal_paint_info (out unowned Gdk.Drawable real_drawable, out int x_offset, out int y_offset);
 		public int get_origin (out int x, out int y);
-		public weak Gdk.Window get_parent ();
-		public weak Gdk.Window get_pointer (out int x, out int y, out Gdk.ModifierType mask);
+		public unowned Gdk.Window get_parent ();
+		public unowned Gdk.Window get_pointer (out int x, out int y, out Gdk.ModifierType mask);
 		public void get_position (out int x, out int y);
 		public void get_root_origin (out int x, out int y);
 		public Gdk.WindowState get_state ();
-		public weak Gdk.Window get_toplevel ();
-		public static weak GLib.List get_toplevels ();
+		public unowned Gdk.Window get_toplevel ();
+		public static unowned GLib.List get_toplevels ();
 		public Gdk.WindowTypeHint get_type_hint ();
-		public weak Gdk.Region get_update_area ();
+		public unowned Gdk.Region get_update_area ();
 		public void get_user_data (void* data);
 		public Gdk.WindowType get_window_type ();
 		public void hide ();
@@ -482,8 +482,8 @@
 		public void invalidate_region (Gdk.Region region, bool invalidate_children);
 		public bool is_viewable ();
 		public bool is_visible ();
-		public static weak Gdk.Window lookup (Gdk.NativeWindow anid);
-		public static weak Gdk.Window lookup_for_display (Gdk.Display display, Gdk.NativeWindow anid);
+		public static unowned Gdk.Window lookup (Gdk.NativeWindow anid);
+		public static unowned Gdk.Window lookup_for_display (Gdk.Display display, Gdk.NativeWindow anid);
 		public void lower ();
 		public void maximize ();
 		public void merge_child_input_shapes ();
@@ -493,7 +493,7 @@
 		public void move_resize (int x, int y, int width, int height);
 		[CCode (has_construct_function = false)]
 		public Window (Gdk.Window parent, Gdk.WindowAttr attributes, int attributes_mask);
-		public weak GLib.List peek_children ();
+		public unowned GLib.List peek_children ();
 		public static void process_all_updates ();
 		public void process_updates (bool update_children);
 		public void raise ();
@@ -552,28 +552,28 @@
 	public struct Atom {
 		public static Gdk.Atom intern (string atom_name, bool only_if_exists);
 		public static Gdk.Atom intern_static_string (string atom_name);
-		public weak string name ();
+		public unowned string name ();
 	}
 	[CCode (type_id = "GDK_TYPE_COLOR", cheader_filename = "gdk/gdk.h")]
 	public struct Color {
-		public uint pixel;
-		public ushort red;
-		public ushort green;
-		public ushort blue;
+		public uint32 pixel;
+		public uint16 red;
+		public uint16 green;
+		public uint16 blue;
 		public Gdk.Color copy ();
 		public bool equal (Gdk.Color colorb);
 		public void free ();
 		public uint hash ();
 		public static bool parse (string spec, out Gdk.Color color);
-		public weak string to_string ();
+		public unowned string to_string ();
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (type_id = "GDK_TYPE_DEVICE_AXIS", cheader_filename = "gdk/gdk.h")]
 	public struct DeviceAxis {
 		public Gdk.AxisUse use;
 		public double min;
 		public double max;
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (type_id = "GDK_TYPE_DEVICE_KEY", cheader_filename = "gdk/gdk.h")]
 	public struct DeviceKey {
 		public uint keyval;
 		public Gdk.ModifierType modifiers;
@@ -608,9 +608,9 @@
 		public bool get_coords (out double x_win, out double y_win);
 		public static Gdk.Event get_graphics_expose (Gdk.Window window);
 		public bool get_root_coords (out double x_root, out double y_root);
-		public weak Gdk.Screen get_screen ();
+		public unowned Gdk.Screen get_screen ();
 		public bool get_state (out Gdk.ModifierType state);
-		public uint get_time ();
+		public uint32 get_time ();
 		public static void handler_set (Gdk.EventFunc func, void* data, GLib.DestroyNotify notify);
 		[CCode (cname = "gdk_event_new", has_construct_function = false)]
 		public Event (Gdk.EventType type);
@@ -622,18 +622,18 @@
 		public void send_clientmessage_toall ();
 		public void set_screen (Gdk.Screen screen);
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (type_id = "GDK_TYPE_EVENT_ANY", cheader_filename = "gdk/gdk.h")]
 	public struct EventAny {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
 		public char send_event;
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (type_id = "GDK_TYPE_EVENT_BUTTON", cheader_filename = "gdk/gdk.h")]
 	public struct EventButton {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
 		public char send_event;
-		public uint time;
+		public uint32 time;
 		public double x;
 		public double y;
 		public double axes;
@@ -643,7 +643,7 @@
 		public double x_root;
 		public double y_root;
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (type_id = "GDK_TYPE_EVENT_CLIENT", cheader_filename = "gdk/gdk.h")]
 	public struct EventClient {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
@@ -652,7 +652,7 @@
 		public ushort data_format;
 		public void* data;
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (type_id = "GDK_TYPE_EVENT_CONFIGURE", cheader_filename = "gdk/gdk.h")]
 	public struct EventConfigure {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
@@ -662,13 +662,13 @@
 		public int width;
 		public int height;
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (type_id = "GDK_TYPE_EVENT_CROSSING", cheader_filename = "gdk/gdk.h")]
 	public struct EventCrossing {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
 		public char send_event;
 		public weak Gdk.Window subwindow;
-		public uint time;
+		public uint32 time;
 		public double x;
 		public double y;
 		public double x_root;
@@ -678,17 +678,17 @@
 		public bool focus;
 		public uint state;
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (type_id = "GDK_TYPE_EVENT_DND", cheader_filename = "gdk/gdk.h")]
 	public struct EventDND {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
 		public char send_event;
 		public weak Gdk.DragContext context;
-		public uint time;
+		public uint32 time;
 		public short x_root;
 		public short y_root;
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (type_id = "GDK_TYPE_EVENT_EXPOSE", cheader_filename = "gdk/gdk.h")]
 	public struct EventExpose {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
@@ -697,14 +697,14 @@
 		public weak Gdk.Region region;
 		public int count;
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (type_id = "GDK_TYPE_EVENT_FOCUS", cheader_filename = "gdk/gdk.h")]
 	public struct EventFocus {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
 		public char send_event;
-		public short @in;
+		public int16 @in;
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (type_id = "GDK_TYPE_EVENT_GRAB_BROKEN", cheader_filename = "gdk/gdk.h")]
 	public struct EventGrabBroken {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
@@ -713,27 +713,27 @@
 		public bool implicit;
 		public weak Gdk.Window grab_window;
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (type_id = "GDK_TYPE_EVENT_KEY", cheader_filename = "gdk/gdk.h")]
 	public struct EventKey {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
 		public char send_event;
-		public uint time;
+		public uint32 time;
 		public uint state;
 		public uint keyval;
 		public int length;
 		[CCode (cname = "string")]
 		public weak string str;
-		public ushort hardware_keycode;
+		public uint16 hardware_keycode;
 		public uchar group;
 		public uint is_modifier;
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (type_id = "GDK_TYPE_EVENT_MOTION", cheader_filename = "gdk/gdk.h")]
 	public struct EventMotion {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
 		public char send_event;
-		public uint time;
+		public uint32 time;
 		public double x;
 		public double y;
 		public double axes;
@@ -743,13 +743,13 @@
 		public double x_root;
 		public double y_root;
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (type_id = "GDK_TYPE_EVENT_NO_EXPOSE", cheader_filename = "gdk/gdk.h")]
 	public struct EventNoExpose {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
 		public char send_event;
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (type_id = "GDK_TYPE_EVENT_OWNER_CHANGE", cheader_filename = "gdk/gdk.h")]
 	public struct EventOwnerChange {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
@@ -757,32 +757,32 @@
 		public Gdk.NativeWindow owner;
 		public Gdk.OwnerChange reason;
 		public Gdk.Atom selection;
-		public uint time;
-		public uint selection_time;
+		public uint32 time;
+		public uint32 selection_time;
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (type_id = "GDK_TYPE_EVENT_PROPERTY", cheader_filename = "gdk/gdk.h")]
 	public struct EventProperty {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
 		public char send_event;
 		public Gdk.Atom atom;
-		public uint time;
+		public uint32 time;
 		public uint state;
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (type_id = "GDK_TYPE_EVENT_PROXIMITY", cheader_filename = "gdk/gdk.h")]
 	public struct EventProximity {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
 		public char send_event;
-		public uint time;
+		public uint32 time;
 		public weak Gdk.Device device;
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (type_id = "GDK_TYPE_EVENT_SCROLL", cheader_filename = "gdk/gdk.h")]
 	public struct EventScroll {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
 		public char send_event;
-		public uint time;
+		public uint32 time;
 		public double x;
 		public double y;
 		public uint state;
@@ -791,7 +791,7 @@
 		public double x_root;
 		public double y_root;
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (type_id = "GDK_TYPE_EVENT_SELECTION", cheader_filename = "gdk/gdk.h")]
 	public struct EventSelection {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
@@ -799,10 +799,10 @@
 		public Gdk.Atom selection;
 		public Gdk.Atom target;
 		public Gdk.Atom property;
-		public uint time;
+		public uint32 time;
 		public Gdk.NativeWindow requestor;
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (type_id = "GDK_TYPE_EVENT_SETTING", cheader_filename = "gdk/gdk.h")]
 	public struct EventSetting {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
@@ -810,14 +810,14 @@
 		public Gdk.SettingAction action;
 		public weak string name;
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (type_id = "GDK_TYPE_EVENT_VISIBILITY", cheader_filename = "gdk/gdk.h")]
 	public struct EventVisibility {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
 		public char send_event;
 		public Gdk.VisibilityState state;
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (type_id = "GDK_TYPE_EVENT_WINDOW_STATE", cheader_filename = "gdk/gdk.h")]
 	public struct EventWindowState {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
@@ -825,7 +825,7 @@
 		public Gdk.WindowState changed_mask;
 		public Gdk.WindowState new_window_state;
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (type_id = "GDK_TYPE_GC_VALUES", cheader_filename = "gdk/gdk.h")]
 	public struct GCValues {
 		public Gdk.Color foreground;
 		public Gdk.Color background;
@@ -846,7 +846,7 @@
 		public Gdk.CapStyle cap_style;
 		public Gdk.JoinStyle join_style;
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (type_id = "GDK_TYPE_GEOMETRY", cheader_filename = "gdk/gdk.h")]
 	public struct Geometry {
 		public int min_width;
 		public int min_height;
@@ -860,37 +860,37 @@
 		public double max_aspect;
 		public Gdk.Gravity win_gravity;
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (type_id = "GDK_TYPE_KEYMAP_KEY", cheader_filename = "gdk/gdk.h")]
 	public struct KeymapKey {
 		public uint keycode;
 		public int group;
 		public int level;
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (type_id = "GDK_TYPE_NATIVE_WINDOW", cheader_filename = "gdk/gdk.h")]
 	public struct NativeWindow {
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (type_id = "GDK_TYPE_PANGO_ATTR_EMBOSS_COLOR", cheader_filename = "gdk/gdk.h")]
 	public struct PangoAttrEmbossColor {
 		public weak Pango.Attribute attr;
 		public Pango.Color color;
 		[CCode (cname = "gdk_pango_attr_emboss_color_new", has_construct_function = false)]
 		public PangoAttrEmbossColor (Gdk.Color color);
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (type_id = "GDK_TYPE_PANGO_ATTR_EMBOSSED", cheader_filename = "gdk/gdk.h")]
 	public struct PangoAttrEmbossed {
 		public weak Pango.Attribute attr;
 		public bool embossed;
 		[CCode (cname = "gdk_pango_attr_embossed_new", has_construct_function = false)]
 		public PangoAttrEmbossed (bool embossed);
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (type_id = "GDK_TYPE_PANGO_ATTR_STIPPLE", cheader_filename = "gdk/gdk.h")]
 	public struct PangoAttrStipple {
 		public weak Pango.Attribute attr;
 		public weak Gdk.Bitmap stipple;
 		[CCode (cname = "gdk_pango_attr_stipple_new", has_construct_function = false)]
 		public PangoAttrStipple (Gdk.Bitmap stipple);
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (type_id = "GDK_TYPE_POINT", cheader_filename = "gdk/gdk.h")]
 	public struct Point {
 		public int x;
 		public int y;
@@ -904,36 +904,36 @@
 		public bool intersect (Gdk.Rectangle src2, Gdk.Rectangle dest);
 		public void union (Gdk.Rectangle src2, out Gdk.Rectangle dest);
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (type_id = "GDK_TYPE_RGB_CMAP", cheader_filename = "gdk/gdk.h")]
 	public struct RgbCmap {
 		[NoArrayLength]
-		public weak uint[] colors;
+		public weak uint32[] colors;
 		public int n_colors;
 		public weak GLib.SList info_list;
 		public void free ();
 		[CCode (cname = "gdk_rgb_cmap_new", has_construct_function = false)]
-		public RgbCmap (uint[] colors);
+		public RgbCmap (uint32[] colors);
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (type_id = "GDK_TYPE_SEGMENT", cheader_filename = "gdk/gdk.h")]
 	public struct Segment {
 		public int x1;
 		public int y1;
 		public int x2;
 		public int y2;
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (type_id = "GDK_TYPE_SPAN", cheader_filename = "gdk/gdk.h")]
 	public struct Span {
 		public int x;
 		public int y;
 		public int width;
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (type_id = "GDK_TYPE_TIME_COORD", cheader_filename = "gdk/gdk.h")]
 	public struct TimeCoord {
-		public uint time;
+		public uint32 time;
 		[NoArrayLength]
 		public weak double[] axes;
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (type_id = "GDK_TYPE_TRAPEZOID", cheader_filename = "gdk/gdk.h")]
 	public struct Trapezoid {
 		public double y1;
 		public double x11;
@@ -942,10 +942,10 @@
 		public double x12;
 		public double x22;
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (type_id = "GDK_TYPE_WCHAR", cheader_filename = "gdk/gdk.h")]
 	public struct WChar {
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (type_id = "GDK_TYPE_WINDOW_ATTR", cheader_filename = "gdk/gdk.h")]
 	public struct WindowAttr {
 		public weak string title;
 		public int event_mask;
@@ -963,11 +963,11 @@
 		public bool override_redirect;
 		public Gdk.WindowTypeHint type_hint;
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (type_id = "GDK_TYPE_WINDOW_REDIRECT", cheader_filename = "gdk/gdk.h")]
 	public struct WindowRedirect {
 		public static void to_drawable (Gdk.Window window, Gdk.Drawable drawable, int src_x, int src_y, int dest_x, int dest_y, int width, int height);
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (type_id = "GDK_TYPE_XEVENT", cheader_filename = "gdk/gdk.h")]
 	public struct XEvent {
 	}
 	[CCode (cprefix = "GDK_AXIS_", cheader_filename = "gdk/gdk.h")]
@@ -1545,29 +1545,29 @@
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void colors_free (Gdk.Colormap colormap, ulong pixels, int npixels, ulong planes);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static weak GLib.List devices_list ();
+	public static unowned GLib.List devices_list ();
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void drag_abort (Gdk.DragContext context, uint time_);
+	public static void drag_abort (Gdk.DragContext context, uint32 time_);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static weak Gdk.DragContext drag_begin (Gdk.Window window, GLib.List targets);
+	public static unowned Gdk.DragContext drag_begin (Gdk.Window window, GLib.List targets);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void drag_drop (Gdk.DragContext context, uint time_);
+	public static void drag_drop (Gdk.DragContext context, uint32 time_);
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static bool drag_drop_succeeded (Gdk.DragContext context);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void drag_find_window (Gdk.DragContext context, Gdk.Window drag_window, int x_root, int y_root, out weak Gdk.Window dest_window, Gdk.DragProtocol protocol);
+	public static void drag_find_window (Gdk.DragContext context, Gdk.Window drag_window, int x_root, int y_root, out unowned Gdk.Window dest_window, Gdk.DragProtocol protocol);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void drag_find_window_for_screen (Gdk.DragContext context, Gdk.Window drag_window, Gdk.Screen screen, int x_root, int y_root, out weak Gdk.Window dest_window, Gdk.DragProtocol protocol);
+	public static void drag_find_window_for_screen (Gdk.DragContext context, Gdk.Window drag_window, Gdk.Screen screen, int x_root, int y_root, out unowned Gdk.Window dest_window, Gdk.DragProtocol protocol);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static uint drag_get_protocol (uint xid, Gdk.DragProtocol protocol);
+	public static uint32 drag_get_protocol (uint32 xid, Gdk.DragProtocol protocol);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static uint drag_get_protocol_for_display (Gdk.Display display, uint xid, Gdk.DragProtocol protocol);
+	public static uint32 drag_get_protocol_for_display (Gdk.Display display, uint32 xid, Gdk.DragProtocol protocol);
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static Gdk.Atom drag_get_selection (Gdk.DragContext context);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static bool drag_motion (Gdk.DragContext context, Gdk.Window dest_window, Gdk.DragProtocol protocol, int x_root, int y_root, Gdk.DragAction suggested_action, Gdk.DragAction possible_actions, uint time_);
+	public static bool drag_motion (Gdk.DragContext context, Gdk.Window dest_window, Gdk.DragProtocol protocol, int x_root, int y_root, Gdk.DragAction suggested_action, Gdk.DragAction possible_actions, uint32 time_);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void drag_status (Gdk.DragContext context, Gdk.DragAction action, uint time_);
+	public static void drag_status (Gdk.DragContext context, Gdk.DragAction action, uint32 time_);
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void draw_arc (Gdk.Drawable drawable, Gdk.GC gc, bool filled, int x, int y, int width, int height, int angle1, int angle2);
 	[CCode (cheader_filename = "gdk/gdk.h")]
@@ -1621,9 +1621,9 @@
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void draw_trapezoids (Gdk.Drawable drawable, Gdk.GC gc, Gdk.Trapezoid[] trapezoids);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void drop_finish (Gdk.DragContext context, bool success, uint time_);
+	public static void drop_finish (Gdk.DragContext context, bool success, uint32 time_);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void drop_reply (Gdk.DragContext context, bool ok, uint time_);
+	public static void drop_reply (Gdk.DragContext context, bool ok, uint32 time_);
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static int error_trap_pop ();
 	[CCode (cheader_filename = "gdk/gdk.h")]
@@ -1633,33 +1633,33 @@
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void flush ();
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static weak Gdk.Font fontset_load_for_display (Gdk.Display display, string fontset_name);
+	public static unowned Gdk.Font fontset_load_for_display (Gdk.Display display, string fontset_name);
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void free_compound_text (uchar[] ctext);
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void free_text_list (string list);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static weak Gdk.Window get_default_root_window ();
+	public static unowned Gdk.Window get_default_root_window ();
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static weak string get_display ();
+	public static unowned string get_display ();
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static weak string get_display_arg_name ();
+	public static unowned string get_display_arg_name ();
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static weak string get_program_class ();
+	public static unowned string get_program_class ();
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static bool get_show_events ();
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void init ([CCode (array_length_pos = 0.9)] ref weak string[] argv);
+	public static void init ([CCode (array_length_pos = 0.9)] ref unowned string[] argv);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static bool init_check ([CCode (array_length_pos = 0.9)] ref weak string[] argv);
+	public static bool init_check ([CCode (array_length_pos = 0.9)] ref unowned string[] argv);
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void input_set_extension_events (Gdk.Window window, int mask, Gdk.ExtensionMode mode);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static Gdk.GrabStatus keyboard_grab (Gdk.Window window, bool owner_events, uint time_);
+	public static Gdk.GrabStatus keyboard_grab (Gdk.Window window, bool owner_events, uint32 time_);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static bool keyboard_grab_info_libgtk_only (Gdk.Display display, out weak Gdk.Window grab_window, bool owner_events);
+	public static bool keyboard_grab_info_libgtk_only (Gdk.Display display, out unowned Gdk.Window grab_window, bool owner_events);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void keyboard_ungrab (uint time_);
+	public static void keyboard_ungrab (uint32 time_);
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void keyval_convert_case (uint symbol, uint lower, uint upper);
 	[CCode (cheader_filename = "gdk/gdk.h")]
@@ -1669,47 +1669,47 @@
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static bool keyval_is_upper (uint keyval);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static weak string keyval_name (uint keyval);
+	public static unowned string keyval_name (uint keyval);
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static uint keyval_to_lower (uint keyval);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static uint keyval_to_unicode (uint keyval);
+	public static uint32 keyval_to_unicode (uint keyval);
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static uint keyval_to_upper (uint keyval);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static weak GLib.List list_visuals ();
+	public static unowned GLib.List list_visuals ();
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void notify_startup_complete ();
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void notify_startup_complete_with_id (string startup_id);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static weak Pango.Context pango_context_get ();
+	public static unowned Pango.Context pango_context_get ();
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static weak Pango.Context pango_context_get_for_screen (Gdk.Screen screen);
+	public static unowned Pango.Context pango_context_get_for_screen (Gdk.Screen screen);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static weak Gdk.Region pango_layout_get_clip_region (Pango.Layout layout, int x_origin, int y_origin, int index_ranges, int n_ranges);
+	public static unowned Gdk.Region pango_layout_get_clip_region (Pango.Layout layout, int x_origin, int y_origin, int index_ranges, int n_ranges);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static weak Gdk.Region pango_layout_line_get_clip_region (Pango.LayoutLine line, int x_origin, int y_origin, int index_ranges, int n_ranges);
+	public static unowned Gdk.Region pango_layout_line_get_clip_region (Pango.LayoutLine line, int x_origin, int y_origin, int index_ranges, int n_ranges);
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void parse_args (int argc, string argv);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static weak Gdk.Pixbuf pixbuf_get_from_drawable (Gdk.Pixbuf? dest, Gdk.Drawable src, Gdk.Colormap? cmap, int src_x, int src_y, int dest_x, int dest_y, int width, int height);
+	public static unowned Gdk.Pixbuf pixbuf_get_from_drawable (Gdk.Pixbuf? dest, Gdk.Drawable src, Gdk.Colormap? cmap, int src_x, int src_y, int dest_x, int dest_y, int width, int height);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static weak Gdk.Pixbuf pixbuf_get_from_image (Gdk.Pixbuf? dest, Gdk.Image src, Gdk.Colormap? cmap, int src_x, int src_y, int dest_x, int dest_y, int width, int height);
+	public static unowned Gdk.Pixbuf pixbuf_get_from_image (Gdk.Pixbuf? dest, Gdk.Image src, Gdk.Colormap? cmap, int src_x, int src_y, int dest_x, int dest_y, int width, int height);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void pixbuf_render_pixmap_and_mask (Gdk.Pixbuf pixbuf, out weak Gdk.Pixmap pixmap_return, out weak Gdk.Bitmap mask_return, int alpha_threshold);
+	public static void pixbuf_render_pixmap_and_mask (Gdk.Pixbuf pixbuf, out unowned Gdk.Pixmap pixmap_return, out unowned Gdk.Bitmap mask_return, int alpha_threshold);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void pixbuf_render_pixmap_and_mask_for_colormap (Gdk.Pixbuf pixbuf, Gdk.Colormap colormap, out weak Gdk.Pixmap pixmap_return, out weak Gdk.Bitmap mask_return, int alpha_threshold);
+	public static void pixbuf_render_pixmap_and_mask_for_colormap (Gdk.Pixbuf pixbuf, Gdk.Colormap colormap, out unowned Gdk.Pixmap pixmap_return, out unowned Gdk.Bitmap mask_return, int alpha_threshold);
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void pixbuf_render_threshold_alpha (Gdk.Pixbuf pixbuf, Gdk.Bitmap bitmap, int src_x, int src_y, int dest_x, int dest_y, int width, int height, int alpha_threshold);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static Gdk.GrabStatus pointer_grab (Gdk.Window window, bool owner_events, Gdk.EventMask event_mask, Gdk.Window? confine_to, Gdk.Cursor? cursor, uint time_);
+	public static Gdk.GrabStatus pointer_grab (Gdk.Window window, bool owner_events, Gdk.EventMask event_mask, Gdk.Window? confine_to, Gdk.Cursor? cursor, uint32 time_);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static bool pointer_grab_info_libgtk_only (Gdk.Display display, out weak Gdk.Window grab_window, bool owner_events);
+	public static bool pointer_grab_info_libgtk_only (Gdk.Display display, out unowned Gdk.Window grab_window, bool owner_events);
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static bool pointer_is_grabbed ();
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void pointer_ungrab (uint time_);
+	public static void pointer_ungrab (uint32 time_);
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void pre_parse_libgtk_only ();
 	[CCode (cheader_filename = "gdk/gdk.h")]
@@ -1729,9 +1729,9 @@
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void rgb_find_color (Gdk.Colormap colormap, ref Gdk.Color color);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static weak Gdk.Colormap rgb_get_colormap ();
+	public static unowned Gdk.Colormap rgb_get_colormap ();
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static weak Gdk.Visual rgb_get_visual ();
+	public static unowned Gdk.Visual rgb_get_visual ();
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void rgb_set_install (bool install);
 	[CCode (cheader_filename = "gdk/gdk.h")]
@@ -1739,27 +1739,27 @@
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void rgb_set_verbose (bool verbose);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void selection_convert (Gdk.Window requestor, Gdk.Atom selection, Gdk.Atom target, uint time_);
+	public static void selection_convert (Gdk.Window requestor, Gdk.Atom selection, Gdk.Atom target, uint32 time_);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static weak Gdk.Window selection_owner_get (Gdk.Atom selection);
+	public static unowned Gdk.Window selection_owner_get (Gdk.Atom selection);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static weak Gdk.Window selection_owner_get_for_display (Gdk.Display display, Gdk.Atom selection);
+	public static unowned Gdk.Window selection_owner_get_for_display (Gdk.Display display, Gdk.Atom selection);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static bool selection_owner_set (Gdk.Window owner, Gdk.Atom selection, uint time_, bool send_event);
+	public static bool selection_owner_set (Gdk.Window owner, Gdk.Atom selection, uint32 time_, bool send_event);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static bool selection_owner_set_for_display (Gdk.Display display, Gdk.Window owner, Gdk.Atom selection, uint time_, bool send_event);
+	public static bool selection_owner_set_for_display (Gdk.Display display, Gdk.Window owner, Gdk.Atom selection, uint32 time_, bool send_event);
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static bool selection_property_get (Gdk.Window requestor, uchar[] data, Gdk.Atom prop_type, int prop_format);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void selection_send_notify (uint requestor, Gdk.Atom selection, Gdk.Atom target, Gdk.Atom property, uint time_);
+	public static void selection_send_notify (uint32 requestor, Gdk.Atom selection, Gdk.Atom target, Gdk.Atom property, uint32 time_);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void selection_send_notify_for_display (Gdk.Display display, uint requestor, Gdk.Atom selection, Gdk.Atom target, Gdk.Atom property, uint time_);
+	public static void selection_send_notify_for_display (Gdk.Display display, uint32 requestor, Gdk.Atom selection, Gdk.Atom target, Gdk.Atom property, uint32 time_);
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void set_double_click_time (uint msec);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static weak string set_locale ();
+	public static unowned string set_locale ();
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static weak Gdk.PointerHooks set_pointer_hooks (Gdk.PointerHooks new_hooks);
+	public static unowned Gdk.PointerHooks set_pointer_hooks (Gdk.PointerHooks new_hooks);
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void set_program_class (string program_class);
 	[CCode (cheader_filename = "gdk/gdk.h")]
@@ -1812,11 +1812,11 @@
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void threads_set_lock_functions (GLib.Callback enter_fn, GLib.Callback leave_fn);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static uint unicode_to_keyval (uint wc);
+	public static uint unicode_to_keyval (uint32 wc);
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static bool utf8_to_compound_text (string str, Gdk.Atom encoding, int format, uchar[] ctext, int length);
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static bool utf8_to_compound_text_for_display (Gdk.Display display, string str, Gdk.Atom encoding, int format, uchar[] ctext, int length);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static weak string utf8_to_string_target (string str);
+	public static unowned string utf8_to_string_target (string str);
 }

Modified: trunk/vapi/gdk-pixbuf-2.0.vapi
==============================================================================
--- trunk/vapi/gdk-pixbuf-2.0.vapi	(original)
+++ trunk/vapi/gdk-pixbuf-2.0.vapi	Fri Dec 19 21:56:41 2008
@@ -4,16 +4,16 @@
 namespace Gdk {
 	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
 	public class Pixbuf : GLib.Object {
-		public weak Gdk.Pixbuf add_alpha (bool substitute_color, uchar r, uchar g, uchar b);
-		public weak Gdk.Pixbuf apply_embedded_orientation ();
+		public unowned Gdk.Pixbuf add_alpha (bool substitute_color, uchar r, uchar g, uchar b);
+		public unowned Gdk.Pixbuf apply_embedded_orientation ();
 		public void composite (Gdk.Pixbuf dest, int dest_x, int dest_y, int dest_width, int dest_height, double offset_x, double offset_y, double scale_x, double scale_y, Gdk.InterpType interp_type, int overall_alpha);
-		public void composite_color (Gdk.Pixbuf dest, int dest_x, int dest_y, int dest_width, int dest_height, double offset_x, double offset_y, double scale_x, double scale_y, Gdk.InterpType interp_type, int overall_alpha, int check_x, int check_y, int check_size, uint color1, uint color2);
-		public weak Gdk.Pixbuf composite_color_simple (int dest_width, int dest_height, Gdk.InterpType interp_type, int overall_alpha, int check_size, uint color1, uint color2);
-		public weak Gdk.Pixbuf copy ();
+		public void composite_color (Gdk.Pixbuf dest, int dest_x, int dest_y, int dest_width, int dest_height, double offset_x, double offset_y, double scale_x, double scale_y, Gdk.InterpType interp_type, int overall_alpha, int check_x, int check_y, int check_size, uint32 color1, uint32 color2);
+		public unowned Gdk.Pixbuf composite_color_simple (int dest_width, int dest_height, Gdk.InterpType interp_type, int overall_alpha, int check_size, uint32 color1, uint32 color2);
+		public unowned Gdk.Pixbuf copy ();
 		public void copy_area (int src_x, int src_y, int width, int height, Gdk.Pixbuf dest_pixbuf, int dest_x, int dest_y);
 		public static GLib.Quark error_quark ();
-		public void fill (uint pixel);
-		public weak Gdk.Pixbuf flip (bool horizontal);
+		public void fill (uint32 pixel);
+		public unowned Gdk.Pixbuf flip (bool horizontal);
 		[NoArrayLength]
 		[CCode (has_construct_function = false)]
 		public Pixbuf.from_data (uchar[] data, Gdk.Colorspace colorspace, bool has_alpha, int bits_per_sample, int width, int height, int rowstride, Gdk.PixbufDestroyNotify? destroy_fn);
@@ -26,7 +26,7 @@
 		[NoArrayLength]
 		[CCode (has_construct_function = false)]
 		public Pixbuf.from_inline (int data_length, uchar[] data, bool copy_pixels) throws GLib.Error;
-		public static weak Gdk.Pixbuf from_pixdata (Gdk.Pixdata pixdata, bool copy_pixels) throws GLib.Error;
+		public static unowned Gdk.Pixbuf from_pixdata (Gdk.Pixdata pixdata, bool copy_pixels) throws GLib.Error;
 		[CCode (has_construct_function = false)]
 		public Pixbuf.from_stream (GLib.InputStream stream, GLib.Cancellable? cancellable) throws GLib.Error;
 		[CCode (has_construct_function = false)]
@@ -36,19 +36,19 @@
 		public Pixbuf.from_xpm_data (string[] data);
 		public int get_bits_per_sample ();
 		public Gdk.Colorspace get_colorspace ();
-		public static weak Gdk.PixbufFormat get_file_info (string filename, int width, int height);
-		public static weak GLib.SList get_formats ();
+		public static unowned Gdk.PixbufFormat get_file_info (string filename, int width, int height);
+		public static unowned GLib.SList get_formats ();
 		public bool get_has_alpha ();
 		public int get_height ();
 		public int get_n_channels ();
-		public weak string get_option (string key);
+		public unowned string get_option (string key);
 		[NoArrayLength]
-		public weak uchar[] get_pixels ();
+		public unowned uchar[] get_pixels ();
 		public int get_rowstride ();
 		public int get_width ();
 		[CCode (has_construct_function = false)]
 		public Pixbuf (Gdk.Colorspace colorspace, bool has_alpha, int bits_per_sample, int width, int height);
-		public weak Gdk.Pixbuf rotate_simple (Gdk.PixbufRotation angle);
+		public unowned Gdk.Pixbuf rotate_simple (Gdk.PixbufRotation angle);
 		public void saturate_and_pixelate (Gdk.Pixbuf dest, float saturation, bool pixelate);
 		public bool save (string filename, string type, ...) throws GLib.Error;
 		public bool save_to_buffer (string buffer, size_t buffer_size, string type, ...) throws GLib.Error;
@@ -56,9 +56,9 @@
 		public bool save_to_callback (Gdk.PixbufSaveFunc save_func, string type) throws GLib.Error;
 		public bool save_to_callbackv (Gdk.PixbufSaveFunc save_func, string type, string[] option_keys, string[] option_values) throws GLib.Error;
 		public bool save_to_stream (GLib.OutputStream stream, string type, GLib.Cancellable cancellable) throws GLib.Error;
-		public bool savev (string filename, string type, out weak string option_keys, out weak string option_values) throws GLib.Error;
+		public bool savev (string filename, string type, out unowned string option_keys, out unowned string option_values) throws GLib.Error;
 		public void scale (Gdk.Pixbuf dest, int dest_x, int dest_y, int dest_width, int dest_height, double offset_x, double offset_y, double scale_x, double scale_y, Gdk.InterpType interp_type);
-		public weak Gdk.Pixbuf scale_simple (int dest_width, int dest_height, Gdk.InterpType interp_type);
+		public unowned Gdk.Pixbuf scale_simple (int dest_width, int dest_height, Gdk.InterpType interp_type);
 		[CCode (has_construct_function = false)]
 		public Pixbuf.subpixbuf (Gdk.Pixbuf src_pixbuf, int src_x, int src_y, int width, int height);
 		[NoAccessorMethod]
@@ -83,8 +83,8 @@
 		[CCode (has_construct_function = false)]
 		public PixbufAnimation.from_file (string filename) throws GLib.Error;
 		public int get_height ();
-		public weak Gdk.PixbufAnimationIter get_iter (GLib.TimeVal start_time);
-		public weak Gdk.Pixbuf get_static_image ();
+		public unowned Gdk.PixbufAnimationIter get_iter (GLib.TimeVal start_time);
+		public unowned Gdk.Pixbuf get_static_image ();
 		public int get_width ();
 		public bool is_static_image ();
 	}
@@ -92,17 +92,17 @@
 	public class PixbufAnimationIter : GLib.Object {
 		public bool advance (GLib.TimeVal current_time);
 		public int get_delay_time ();
-		public weak Gdk.Pixbuf get_pixbuf ();
+		public unowned Gdk.Pixbuf get_pixbuf ();
 		public bool on_currently_loading_frame ();
 	}
 	[Compact]
 	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
 	public class PixbufFormat {
-		public weak string get_description ();
-		public weak string get_extensions ();
-		public weak string get_license ();
-		public weak string get_mime_types ();
-		public weak string get_name ();
+		public unowned string get_description ();
+		public unowned string get_extensions ();
+		public unowned string get_license ();
+		public unowned string get_mime_types ();
+		public unowned string get_name ();
 		public bool is_disabled ();
 		public bool is_scalable ();
 		public bool is_writable ();
@@ -111,9 +111,9 @@
 	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
 	public class PixbufLoader : GLib.Object {
 		public bool close () throws GLib.Error;
-		public weak Gdk.PixbufAnimation get_animation ();
-		public weak Gdk.PixbufFormat get_format ();
-		public weak Gdk.Pixbuf get_pixbuf ();
+		public unowned Gdk.PixbufAnimation get_animation ();
+		public unowned Gdk.PixbufFormat get_format ();
+		public unowned Gdk.Pixbuf get_pixbuf ();
 		[CCode (has_construct_function = false)]
 		public PixbufLoader ();
 		public void set_size (int width, int height);
@@ -142,18 +142,18 @@
 	}
 	[CCode (type_id = "GDK_TYPE_PIXDATA", cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
 	public struct Pixdata {
-		public uint magic;
-		public int length;
-		public uint pixdata_type;
-		public uint rowstride;
-		public uint width;
-		public uint height;
+		public uint32 magic;
+		public int32 length;
+		public uint32 pixdata_type;
+		public uint32 rowstride;
+		public uint32 width;
+		public uint32 height;
 		[NoArrayLength]
 		public weak uchar[] pixel_data;
 		public bool deserialize ([CCode (array_length_pos = 0.9)] uchar[] stream) throws GLib.Error;
 		public void* from_pixbuf (Gdk.Pixbuf pixbuf, bool use_rle);
-		public weak uchar[] serialize ();
-		public weak GLib.StringBuilder to_csource (string name, Gdk.PixdataDumpType dump_type);
+		public unowned uchar[] serialize ();
+		public unowned GLib.StringBuilder to_csource (string name, Gdk.PixdataDumpType dump_type);
 	}
 	[CCode (cprefix = "GDK_COLORSPACE_", cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
 	public enum Colorspace {

Modified: trunk/vapi/gio-2.0.vapi
==============================================================================
--- trunk/vapi/gio-2.0.vapi	(original)
+++ trunk/vapi/gio-2.0.vapi	Fri Dec 19 21:56:41 2008
@@ -4,8 +4,8 @@
 namespace GLib {
 	[CCode (cheader_filename = "gio/gio.h")]
 	public class AppLaunchContext : GLib.Object {
-		public virtual weak string get_display (GLib.AppInfo info, GLib.List files);
-		public virtual weak string get_startup_notify_id (GLib.AppInfo info, GLib.List files);
+		public virtual unowned string get_display (GLib.AppInfo info, GLib.List files);
+		public virtual unowned string get_startup_notify_id (GLib.AppInfo info, GLib.List files);
 		public virtual void launch_failed (string startup_notify_id);
 		[CCode (has_construct_function = false)]
 		public AppLaunchContext ();
@@ -43,7 +43,7 @@
 	[CCode (cheader_filename = "gio/gio.h")]
 	public class Cancellable : GLib.Object {
 		public void cancel ();
-		public static weak GLib.Cancellable get_current ();
+		public static unowned GLib.Cancellable get_current ();
 		public int get_fd ();
 		public bool is_cancelled ();
 		[CCode (has_construct_function = false)]
@@ -61,14 +61,14 @@
 		[CCode (has_construct_function = false)]
 		public DataInputStream (GLib.InputStream base_stream);
 		public uchar read_byte (GLib.Cancellable? cancellable) throws GLib.Error;
-		public short read_int16 (GLib.Cancellable? cancellable) throws GLib.Error;
-		public int read_int32 (GLib.Cancellable? cancellable) throws GLib.Error;
+		public int16 read_int16 (GLib.Cancellable? cancellable) throws GLib.Error;
+		public int32 read_int32 (GLib.Cancellable? cancellable) throws GLib.Error;
 		public int64 read_int64 (GLib.Cancellable? cancellable) throws GLib.Error;
-		public weak string read_line (out size_t length, GLib.Cancellable? cancellable) throws GLib.Error;
-		public ushort read_uint16 (GLib.Cancellable? cancellable) throws GLib.Error;
-		public uint read_uint32 (GLib.Cancellable? cancellable) throws GLib.Error;
+		public unowned string read_line (out size_t length, GLib.Cancellable? cancellable) throws GLib.Error;
+		public uint16 read_uint16 (GLib.Cancellable? cancellable) throws GLib.Error;
+		public uint32 read_uint32 (GLib.Cancellable? cancellable) throws GLib.Error;
 		public uint64 read_uint64 (GLib.Cancellable? cancellable) throws GLib.Error;
-		public weak string read_until (string stop_chars, out size_t length, GLib.Cancellable? cancellable) throws GLib.Error;
+		public unowned string read_until (string stop_chars, out size_t length, GLib.Cancellable? cancellable) throws GLib.Error;
 		public void set_byte_order (GLib.DataStreamByteOrder order);
 		public void set_newline_type (GLib.DataStreamNewlineType type);
 		public GLib.DataStreamByteOrder byte_order { get; set; }
@@ -80,12 +80,12 @@
 		[CCode (has_construct_function = false)]
 		public DataOutputStream (GLib.OutputStream base_stream);
 		public bool put_byte (uchar data, GLib.Cancellable? cancellable) throws GLib.Error;
-		public bool put_int16 (short data, GLib.Cancellable? cancellable) throws GLib.Error;
-		public bool put_int32 (int data, GLib.Cancellable? cancellable) throws GLib.Error;
+		public bool put_int16 (int16 data, GLib.Cancellable? cancellable) throws GLib.Error;
+		public bool put_int32 (int32 data, GLib.Cancellable? cancellable) throws GLib.Error;
 		public bool put_int64 (int64 data, GLib.Cancellable? cancellable) throws GLib.Error;
 		public bool put_string (string str, GLib.Cancellable? cancellable) throws GLib.Error;
-		public bool put_uint16 (ushort data, GLib.Cancellable? cancellable) throws GLib.Error;
-		public bool put_uint32 (uint data, GLib.Cancellable? cancellable) throws GLib.Error;
+		public bool put_uint16 (uint16 data, GLib.Cancellable? cancellable) throws GLib.Error;
+		public bool put_uint32 (uint32 data, GLib.Cancellable? cancellable) throws GLib.Error;
 		public bool put_uint64 (uint64 data, GLib.Cancellable? cancellable) throws GLib.Error;
 		public void set_byte_order (GLib.DataStreamByteOrder order);
 		public GLib.DataStreamByteOrder byte_order { get; set; }
@@ -103,8 +103,8 @@
 		public weak GLib.FileAttributeInfo infos;
 		public int n_infos;
 		public void add (string name, GLib.FileAttributeType type, GLib.FileAttributeInfoFlags flags);
-		public weak GLib.FileAttributeInfoList dup ();
-		public weak GLib.FileAttributeInfo lookup (string name);
+		public unowned GLib.FileAttributeInfoList dup ();
+		public unowned GLib.FileAttributeInfo lookup (string name);
 		[CCode (has_construct_function = false)]
 		public FileAttributeInfoList ();
 	}
@@ -112,7 +112,7 @@
 	[CCode (ref_function = "g_file_attribute_matcher_ref", unref_function = "g_file_attribute_matcher_unref", cheader_filename = "gio/gio.h")]
 	public class FileAttributeMatcher {
 		public bool enumerate_namespace (string ns);
-		public weak string enumerate_next ();
+		public unowned string enumerate_next ();
 		public bool matches (string attribute);
 		public bool matches_only (string attribute);
 		[CCode (has_construct_function = false)]
@@ -134,7 +134,7 @@
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
 	public class FileIcon : GLib.Object, GLib.Icon, GLib.LoadableIcon {
-		public weak GLib.File get_file ();
+		public unowned GLib.File get_file ();
 		[CCode (type = "GIcon*", has_construct_function = false)]
 		public FileIcon (GLib.File file);
 	}
@@ -146,47 +146,47 @@
 	public class FileInfo : GLib.Object {
 		public void clear_status ();
 		public void copy_into (GLib.FileInfo dest_info);
-		public weak GLib.FileInfo dup ();
-		public weak string get_attribute_as_string (string attribute);
+		public unowned GLib.FileInfo dup ();
+		public unowned string get_attribute_as_string (string attribute);
 		public bool get_attribute_boolean (string attribute);
-		public weak string get_attribute_byte_string (string attribute);
+		public unowned string get_attribute_byte_string (string attribute);
 		public bool get_attribute_data (string attribute, GLib.FileAttributeType? type, void* value_pp, GLib.FileAttributeStatus? status);
-		public int get_attribute_int32 (string attribute);
+		public int32 get_attribute_int32 (string attribute);
 		public int64 get_attribute_int64 (string attribute);
-		public weak GLib.Object get_attribute_object (string attribute);
+		public unowned GLib.Object get_attribute_object (string attribute);
 		public GLib.FileAttributeStatus get_attribute_status (string attribute);
-		public weak string get_attribute_string (string attribute);
+		public unowned string get_attribute_string (string attribute);
 		public GLib.FileAttributeType get_attribute_type (string attribute);
-		public uint get_attribute_uint32 (string attribute);
+		public uint32 get_attribute_uint32 (string attribute);
 		public uint64 get_attribute_uint64 (string attribute);
-		public weak string get_content_type ();
-		public weak string get_display_name ();
-		public weak string get_edit_name ();
-		public weak string get_etag ();
+		public unowned string get_content_type ();
+		public unowned string get_display_name ();
+		public unowned string get_edit_name ();
+		public unowned string get_etag ();
 		public GLib.FileType get_file_type ();
-		public weak GLib.Icon get_icon ();
+		public unowned GLib.Icon get_icon ();
 		public bool get_is_backup ();
 		public bool get_is_hidden ();
 		public bool get_is_symlink ();
 		public void get_modification_time (GLib.TimeVal _result);
-		public weak string get_name ();
+		public unowned string get_name ();
 		public int64 get_size ();
-		public int get_sort_order ();
-		public weak string get_symlink_target ();
+		public int32 get_sort_order ();
+		public unowned string get_symlink_target ();
 		public bool has_attribute (string attribute);
-		public weak string list_attributes (string name_space);
+		public unowned string list_attributes (string name_space);
 		[CCode (has_construct_function = false)]
 		public FileInfo ();
 		public void remove_attribute (string attribute);
 		public void set_attribute (string attribute, GLib.FileAttributeType type, void* value_p);
 		public void set_attribute_boolean (string attribute, bool attr_value);
 		public void set_attribute_byte_string (string attribute, string attr_value);
-		public void set_attribute_int32 (string attribute, int attr_value);
+		public void set_attribute_int32 (string attribute, int32 attr_value);
 		public void set_attribute_int64 (string attribute, int64 attr_value);
 		public void set_attribute_mask (GLib.FileAttributeMatcher mask);
 		public void set_attribute_object (string attribute, GLib.Object attr_value);
 		public void set_attribute_string (string attribute, string attr_value);
-		public void set_attribute_uint32 (string attribute, uint attr_value);
+		public void set_attribute_uint32 (string attribute, uint32 attr_value);
 		public void set_attribute_uint64 (string attribute, uint64 attr_value);
 		public void set_content_type (string content_type);
 		public void set_display_name (string display_name);
@@ -198,7 +198,7 @@
 		public void set_modification_time (GLib.TimeVal mtime);
 		public void set_name (string name);
 		public void set_size (int64 size);
-		public void set_sort_order (int sort_order);
+		public void set_sort_order (int32 sort_order);
 		public void set_symlink_target (string symlink_target);
 		public void unset_attribute_mask ();
 	}
@@ -210,9 +210,9 @@
 	public class FileInputStream : GLib.InputStream, GLib.Seekable {
 		[NoWrapper]
 		public virtual bool can_seek ();
-		public virtual weak GLib.FileInfo query_info (string attributes, GLib.Cancellable? cancellable) throws GLib.Error;
+		public virtual unowned GLib.FileInfo query_info (string attributes, GLib.Cancellable? cancellable) throws GLib.Error;
 		public virtual void query_info_async (string attributes, int io_priority, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
-		public virtual weak GLib.FileInfo query_info_finish (GLib.AsyncResult _result) throws GLib.Error;
+		public virtual unowned GLib.FileInfo query_info_finish (GLib.AsyncResult _result) throws GLib.Error;
 		[NoWrapper]
 		public virtual bool seek (int64 offset, GLib.SeekType type, GLib.Cancellable? cancellable) throws GLib.Error;
 		[NoWrapper]
@@ -221,9 +221,9 @@
 	[CCode (cheader_filename = "gio/gio.h")]
 	public class FileMonitor : GLib.Object {
 		public virtual bool cancel ();
-		public static weak GLib.FileMonitor directory (GLib.File file, GLib.FileMonitorFlags flags, GLib.Cancellable? cancellable) throws GLib.Error;
+		public static unowned GLib.FileMonitor directory (GLib.File file, GLib.FileMonitorFlags flags, GLib.Cancellable? cancellable) throws GLib.Error;
 		public void emit_event (GLib.File child, GLib.File other_file, GLib.FileMonitorEvent event_type);
-		public static weak GLib.FileMonitor file (GLib.File file, GLib.FileMonitorFlags flags, GLib.Cancellable? cancellable) throws GLib.Error;
+		public static unowned GLib.FileMonitor file (GLib.File file, GLib.FileMonitorFlags flags, GLib.Cancellable? cancellable) throws GLib.Error;
 		public bool is_cancelled ();
 		public void set_rate_limit (int limit_msecs);
 		[NoAccessorMethod]
@@ -238,10 +238,10 @@
 		public virtual bool can_seek ();
 		[NoWrapper]
 		public virtual bool can_truncate ();
-		public virtual weak string get_etag ();
-		public virtual weak GLib.FileInfo query_info (string attributes, GLib.Cancellable? cancellable) throws GLib.Error;
+		public virtual unowned string get_etag ();
+		public virtual unowned GLib.FileInfo query_info (string attributes, GLib.Cancellable? cancellable) throws GLib.Error;
 		public virtual void query_info_async (string attributes, int io_priority, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
-		public virtual weak GLib.FileInfo query_info_finish (GLib.AsyncResult _result) throws GLib.Error;
+		public virtual unowned GLib.FileInfo query_info_finish (GLib.AsyncResult _result) throws GLib.Error;
 		[NoWrapper]
 		public virtual bool seek (int64 offset, GLib.SeekType type, GLib.Cancellable? cancellable) throws GLib.Error;
 		[NoWrapper]
@@ -251,8 +251,8 @@
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
 	public class FilenameCompleter : GLib.Object {
-		public weak string get_completion_suffix (string initial_text);
-		public weak string get_completions (string initial_text);
+		public unowned string get_completion_suffix (string initial_text);
+		public unowned string get_completions (string initial_text);
 		[CCode (has_construct_function = false)]
 		public FilenameCompleter ();
 		public void set_dirs_only (bool dirs_only);
@@ -260,33 +260,33 @@
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
 	public class FilterInputStream : GLib.InputStream {
-		public weak GLib.InputStream get_base_stream ();
+		public unowned GLib.InputStream get_base_stream ();
 		[NoAccessorMethod]
 		public GLib.InputStream base_stream { get; construct; }
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
 	public class FilterOutputStream : GLib.OutputStream {
-		public weak GLib.OutputStream get_base_stream ();
+		public unowned GLib.OutputStream get_base_stream ();
 		[NoAccessorMethod]
 		public GLib.OutputStream base_stream { get; construct; }
 	}
 	[Compact]
 	[CCode (cheader_filename = "gio/gio.h")]
 	public class IOExtension {
-		public weak string get_name ();
+		public unowned string get_name ();
 		public int get_priority ();
 		public GLib.Type get_type ();
-		public weak GLib.TypeClass ref_class ();
+		public unowned GLib.TypeClass ref_class ();
 	}
 	[Compact]
 	[CCode (cheader_filename = "gio/gio.h")]
 	public class IOExtensionPoint {
-		public weak GLib.IOExtension get_extension_by_name (string name);
-		public weak GLib.List get_extensions ();
+		public unowned GLib.IOExtension get_extension_by_name (string name);
+		public unowned GLib.List get_extensions ();
 		public GLib.Type get_required_type ();
-		public static weak GLib.IOExtension implement (string extension_point_name, GLib.Type type, string extension_name, int priority);
-		public static weak GLib.IOExtensionPoint lookup (string name);
-		public static weak GLib.IOExtensionPoint register (string name);
+		public static unowned GLib.IOExtension implement (string extension_point_name, GLib.Type type, string extension_name, int priority);
+		public static unowned GLib.IOExtensionPoint lookup (string name);
+		public static unowned GLib.IOExtensionPoint register (string name);
 		public void set_required_type (GLib.Type type);
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
@@ -347,10 +347,10 @@
 	public class MountOperation : GLib.Object {
 		public bool get_anonymous ();
 		public int get_choice ();
-		public weak string get_domain ();
-		public weak string get_password ();
+		public unowned string get_domain ();
+		public unowned string get_password ();
 		public GLib.PasswordSave get_password_save ();
-		public weak string get_username ();
+		public unowned string get_username ();
 		[CCode (has_construct_function = false)]
 		public MountOperation ();
 		public void set_anonymous (bool anonymous);
@@ -373,7 +373,7 @@
 	[CCode (cheader_filename = "gio/gio.h")]
 	public class NativeVolumeMonitor : GLib.VolumeMonitor {
 		[NoWrapper]
-		public virtual weak GLib.Mount get_mount_for_mount_path (string mount_path, GLib.Cancellable? cancellable);
+		public virtual unowned GLib.Mount get_mount_for_mount_path (string mount_path, GLib.Cancellable? cancellable);
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
 	public class OutputStream : GLib.Object {
@@ -433,7 +433,7 @@
 		[CCode (type = "GIcon*", has_construct_function = false)]
 		public ThemedIcon.from_names (string[] iconnames);
 		[NoArrayLength]
-		public weak string[] get_names ();
+		public unowned string[] get_names ();
 		[CCode (type = "GIcon*", has_construct_function = false)]
 		public ThemedIcon (string iconname);
 		public void prepend_name (string iconname);
@@ -452,23 +452,23 @@
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
 	public class Vfs : GLib.Object {
-		public static weak GLib.Vfs get_default ();
-		public virtual weak GLib.File get_file_for_path (string path);
-		public virtual weak GLib.File get_file_for_uri (string uri);
-		public static weak GLib.Vfs get_local ();
-		public virtual weak string get_supported_uri_schemes ();
+		public static unowned GLib.Vfs get_default ();
+		public virtual unowned GLib.File get_file_for_path (string path);
+		public virtual unowned GLib.File get_file_for_uri (string uri);
+		public static unowned GLib.Vfs get_local ();
+		public virtual unowned string get_supported_uri_schemes ();
 		public virtual bool is_active ();
-		public virtual weak GLib.File parse_name (string parse_name);
+		public virtual unowned GLib.File parse_name (string parse_name);
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
 	public class VolumeMonitor : GLib.Object {
-		public virtual weak GLib.Volume adopt_orphan_mount (GLib.Mount mount);
-		public static weak GLib.VolumeMonitor get ();
-		public virtual weak GLib.List get_connected_drives ();
-		public virtual weak GLib.Mount get_mount_for_uuid (string uuid);
-		public virtual weak GLib.List get_mounts ();
-		public virtual weak GLib.Volume get_volume_for_uuid (string uuid);
-		public virtual weak GLib.List get_volumes ();
+		public virtual unowned GLib.Volume adopt_orphan_mount (GLib.Mount mount);
+		public static unowned GLib.VolumeMonitor get ();
+		public virtual unowned GLib.List get_connected_drives ();
+		public virtual unowned GLib.Mount get_mount_for_uuid (string uuid);
+		public virtual unowned GLib.List get_mounts ();
+		public virtual unowned GLib.Volume get_volume_for_uuid (string uuid);
+		public virtual unowned GLib.List get_volumes ();
 		[NoWrapper]
 		public virtual bool is_supported ();
 		public virtual signal void drive_changed (GLib.Drive drive);
@@ -486,18 +486,18 @@
 	public interface AppInfo : GLib.Object {
 		public abstract bool add_supports_type (string content_type) throws GLib.Error;
 		public abstract bool can_remove_supports_type ();
-		public static weak GLib.AppInfo create_from_commandline (string commandline, string application_name, GLib.AppInfoCreateFlags flags) throws GLib.Error;
-		public abstract weak GLib.AppInfo dup ();
+		public static unowned GLib.AppInfo create_from_commandline (string commandline, string application_name, GLib.AppInfoCreateFlags flags) throws GLib.Error;
+		public abstract unowned GLib.AppInfo dup ();
 		public abstract bool equal (GLib.AppInfo appinfo2);
-		public static weak GLib.List get_all ();
-		public static weak GLib.List get_all_for_type (string content_type);
-		public static weak GLib.AppInfo get_default_for_type (string content_type, bool must_support_uris);
-		public static weak GLib.AppInfo get_default_for_uri_scheme (string uri_scheme);
-		public abstract weak string get_description ();
-		public abstract weak string get_executable ();
-		public abstract weak GLib.Icon get_icon ();
-		public abstract weak string get_id ();
-		public abstract weak string get_name ();
+		public static unowned GLib.List get_all ();
+		public static unowned GLib.List get_all_for_type (string content_type);
+		public static unowned GLib.AppInfo get_default_for_type (string content_type, bool must_support_uris);
+		public static unowned GLib.AppInfo get_default_for_uri_scheme (string uri_scheme);
+		public abstract unowned string get_description ();
+		public abstract unowned string get_executable ();
+		public abstract unowned GLib.Icon get_icon ();
+		public abstract unowned string get_id ();
+		public abstract unowned string get_name ();
 		public abstract bool launch (GLib.List? files, GLib.AppLaunchContext launch_context) throws GLib.Error;
 		public static bool launch_default_for_uri (string uri, GLib.AppLaunchContext? launch_context) throws GLib.Error;
 		public abstract bool launch_uris (GLib.List? uris, GLib.AppLaunchContext launch_context) throws GLib.Error;
@@ -510,7 +510,7 @@
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
 	public interface AsyncResult : GLib.Object {
-		public abstract weak GLib.Object get_source_object ();
+		public abstract unowned GLib.Object get_source_object ();
 		public abstract void* get_user_data ();
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
@@ -519,11 +519,11 @@
 		public abstract bool can_poll_for_media ();
 		public abstract void eject (GLib.MountUnmountFlags flags, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback? callback);
 		public abstract bool eject_finish (GLib.AsyncResult _result) throws GLib.Error;
-		public abstract weak string enumerate_identifiers ();
-		public abstract weak GLib.Icon get_icon ();
-		public abstract weak string get_identifier (string kind);
-		public abstract weak string get_name ();
-		public abstract weak GLib.List get_volumes ();
+		public abstract unowned string enumerate_identifiers ();
+		public abstract unowned GLib.Icon get_icon ();
+		public abstract unowned string get_identifier (string kind);
+		public abstract unowned string get_name ();
+		public abstract unowned GLib.List get_volumes ();
 		public abstract bool has_media ();
 		public abstract bool has_volumes ();
 		public abstract bool is_media_check_automatic ();
@@ -549,7 +549,7 @@
 		public bool @delete (GLib.Cancellable? cancellable) throws GLib.Error;
 		[NoWrapper]
 		public abstract bool delete_file (GLib.Cancellable? cancellable) throws GLib.Error;
-		public abstract weak GLib.File dup ();
+		public abstract unowned GLib.File dup ();
 		public abstract void eject_mountable (GLib.MountUnmountFlags flags, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback? callback);
 		public abstract bool eject_mountable_finish (GLib.AsyncResult _result) throws GLib.Error;
 		public abstract GLib.FileEnumerator enumerate_children (string attributes, GLib.FileQueryInfoFlags flags, GLib.Cancellable? cancellable) throws GLib.Error;
@@ -572,65 +572,65 @@
 		public abstract bool has_uri_scheme (string uri_scheme);
 		public abstract uint hash (void* file);
 		public abstract bool is_native ();
-		public bool load_contents (GLib.Cancellable? cancellable, out weak string contents, out size_t length, out weak string etag_out) throws GLib.Error;
+		public bool load_contents (GLib.Cancellable? cancellable, out unowned string contents, out size_t length, out unowned string etag_out) throws GLib.Error;
 		public void load_contents_async (GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
-		public bool load_contents_finish (GLib.AsyncResult res, out weak string contents, out size_t length, out weak string etag_out) throws GLib.Error;
+		public bool load_contents_finish (GLib.AsyncResult res, out unowned string contents, out size_t length, out unowned string etag_out) throws GLib.Error;
 		public void load_partial_contents_async (GLib.Cancellable? cancellable, GLib.FileReadMoreCallback read_more_callback, GLib.AsyncReadyCallback callback);
-		public bool load_partial_contents_finish (GLib.AsyncResult res, out weak string contents, size_t length, out weak string etag_out) throws GLib.Error;
+		public bool load_partial_contents_finish (GLib.AsyncResult res, out unowned string contents, size_t length, out unowned string etag_out) throws GLib.Error;
 		public abstract bool make_directory (GLib.Cancellable? cancellable) throws GLib.Error;
 		public bool make_directory_with_parents (GLib.Cancellable? cancellable) throws GLib.Error;
 		public abstract bool make_symbolic_link (string symlink_value, GLib.Cancellable? cancellable) throws GLib.Error;
 		[NoWrapper]
-		public abstract weak GLib.FileMonitor monitor_dir (GLib.FileMonitorFlags flags, GLib.Cancellable? cancellable) throws GLib.Error;
+		public abstract unowned GLib.FileMonitor monitor_dir (GLib.FileMonitorFlags flags, GLib.Cancellable? cancellable) throws GLib.Error;
 		[NoWrapper]
-		public abstract weak GLib.FileMonitor monitor_file (GLib.FileMonitorFlags flags, GLib.Cancellable? cancellable) throws GLib.Error;
+		public abstract unowned GLib.FileMonitor monitor_file (GLib.FileMonitorFlags flags, GLib.Cancellable? cancellable) throws GLib.Error;
 		public abstract void mount_enclosing_volume (GLib.MountMountFlags flags, GLib.MountOperation? mount_operation, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback? callback);
 		public abstract bool mount_enclosing_volume_finish (GLib.AsyncResult _result) throws GLib.Error;
 		public abstract void mount_mountable (GLib.MountMountFlags flags, GLib.MountOperation? mount_operation, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback? callback);
-		public abstract weak GLib.File mount_mountable_finish (GLib.AsyncResult _result) throws GLib.Error;
+		public abstract unowned GLib.File mount_mountable_finish (GLib.AsyncResult _result) throws GLib.Error;
 		public abstract bool move (GLib.File destination, GLib.FileCopyFlags flags, GLib.Cancellable? cancellable, GLib.FileProgressCallback? progress_callback) throws GLib.Error;
 		public static GLib.File new_for_commandline_arg (string arg);
 		public static GLib.File new_for_path (string path);
 		public static GLib.File new_for_uri (string uri);
-		public static weak GLib.File parse_name (string parse_name);
+		public static unowned GLib.File parse_name (string parse_name);
 		[NoWrapper]
 		public abstract bool prefix_matches (GLib.File file);
 		public GLib.AppInfo query_default_handler (GLib.Cancellable? cancellable) throws GLib.Error;
 		public bool query_exists (GLib.Cancellable? cancellable);
 		public GLib.FileType query_file_type (GLib.FileQueryInfoFlags flags, GLib.Cancellable? cancellable);
-		public abstract weak GLib.FileInfo query_filesystem_info (string attributes, GLib.Cancellable? cancellable) throws GLib.Error;
+		public abstract unowned GLib.FileInfo query_filesystem_info (string attributes, GLib.Cancellable? cancellable) throws GLib.Error;
 		public abstract void query_filesystem_info_async (string attributes, int io_priority, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
-		public abstract weak GLib.FileInfo query_filesystem_info_finish (GLib.AsyncResult res) throws GLib.Error;
+		public abstract unowned GLib.FileInfo query_filesystem_info_finish (GLib.AsyncResult res) throws GLib.Error;
 		public abstract GLib.FileInfo query_info (string attributes, GLib.FileQueryInfoFlags flags, GLib.Cancellable? cancellable) throws GLib.Error;
 		public abstract void query_info_async (string attributes, GLib.FileQueryInfoFlags flags, int io_priority, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
 		public abstract GLib.FileInfo query_info_finish (GLib.AsyncResult res) throws GLib.Error;
-		public abstract weak GLib.FileAttributeInfoList query_settable_attributes (GLib.Cancellable? cancellable) throws GLib.Error;
-		public abstract weak GLib.FileAttributeInfoList query_writable_namespaces (GLib.Cancellable? cancellable) throws GLib.Error;
+		public abstract unowned GLib.FileAttributeInfoList query_settable_attributes (GLib.Cancellable? cancellable) throws GLib.Error;
+		public abstract unowned GLib.FileAttributeInfoList query_writable_namespaces (GLib.Cancellable? cancellable) throws GLib.Error;
 		public GLib.FileInputStream read (GLib.Cancellable? cancellable) throws GLib.Error;
 		public abstract void read_async (int io_priority, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
 		public abstract GLib.FileInputStream read_finish (GLib.AsyncResult res) throws GLib.Error;
 		[NoWrapper]
-		public abstract weak GLib.FileInputStream read_fn (GLib.Cancellable? cancellable) throws GLib.Error;
+		public abstract unowned GLib.FileInputStream read_fn (GLib.Cancellable? cancellable) throws GLib.Error;
 		public abstract GLib.FileOutputStream replace (string? etag, bool make_backup, GLib.FileCreateFlags flags, GLib.Cancellable? cancellable) throws GLib.Error;
 		public abstract void replace_async (string? etag, bool make_backup, GLib.FileCreateFlags flags, int io_priority, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
-		public bool replace_contents (string contents, size_t length, string? etag, bool make_backup, GLib.FileCreateFlags flags, out weak string new_etag, GLib.Cancellable? cancellable) throws GLib.Error;
+		public bool replace_contents (string contents, size_t length, string? etag, bool make_backup, GLib.FileCreateFlags flags, out unowned string new_etag, GLib.Cancellable? cancellable) throws GLib.Error;
 		public void replace_contents_async (string contents, size_t length, string? etag, bool make_backup, GLib.FileCreateFlags flags, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
-		public bool replace_contents_finish (GLib.AsyncResult res, out weak string new_etag) throws GLib.Error;
+		public bool replace_contents_finish (GLib.AsyncResult res, out unowned string new_etag) throws GLib.Error;
 		public abstract GLib.FileOutputStream replace_finish (GLib.AsyncResult res) throws GLib.Error;
 		public abstract GLib.File resolve_relative_path (string relative_path);
 		public abstract bool set_attribute (string attribute, GLib.FileAttributeType type, void* value_p, GLib.FileQueryInfoFlags flags, GLib.Cancellable? cancellable) throws GLib.Error;
 		public bool set_attribute_byte_string (string attribute, string value, GLib.FileQueryInfoFlags flags, GLib.Cancellable? cancellable) throws GLib.Error;
-		public bool set_attribute_int32 (string attribute, int value, GLib.FileQueryInfoFlags flags, GLib.Cancellable? cancellable) throws GLib.Error;
+		public bool set_attribute_int32 (string attribute, int32 value, GLib.FileQueryInfoFlags flags, GLib.Cancellable? cancellable) throws GLib.Error;
 		public bool set_attribute_int64 (string attribute, int64 value, GLib.FileQueryInfoFlags flags, GLib.Cancellable? cancellable) throws GLib.Error;
 		public bool set_attribute_string (string attribute, string value, GLib.FileQueryInfoFlags flags, GLib.Cancellable? cancellable) throws GLib.Error;
-		public bool set_attribute_uint32 (string attribute, uint value, GLib.FileQueryInfoFlags flags, GLib.Cancellable? cancellable) throws GLib.Error;
+		public bool set_attribute_uint32 (string attribute, uint32 value, GLib.FileQueryInfoFlags flags, GLib.Cancellable? cancellable) throws GLib.Error;
 		public bool set_attribute_uint64 (string attribute, uint64 value, GLib.FileQueryInfoFlags flags, GLib.Cancellable? cancellable) throws GLib.Error;
 		public abstract void set_attributes_async (GLib.FileInfo info, GLib.FileQueryInfoFlags flags, int io_priority, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
-		public abstract bool set_attributes_finish (GLib.AsyncResult _result, out weak GLib.FileInfo info) throws GLib.Error;
+		public abstract bool set_attributes_finish (GLib.AsyncResult _result, out unowned GLib.FileInfo info) throws GLib.Error;
 		public abstract bool set_attributes_from_info (GLib.FileInfo info, GLib.FileQueryInfoFlags flags, GLib.Cancellable? cancellable) throws GLib.Error;
-		public abstract weak GLib.File set_display_name (string display_name, GLib.Cancellable? cancellable) throws GLib.Error;
+		public abstract unowned GLib.File set_display_name (string display_name, GLib.Cancellable? cancellable) throws GLib.Error;
 		public abstract void set_display_name_async (string display_name, int io_priority, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
-		public abstract weak GLib.File set_display_name_finish (GLib.AsyncResult res) throws GLib.Error;
+		public abstract unowned GLib.File set_display_name_finish (GLib.AsyncResult res) throws GLib.Error;
 		public abstract bool trash (GLib.Cancellable? cancellable) throws GLib.Error;
 		public abstract void unmount_mountable (GLib.MountUnmountFlags flags, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback? callback);
 		public abstract bool unmount_mountable_finish (GLib.AsyncResult _result) throws GLib.Error;
@@ -642,9 +642,9 @@
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
 	public interface LoadableIcon : GLib.Icon, GLib.Object {
-		public abstract weak GLib.InputStream load (int size, out weak string? type, GLib.Cancellable? cancellable) throws GLib.Error;
+		public abstract unowned GLib.InputStream load (int size, out unowned string? type, GLib.Cancellable? cancellable) throws GLib.Error;
 		public abstract void load_async (int size, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
-		public abstract weak GLib.InputStream load_finish (GLib.AsyncResult res, out weak string? type) throws GLib.Error;
+		public abstract unowned GLib.InputStream load_finish (GLib.AsyncResult res, out unowned string? type) throws GLib.Error;
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
 	public interface Mount : GLib.Object {
@@ -652,12 +652,12 @@
 		public abstract bool can_unmount ();
 		public abstract void eject (GLib.MountUnmountFlags flags, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback? callback);
 		public abstract bool eject_finish (GLib.AsyncResult _result) throws GLib.Error;
-		public abstract weak GLib.Drive get_drive ();
-		public abstract weak GLib.Icon get_icon ();
-		public abstract weak string get_name ();
-		public abstract weak GLib.File get_root ();
-		public abstract weak string get_uuid ();
-		public abstract weak GLib.Volume get_volume ();
+		public abstract unowned GLib.Drive get_drive ();
+		public abstract unowned GLib.Icon get_icon ();
+		public abstract unowned string get_name ();
+		public abstract unowned GLib.File get_root ();
+		public abstract unowned string get_uuid ();
+		public abstract unowned GLib.Volume get_volume ();
 		public abstract void remount (GLib.MountMountFlags flags, GLib.MountOperation? mount_operation, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback? callback);
 		public abstract bool remount_finish (GLib.AsyncResult _result) throws GLib.Error;
 		public abstract void unmount (GLib.MountUnmountFlags flags, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback? callback);
@@ -681,13 +681,13 @@
 		public abstract bool can_mount ();
 		public abstract void eject (GLib.MountUnmountFlags flags, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback? callback);
 		public abstract bool eject_finish (GLib.AsyncResult _result) throws GLib.Error;
-		public abstract weak string enumerate_identifiers ();
-		public abstract weak GLib.Drive get_drive ();
-		public abstract weak GLib.Icon get_icon ();
-		public abstract weak string get_identifier (string kind);
-		public abstract weak GLib.Mount get_mount ();
-		public abstract weak string get_name ();
-		public abstract weak string get_uuid ();
+		public abstract unowned string enumerate_identifiers ();
+		public abstract unowned GLib.Drive get_drive ();
+		public abstract unowned GLib.Icon get_icon ();
+		public abstract unowned string get_identifier (string kind);
+		public abstract unowned GLib.Mount get_mount ();
+		public abstract unowned string get_name ();
+		public abstract unowned string get_uuid ();
 		public void mount (GLib.MountMountFlags flags, GLib.MountOperation? mount_operation, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback? callback);
 		public abstract bool mount_finish (GLib.AsyncResult _result) throws GLib.Error;
 		[NoWrapper]
@@ -1028,27 +1028,27 @@
 	[CCode (cname = "g_content_type_equals", cheader_filename = "gio/gio.h")]
 	public static bool g_content_type_equals (string type1, string type2);
 	[CCode (cname = "g_content_type_from_mime_type", cheader_filename = "gio/gio.h")]
-	public static weak string g_content_type_from_mime_type (string mime_type);
+	public static unowned string g_content_type_from_mime_type (string mime_type);
 	[CCode (cname = "g_content_type_get_description", cheader_filename = "gio/gio.h")]
-	public static weak string g_content_type_get_description (string type);
+	public static unowned string g_content_type_get_description (string type);
 	[CCode (cname = "g_content_type_get_icon", cheader_filename = "gio/gio.h")]
-	public static weak GLib.Icon g_content_type_get_icon (string type);
+	public static unowned GLib.Icon g_content_type_get_icon (string type);
 	[CCode (cname = "g_content_type_get_mime_type", cheader_filename = "gio/gio.h")]
-	public static weak string g_content_type_get_mime_type (string type);
+	public static unowned string g_content_type_get_mime_type (string type);
 	[CCode (cname = "g_content_type_guess", cheader_filename = "gio/gio.h")]
-	public static weak string g_content_type_guess (string filename, uchar[] data, out bool result_uncertain);
+	public static unowned string g_content_type_guess (string filename, uchar[] data, out bool result_uncertain);
 	[CCode (cname = "g_content_type_is_a", cheader_filename = "gio/gio.h")]
 	public static bool g_content_type_is_a (string type, string supertype);
 	[CCode (cname = "g_content_type_is_unknown", cheader_filename = "gio/gio.h")]
 	public static bool g_content_type_is_unknown (string type);
 	[CCode (cname = "g_content_types_get_registered", cheader_filename = "gio/gio.h")]
-	public static weak GLib.List g_content_types_get_registered ();
+	public static unowned GLib.List g_content_types_get_registered ();
 	[CCode (cname = "g_io_error_from_errno", cheader_filename = "gio/gio.h")]
-	public static weak GLib.IOError g_io_error_from_errno (int err_no);
+	public static unowned GLib.IOError g_io_error_from_errno (int err_no);
 	[CCode (cname = "g_io_error_quark", cheader_filename = "gio/gio.h")]
 	public static GLib.Quark g_io_error_quark ();
 	[CCode (cname = "g_io_modules_load_all_in_directory", cheader_filename = "gio/gio.h")]
-	public static weak GLib.List g_io_modules_load_all_in_directory (string dirname);
+	public static unowned GLib.List g_io_modules_load_all_in_directory (string dirname);
 	[CCode (cname = "g_io_scheduler_cancel_all_jobs", cheader_filename = "gio/gio.h")]
 	public static void g_io_scheduler_cancel_all_jobs ();
 	[CCode (cname = "g_io_scheduler_push_job", cheader_filename = "gio/gio.h")]

Modified: trunk/vapi/gio-unix-2.0.vapi
==============================================================================
--- trunk/vapi/gio-unix-2.0.vapi	(original)
+++ trunk/vapi/gio-unix-2.0.vapi	Fri Dec 19 21:56:41 2008
@@ -36,12 +36,12 @@
 	[CCode (cheader_filename = "gio/gunixmounts.h")]
 	public class UnixMountPoint {
 		public int compare (GLib.UnixMountPoint mount2);
-		public weak string get_device_path ();
-		public weak string get_fs_type ();
-		public weak string get_mount_path ();
+		public unowned string get_device_path ();
+		public unowned string get_fs_type ();
+		public unowned string get_mount_path ();
 		public bool guess_can_eject ();
-		public weak GLib.Icon guess_icon ();
-		public weak string guess_name ();
+		public unowned GLib.Icon guess_icon ();
+		public unowned string guess_name ();
 		public bool is_loopback ();
 		public bool is_readonly ();
 		public bool is_user_mountable ();
@@ -53,30 +53,30 @@
 	}
 	[CCode (cheader_filename = "gio/gunixmounts.h")]
 	public interface DesktopAppInfoLookup : GLib.Object {
-		public abstract weak GLib.AppInfo get_default_for_uri_scheme (string uri_scheme);
+		public abstract unowned GLib.AppInfo get_default_for_uri_scheme (string uri_scheme);
 	}
 	[CCode (cheader_filename = "gio/gunixmounts.h")]
 	public const string DESKTOP_APP_INFO_LOOKUP_EXTENSION_POINT_NAME;
 	[CCode (cname = "g_unix_is_mount_path_system_internal", cheader_filename = "gio/gunixmounts.h")]
 	public static bool g_unix_is_mount_path_system_internal (string mount_path);
 	[CCode (cname = "g_unix_mount_at", cheader_filename = "gio/gunixmounts.h")]
-	public static weak GLib.UnixMountEntry g_unix_mount_at (string mount_path, uint64 time_read);
+	public static unowned GLib.UnixMountEntry g_unix_mount_at (string mount_path, uint64 time_read);
 	[CCode (cname = "g_unix_mount_compare", cheader_filename = "gio/gunixmounts.h")]
 	public static int g_unix_mount_compare (GLib.UnixMountEntry mount1, GLib.UnixMountEntry mount2);
 	[CCode (cname = "g_unix_mount_free", cheader_filename = "gio/gunixmounts.h")]
 	public static void g_unix_mount_free (GLib.UnixMountEntry mount_entry);
 	[CCode (cname = "g_unix_mount_get_device_path", cheader_filename = "gio/gunixmounts.h")]
-	public static weak string g_unix_mount_get_device_path (GLib.UnixMountEntry mount_entry);
+	public static unowned string g_unix_mount_get_device_path (GLib.UnixMountEntry mount_entry);
 	[CCode (cname = "g_unix_mount_get_fs_type", cheader_filename = "gio/gunixmounts.h")]
-	public static weak string g_unix_mount_get_fs_type (GLib.UnixMountEntry mount_entry);
+	public static unowned string g_unix_mount_get_fs_type (GLib.UnixMountEntry mount_entry);
 	[CCode (cname = "g_unix_mount_get_mount_path", cheader_filename = "gio/gunixmounts.h")]
-	public static weak string g_unix_mount_get_mount_path (GLib.UnixMountEntry mount_entry);
+	public static unowned string g_unix_mount_get_mount_path (GLib.UnixMountEntry mount_entry);
 	[CCode (cname = "g_unix_mount_guess_can_eject", cheader_filename = "gio/gunixmounts.h")]
 	public static bool g_unix_mount_guess_can_eject (GLib.UnixMountEntry mount_entry);
 	[CCode (cname = "g_unix_mount_guess_icon", cheader_filename = "gio/gunixmounts.h")]
-	public static weak GLib.Icon g_unix_mount_guess_icon (GLib.UnixMountEntry mount_entry);
+	public static unowned GLib.Icon g_unix_mount_guess_icon (GLib.UnixMountEntry mount_entry);
 	[CCode (cname = "g_unix_mount_guess_name", cheader_filename = "gio/gunixmounts.h")]
-	public static weak string g_unix_mount_guess_name (GLib.UnixMountEntry mount_entry);
+	public static unowned string g_unix_mount_guess_name (GLib.UnixMountEntry mount_entry);
 	[CCode (cname = "g_unix_mount_guess_should_display", cheader_filename = "gio/gunixmounts.h")]
 	public static bool g_unix_mount_guess_should_display (GLib.UnixMountEntry mount_entry);
 	[CCode (cname = "g_unix_mount_is_readonly", cheader_filename = "gio/gunixmounts.h")]
@@ -86,9 +86,9 @@
 	[CCode (cname = "g_unix_mount_points_changed_since", cheader_filename = "gio/gunixmounts.h")]
 	public static bool g_unix_mount_points_changed_since (uint64 time);
 	[CCode (cname = "g_unix_mount_points_get", cheader_filename = "gio/gunixmounts.h")]
-	public static weak GLib.List g_unix_mount_points_get (uint64 time_read);
+	public static unowned GLib.List g_unix_mount_points_get (uint64 time_read);
 	[CCode (cname = "g_unix_mounts_changed_since", cheader_filename = "gio/gunixmounts.h")]
 	public static bool g_unix_mounts_changed_since (uint64 time);
 	[CCode (cname = "g_unix_mounts_get", cheader_filename = "gio/gunixmounts.h")]
-	public static weak GLib.List g_unix_mounts_get (uint64 time_read);
+	public static unowned GLib.List g_unix_mounts_get (uint64 time_read);
 }

Modified: trunk/vapi/gstreamer-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-0.10.vapi	(original)
+++ trunk/vapi/gstreamer-0.10.vapi	Fri Dec 19 21:56:41 2008
@@ -10,8 +10,8 @@
 		public weak GLib.SList mem_live;
 		public weak string name;
 		public static bool available ();
-		public static weak Gst.AllocTrace get (string name);
-		public static weak GLib.List list ();
+		public static unowned Gst.AllocTrace get (string name);
+		public static unowned GLib.List list ();
 		public static int live_all ();
 		public void print ();
 		public static void print_all ();
@@ -31,22 +31,22 @@
 		public bool polling;
 		public weak Gst.Clock provided_clock;
 		public bool state_dirty;
-		public bool add (Gst.Element# element);
+		public bool add (owned Gst.Element element);
 		[NoWrapper]
 		public virtual bool add_element (Gst.Element element);
-		public void add_many (params Gst.Element[]# elements);
-		public weak Gst.Pad find_unconnected_pad (Gst.PadDirection direction);
-		public weak Gst.Element get_by_interface (GLib.Type iface);
-		public weak Gst.Element get_by_name (string name);
-		public weak Gst.Element get_by_name_recurse_up (string name);
+		public void add_many (params owned Gst.Element[] elements);
+		public unowned Gst.Pad find_unconnected_pad (Gst.PadDirection direction);
+		public unowned Gst.Element get_by_interface (GLib.Type iface);
+		public unowned Gst.Element get_by_name (string name);
+		public unowned Gst.Element get_by_name_recurse_up (string name);
 		[NoWrapper]
 		public virtual void handle_message (Gst.Message message);
-		public weak Gst.Iterator iterate_all_by_interface (GLib.Type iface);
-		public weak Gst.Iterator iterate_elements ();
-		public weak Gst.Iterator iterate_recurse ();
-		public weak Gst.Iterator iterate_sinks ();
-		public weak Gst.Iterator iterate_sorted ();
-		public weak Gst.Iterator iterate_sources ();
+		public unowned Gst.Iterator iterate_all_by_interface (GLib.Type iface);
+		public unowned Gst.Iterator iterate_elements ();
+		public unowned Gst.Iterator iterate_recurse ();
+		public unowned Gst.Iterator iterate_sinks ();
+		public unowned Gst.Iterator iterate_sorted ();
+		public unowned Gst.Iterator iterate_sources ();
 		[CCode (type = "GstElement*", has_construct_function = false)]
 		public Bin (string name);
 		public bool remove (Gst.Element element);
@@ -77,19 +77,19 @@
 		public void flag_set (Gst.BufferFlag flag);
 		[CCode (cname = "GST_BUFFER_FLAG_UNSET")]
 		public void flag_unset (Gst.BufferFlag flag);
-		public weak Gst.Caps get_caps ();
+		public unowned Gst.Caps get_caps ();
 		public bool is_metadata_writable ();
 		public bool is_span_fast (Gst.Buffer buf2);
-		public weak Gst.Buffer join (Gst.Buffer buf2);
+		public unowned Gst.Buffer join (Gst.Buffer buf2);
 		[ReturnsModifiedPointer]
 		public void make_metadata_writable ();
 		[ReturnsModifiedPointer]
 		public void make_writable ();
-		public weak Gst.Buffer merge (Gst.Buffer buf2);
+		public unowned Gst.Buffer merge (Gst.Buffer buf2);
 		public Buffer ();
-		public weak Gst.Buffer @ref ();
+		public unowned Gst.Buffer @ref ();
 		public void set_caps (Gst.Caps caps);
-		public weak Gst.Buffer span (uint32 offset, Gst.Buffer buf2, uint32 len);
+		public unowned Gst.Buffer span (uint32 offset, Gst.Buffer buf2, uint32 len);
 		public void stamp (Gst.Buffer src);
 		public static Gst.Buffer try_new_and_alloc (uint size);
 		public void unref ();
@@ -109,26 +109,26 @@
 		public void add_signal_watch ();
 		public void add_signal_watch_full (int priority);
 		public uint add_watch (Gst.BusFunc func);
-		public uint add_watch_full (int priority, Gst.BusFunc# func);
+		public uint add_watch_full (int priority, owned Gst.BusFunc func);
 		public bool async_signal_func (Gst.Message message, void* data);
-		public weak GLib.TimeoutSource create_watch ();
+		public unowned GLib.TimeoutSource create_watch ();
 		public void disable_sync_message_emission ();
 		public void enable_sync_message_emission ();
 		public bool have_pending ();
 		[CCode (has_construct_function = false)]
 		public Bus ();
-		public weak Gst.Message peek ();
-		public weak Gst.Message poll (Gst.MessageType events, Gst.ClockTimeDiff timeout);
-		public weak Gst.Message pop ();
-		public weak Gst.Message pop_filtered (Gst.MessageType types);
+		public unowned Gst.Message peek ();
+		public unowned Gst.Message poll (Gst.MessageType events, Gst.ClockTimeDiff timeout);
+		public unowned Gst.Message pop ();
+		public unowned Gst.Message pop_filtered (Gst.MessageType types);
 		public bool post (Gst.Message message);
 		public void remove_signal_watch ();
 		public void set_flushing (bool flushing);
 		public void set_sync_handler (Gst.BusSyncHandler func);
 		[CCode (instance_pos = -1)]
 		public Gst.BusSyncReply sync_signal_handler (Gst.Bus bus, Gst.Message message);
-		public weak Gst.Message timed_pop (Gst.ClockTime timeout);
-		public weak Gst.Message timed_pop_filtered (Gst.ClockTime timeout, Gst.MessageType types);
+		public unowned Gst.Message timed_pop (Gst.ClockTime timeout);
+		public unowned Gst.Message timed_pop_filtered (Gst.ClockTime timeout, Gst.MessageType types);
 		public virtual signal void message (Gst.Message message);
 		public virtual signal void sync_message (Gst.Message message);
 	}
@@ -147,14 +147,14 @@
 		public bool do_simplify ();
 		[CCode (has_construct_function = false)]
 		public Caps.empty ();
-		public static weak Gst.Caps from_string (string str);
+		public static unowned Gst.Caps from_string (string str);
 		[CCode (has_construct_function = false)]
 		public Caps.full (Gst.Structure struct1, ...);
 		[CCode (has_construct_function = false)]
 		public Caps.full_valist (Gst.Structure structure, void* var_args);
 		public uint get_size ();
-		public weak Gst.Structure get_structure (uint index);
-		public weak Gst.Caps intersect (Gst.Caps caps2);
+		public unowned Gst.Structure get_structure (uint index);
+		public unowned Gst.Caps intersect (Gst.Caps caps2);
 		public bool is_always_compatible (Gst.Caps caps2);
 		public bool is_any ();
 		public bool is_empty ();
@@ -162,13 +162,13 @@
 		public bool is_equal_fixed (Gst.Caps caps2);
 		public bool is_fixed ();
 		public bool is_subset (Gst.Caps superset);
-		public static weak Gst.Caps load_thyself (void* parent);
+		public static unowned Gst.Caps load_thyself (void* parent);
 		[ReturnsModifiedPointer]
 		public void make_writable ();
 		public void merge (Gst.Caps caps2);
 		public void merge_structure (Gst.Structure structure);
-		public weak Gst.Caps normalize ();
-		public weak Gst.Caps @ref ();
+		public unowned Gst.Caps normalize ();
+		public unowned Gst.Caps @ref ();
 		public void remove_structure (uint idx);
 		public void replace (Gst.Caps newcaps);
 		public void* save_thyself (void* parent);
@@ -176,8 +176,8 @@
 		public void set_simple_valist (string field, void* varargs);
 		[CCode (has_construct_function = false)]
 		public Caps.simple (string media_type, string fieldname, ...);
-		public weak Gst.Caps subtract (Gst.Caps subtrahend);
-		public weak string to_string ();
+		public unowned Gst.Caps subtract (Gst.Caps subtrahend);
+		public unowned string to_string ();
 		public void truncate ();
 		public Gst.Caps union (Gst.Caps caps2);
 		public void unref ();
@@ -204,7 +204,7 @@
 		public virtual Gst.ClockTime change_resolution (Gst.ClockTime old_resolution, Gst.ClockTime new_resolution);
 		public void get_calibration (Gst.ClockTime internal, Gst.ClockTime external, Gst.ClockTime rate_num, Gst.ClockTime rate_denom);
 		public virtual Gst.ClockTime get_internal_time ();
-		public weak Gst.Clock get_master ();
+		public unowned Gst.Clock get_master ();
 		public virtual Gst.ClockTime get_resolution ();
 		public Gst.ClockTime get_time ();
 		[CCode (type = "GstClockID", has_construct_function = false)]
@@ -273,8 +273,8 @@
 		[CCode (cname = "GST_CAT_ERROR_OBJECT")]
 		public void error_object (GLib.Object obj, string format, ...);
 		public uint get_color ();
-		public weak string get_description ();
-		public weak string get_name ();
+		public unowned string get_description ();
+		public unowned string get_name ();
 		public Gst.DebugLevel get_threshold ();
 		[CCode (cname = "GST_CAT_INFO")]
 		public void info (string format, ...);
@@ -296,7 +296,7 @@
 	[Compact]
 	[CCode (cheader_filename = "gst/gst.h")]
 	public class DebugMessage {
-		public weak string get ();
+		public unowned string get ();
 	}
 	[CCode (cheader_filename = "gst/gst.h")]
 	public class Element : Gst.Object {
@@ -319,38 +319,38 @@
 		public uint32 state_cookie;
 		public void* state_lock;
 		public void abort_state ();
-		public bool add_pad (Gst.Pad# pad);
+		public bool add_pad (owned Gst.Pad pad);
 		[CCode (cname = "gst_element_class_add_pad_template")]
 		public class void add_pad_template (Gst.PadTemplate templ);
 		public virtual Gst.StateChangeReturn change_state (Gst.StateChange transition);
 		public Gst.StateChangeReturn continue_state (Gst.StateChangeReturn ret);
 		public void create_all_pads ();
-		public void found_tags (Gst.TagList# list);
-		public void found_tags_for_pad (Gst.Pad pad, Gst.TagList# list);
+		public void found_tags (owned Gst.TagList list);
+		public void found_tags_for_pad (Gst.Pad pad, owned Gst.TagList list);
 		public Gst.ClockTime get_base_time ();
 		public Gst.Bus get_bus ();
-		public weak Gst.Clock get_clock ();
-		public weak Gst.Pad get_compatible_pad (Gst.Pad pad, Gst.Caps caps);
-		public weak Gst.PadTemplate get_compatible_pad_template (Gst.PadTemplate compattempl);
-		public weak Gst.ElementFactory get_factory ();
-		public virtual weak Gst.Index get_index ();
-		public weak Gst.Pad get_pad (string name);
+		public unowned Gst.Clock get_clock ();
+		public unowned Gst.Pad get_compatible_pad (Gst.Pad pad, Gst.Caps caps);
+		public unowned Gst.PadTemplate get_compatible_pad_template (Gst.PadTemplate compattempl);
+		public unowned Gst.ElementFactory get_factory ();
+		public virtual unowned Gst.Index get_index ();
+		public unowned Gst.Pad get_pad (string name);
 		[CCode (cname = "gst_element_class_get_pad_template")]
-		public class weak Gst.PadTemplate get_pad_template (string name);
+		public class unowned Gst.PadTemplate get_pad_template (string name);
 		[CCode (cname = "gst_element_class_get_pad_template_list")]
-		public class weak GLib.List get_pad_template_list ();
+		public class unowned GLib.List get_pad_template_list ();
 		public virtual Gst.QueryType get_query_types ();
-		public weak Gst.Pad get_request_pad (string name);
+		public unowned Gst.Pad get_request_pad (string name);
 		public virtual Gst.StateChangeReturn get_state (out Gst.State state, out Gst.State pending, Gst.ClockTime timeout);
-		public weak Gst.Pad get_static_pad (string name);
+		public unowned Gst.Pad get_static_pad (string name);
 		public bool implements_interface (GLib.Type iface_type);
 		[CCode (cname = "gst_element_class_install_std_props")]
 		public class void install_std_props (...);
 		public bool is_indexable ();
 		public bool is_locked_state ();
-		public weak Gst.Iterator iterate_pads ();
-		public weak Gst.Iterator iterate_sink_pads ();
-		public weak Gst.Iterator iterate_src_pads ();
+		public unowned Gst.Iterator iterate_pads ();
+		public unowned Gst.Iterator iterate_sink_pads ();
+		public unowned Gst.Iterator iterate_src_pads ();
 		public bool link (Gst.Element dest);
 		public bool link_filtered (Gst.Element dest, Gst.Caps filter);
 		public bool link_many (Gst.Element element_2, ...);
@@ -360,7 +360,7 @@
 		public static Gst.Element? make_from_uri (Gst.URIType type, string uri, string? elementname);
 		public void message_full (Gst.MessageType type, GLib.Quark domain, int code, string text, string debug, string file, string function, int line);
 		public bool post_message (Gst.Message message);
-		public virtual weak Gst.Clock provide_clock ();
+		public virtual unowned Gst.Clock provide_clock ();
 		public bool provides_clock ();
 		public virtual bool query (Gst.Query query);
 		public bool query_convert (Gst.Format src_format, int64 src_val, Gst.Format dest_format, int64 dest_val);
@@ -372,11 +372,11 @@
 		public void release_request_pad (Gst.Pad pad);
 		public bool remove_pad (Gst.Pad pad);
 		[NoWrapper]
-		public virtual weak Gst.Pad request_new_pad (Gst.PadTemplate templ, string name);
+		public virtual unowned Gst.Pad request_new_pad (Gst.PadTemplate templ, string name);
 		public bool requires_clock ();
 		public bool seek (double rate, Gst.Format format, Gst.SeekFlags flags, Gst.SeekType cur_type, int64 cur, Gst.SeekType stop_type, int64 stop);
 		public bool seek_simple (Gst.Format format, Gst.SeekFlags seek_flags, int64 seek_pos);
-		public virtual bool send_event (Gst.Event# event);
+		public virtual bool send_event (owned Gst.Event event);
 		public void set_base_time (Gst.ClockTime time);
 		public virtual void set_bus (Gst.Bus bus);
 		public virtual bool set_clock (Gst.Clock clock);
@@ -387,8 +387,8 @@
 		public virtual void set_index (Gst.Index index);
 		public bool set_locked_state (bool locked_state);
 		public virtual Gst.StateChangeReturn set_state (Gst.State state);
-		public static weak string state_change_return_get_name (Gst.StateChangeReturn state_ret);
-		public static weak string state_get_name (Gst.State state);
+		public static unowned string state_change_return_get_name (Gst.StateChangeReturn state_ret);
+		public static unowned string state_get_name (Gst.State state);
 		public bool sync_state_with_parent ();
 		public void unlink (Gst.Element dest);
 		public void unlink_many (Gst.Element element_2, ...);
@@ -410,15 +410,15 @@
 		public bool can_sink_caps (Gst.Caps caps);
 		public bool can_src_caps (Gst.Caps caps);
 		public Gst.Element? create (string? name);
-		public static weak Gst.ElementFactory find (string name);
-		public weak string get_author ();
-		public weak string get_description ();
+		public static unowned Gst.ElementFactory find (string name);
+		public unowned string get_author ();
+		public unowned string get_description ();
 		public GLib.Type get_element_type ();
-		public weak string get_klass ();
-		public weak string get_longname ();
+		public unowned string get_klass ();
+		public unowned string get_longname ();
 		public uint get_num_pad_templates ();
-		public weak GLib.List get_static_pad_templates ();
-		public weak string get_uri_protocols ();
+		public unowned GLib.List get_static_pad_templates ();
+		public unowned string get_uri_protocols ();
 		public int get_uri_type ();
 		public bool has_interface (string interfacename);
 		public static Gst.Element? make (string factoryname, string? name);
@@ -432,19 +432,19 @@
 		[CCode (has_construct_function = false)]
 		public Event.buffer_size (Gst.Format format, int64 minsize, int64 maxsize, bool async);
 		[CCode (has_construct_function = false)]
-		public Event.custom (Gst.EventType type, Gst.Structure# structure);
+		public Event.custom (Gst.EventType type, owned Gst.Structure structure);
 		[CCode (has_construct_function = false)]
 		public Event.eos ();
 		[CCode (has_construct_function = false)]
 		public Event.flush_start ();
 		[CCode (has_construct_function = false)]
 		public Event.flush_stop ();
-		public weak Gst.Structure get_structure ();
+		public unowned Gst.Structure get_structure ();
 		public bool has_name (string name);
 		[CCode (has_construct_function = false)]
 		public Event.latency (Gst.ClockTime latency);
 		[CCode (has_construct_function = false)]
-		public Event.navigation (Gst.Structure# structure);
+		public Event.navigation (owned Gst.Structure structure);
 		[CCode (has_construct_function = false)]
 		public Event.new_segment (bool update, double rate, Gst.Format format, int64 start, int64 stop, int64 position);
 		[CCode (has_construct_function = false)]
@@ -463,7 +463,7 @@
 		[CCode (has_construct_function = false)]
 		public Event.tag (Gst.TagList taglist);
 		public static Gst.EventTypeFlags type_get_flags (Gst.EventType type);
-		public static weak string type_get_name (Gst.EventType type);
+		public static unowned string type_get_name (Gst.EventType type);
 		public static GLib.Quark type_to_quark (Gst.EventType type);
 	}
 	[Compact]
@@ -474,7 +474,7 @@
 	public class GhostPad : Gst.Pad {
 		[CCode (type = "GstPad*", has_construct_function = false)]
 		public GhostPad.from_template (string name, Gst.Pad target, Gst.PadTemplate templ);
-		public weak Gst.Pad get_target ();
+		public unowned Gst.Pad get_target ();
 		[CCode (type = "GstPad*", has_construct_function = false)]
 		public GhostPad (string name, Gst.Pad target);
 		[CCode (type = "GstPad*", has_construct_function = false)]
@@ -496,16 +496,16 @@
 		public void* resolver_user_data;
 		public weak GLib.DestroyNotify resolver_user_data_destroy;
 		public weak GLib.HashTable writers;
-		public weak Gst.IndexEntry add_association (int id, Gst.AssocFlags flags, Gst.Format format, int64 value);
-		public weak Gst.IndexEntry add_associationv (int id, Gst.AssocFlags flags, int n, Gst.IndexAssociation list);
+		public unowned Gst.IndexEntry add_association (int id, Gst.AssocFlags flags, Gst.Format format, int64 value);
+		public unowned Gst.IndexEntry add_associationv (int id, Gst.AssocFlags flags, int n, Gst.IndexAssociation list);
 		[NoWrapper]
 		public virtual void add_entry (Gst.IndexEntry entry);
-		public weak Gst.IndexEntry add_format (int id, Gst.Format format);
-		public weak Gst.IndexEntry add_id (int id, string description);
-		public weak Gst.IndexEntry add_object (int id, string key, GLib.Type type, void* object);
+		public unowned Gst.IndexEntry add_format (int id, Gst.Format format);
+		public unowned Gst.IndexEntry add_id (int id, string description);
+		public unowned Gst.IndexEntry add_object (int id, string key, GLib.Type type, void* object);
 		public virtual void commit (int id);
-		public virtual weak Gst.IndexEntry get_assoc_entry (int id, Gst.IndexLookupMethod method, Gst.AssocFlags flags, Gst.Format format, int64 value);
-		public weak Gst.IndexEntry get_assoc_entry_full (int id, Gst.IndexLookupMethod method, Gst.AssocFlags flags, Gst.Format format, int64 value, GLib.CompareDataFunc func);
+		public virtual unowned Gst.IndexEntry get_assoc_entry (int id, Gst.IndexLookupMethod method, Gst.AssocFlags flags, Gst.Format format, int64 value);
+		public unowned Gst.IndexEntry get_assoc_entry_full (int id, Gst.IndexLookupMethod method, Gst.AssocFlags flags, Gst.Format format, int64 value, GLib.CompareDataFunc func);
 		public Gst.IndexCertainty get_certainty ();
 		public int get_group ();
 		public virtual bool get_writer_id (Gst.Object writer, int id);
@@ -542,10 +542,10 @@
 	public class IndexFactory : Gst.PluginFeature {
 		public weak string longdesc;
 		public GLib.Type type;
-		public weak Gst.Index create ();
+		public unowned Gst.Index create ();
 		public void destroy ();
-		public static weak Gst.IndexFactory find (string name);
-		public static weak Gst.Index make (string name);
+		public static unowned Gst.IndexFactory find (string name);
+		public static unowned Gst.Index make (string name);
 		[CCode (has_construct_function = false)]
 		public IndexFactory (string name, string longdesc, GLib.Type type);
 	}
@@ -569,7 +569,7 @@
 		public weak Gst.Iterator pushed;
 		public weak Gst.IteratorResyncFunction resync;
 		public GLib.Type type;
-		public weak Gst.Iterator filter (GLib.CompareFunc func);
+		public unowned Gst.Iterator filter (GLib.CompareFunc func);
 		public void* find_custom (GLib.CompareFunc func);
 		public Gst.IteratorResult fold (Gst.IteratorFoldFunction func, Gst.Value ret);
 		public Gst.IteratorResult @foreach (GLib.Func func);
@@ -609,7 +609,7 @@
 		public Message.eos (Gst.Object src);
 		[CCode (has_construct_function = false)]
 		public Message.error (Gst.Object src, GLib.Error error, string debug);
-		public weak Gst.Structure get_structure ();
+		public unowned Gst.Structure get_structure ();
 		[CCode (has_construct_function = false)]
 		public Message.info (Gst.Object src, GLib.Error error, string debug);
 		[CCode (has_construct_function = false)]
@@ -621,12 +621,12 @@
 		public void parse_async_start (out bool new_base_time);
 		public void parse_buffering (out int percent);
 		public void parse_buffering_stats (Gst.BufferingMode mode, int avg_in, int avg_out, int64 buffering_left);
-		public void parse_clock_lost (out weak Gst.Clock clock);
-		public void parse_clock_provide (out weak Gst.Clock clock, out bool ready);
+		public void parse_clock_lost (out unowned Gst.Clock clock);
+		public void parse_clock_provide (out unowned Gst.Clock clock, out bool ready);
 		public void parse_duration (out Gst.Format format, out int64 duration);
 		public void parse_error (out GLib.Error gerror, out string debug);
 		public void parse_info (out GLib.Error gerror, out string debug);
-		public void parse_new_clock (out weak Gst.Clock clock);
+		public void parse_new_clock (out unowned Gst.Clock clock);
 		public void parse_segment_done (out Gst.Format format, out int64 position);
 		public void parse_segment_start (out Gst.Format format, out int64 position);
 		public void parse_state_changed (out Gst.State oldstate, out Gst.State newstate, out Gst.State pending);
@@ -643,7 +643,7 @@
 		public Message.state_dirty (Gst.Object src);
 		[CCode (has_construct_function = false)]
 		public Message.tag (Gst.Object src, Gst.TagList tag_list);
-		public static weak string type_get_name (Gst.MessageType type);
+		public static unowned string type_get_name (Gst.MessageType type);
 		public static GLib.Quark type_to_quark (Gst.MessageType type);
 		[CCode (has_construct_function = false)]
 		public Message.warning (Gst.Object src, GLib.Error error, string debug);
@@ -680,12 +680,12 @@
 		public static bool check_uniqueness (GLib.List list, string name);
 		public static void default_deep_notify (GLib.Object object, Gst.Object orig, GLib.ParamSpec pspec, string excluded_props);
 		public void default_error (GLib.Error error, string debug);
-		public weak string get_name ();
-		public weak string get_name_prefix ();
-		public weak Gst.Object get_parent ();
-		public weak string get_path_string ();
+		public unowned string get_name ();
+		public unowned string get_name_prefix ();
+		public unowned Gst.Object get_parent ();
+		public unowned string get_path_string ();
 		public bool has_ancestor (Gst.Object ancestor);
-		public weak Gst.Object @ref ();
+		public unowned Gst.Object @ref ();
 		public void replace (Gst.Object newobj);
 		public virtual void restore_thyself (void* self);
 		public virtual void* save_thyself (void* parent);
@@ -742,8 +742,8 @@
 		public uint add_data_probe_full (Gst.DataProbeCallback handler, GLib.DestroyNotify notify);
 		public uint add_event_probe (Gst.EventProbeCallback handler);
 		public uint add_event_probe_full (Gst.EventProbeCallback handler, GLib.DestroyNotify notify);
-		public Gst.FlowReturn alloc_buffer (uint64 offset, int size, Gst.Caps caps, out weak Gst.Buffer buf);
-		public Gst.FlowReturn alloc_buffer_and_set_caps (uint64 offset, int size, Gst.Caps caps, out weak Gst.Buffer buf);
+		public Gst.FlowReturn alloc_buffer (uint64 offset, int size, Gst.Caps caps, out unowned Gst.Buffer buf);
+		public Gst.FlowReturn alloc_buffer_and_set_caps (uint64 offset, int size, Gst.Caps caps, out unowned Gst.Buffer buf);
 		public bool can_link (Gst.Pad sinkpad);
 		public Gst.FlowReturn chain (Gst.Buffer buffer);
 		public bool check_pull_range ();
@@ -758,17 +758,17 @@
 		public Gst.Caps get_caps ();
 		public Gst.PadDirection get_direction ();
 		public void* get_element_private ();
-		public weak Gst.Caps get_fixed_caps_func ();
-		public weak GLib.List get_internal_links ();
-		public weak GLib.List get_internal_links_default ();
+		public unowned Gst.Caps get_fixed_caps_func ();
+		public unowned GLib.List get_internal_links ();
+		public unowned GLib.List get_internal_links_default ();
 		public Gst.Caps get_negotiated_caps ();
-		public weak Gst.PadTemplate get_pad_template ();
-		public weak Gst.Caps get_pad_template_caps ();
-		public weak Gst.Element get_parent_element ();
+		public unowned Gst.PadTemplate get_pad_template ();
+		public unowned Gst.Caps get_pad_template_caps ();
+		public unowned Gst.Element get_parent_element ();
 		public Gst.Pad get_peer ();
 		public Gst.QueryType get_query_types ();
 		public Gst.QueryType get_query_types_default ();
-		public Gst.FlowReturn get_range (uint64 offset, uint size, out weak Gst.Buffer buffer);
+		public Gst.FlowReturn get_range (uint64 offset, uint size, out unowned Gst.Buffer buffer);
 		public bool is_active ();
 		public bool is_blocked ();
 		public bool is_blocking ();
@@ -781,11 +781,11 @@
 		public bool peer_accept_caps (Gst.Caps caps);
 		public Gst.Caps peer_get_caps ();
 		public bool peer_query (Gst.Query query);
-		public weak Gst.Caps proxy_getcaps ();
+		public unowned Gst.Caps proxy_getcaps ();
 		public bool proxy_setcaps (Gst.Caps caps);
-		public Gst.FlowReturn pull_range (uint64 offset, uint size, out weak Gst.Buffer buffer);
-		public Gst.FlowReturn push (Gst.Buffer# buffer);
-		public bool push_event (Gst.Event# event);
+		public Gst.FlowReturn pull_range (uint64 offset, uint size, out unowned Gst.Buffer buffer);
+		public Gst.FlowReturn push (owned Gst.Buffer buffer);
+		public bool push_event (owned Gst.Event event);
 		public bool query (Gst.Query query);
 		public bool query_convert (Gst.Format src_format, int64 src_val, Gst.Format dest_format, int64 dest_val);
 		public bool query_default (Gst.Query query);
@@ -797,7 +797,7 @@
 		public void remove_buffer_probe (uint handler_id);
 		public void remove_data_probe (uint handler_id);
 		public void remove_event_probe (uint handler_id);
-		public bool send_event (Gst.Event# event);
+		public bool send_event (owned Gst.Event event);
 		public void set_acceptcaps_function (Gst.PadAcceptCapsFunction acceptcaps);
 		public void set_activate_function (Gst.PadActivateFunction activate);
 		public void set_activatepull_function (Gst.PadActivateModeFunction activatepull);
@@ -839,7 +839,7 @@
 		public Gst.PadDirection direction;
 		public weak string name_template;
 		public Gst.PadPresence presence;
-		public weak Gst.Caps get_caps ();
+		public unowned Gst.Caps get_caps ();
 		[CCode (has_construct_function = false)]
 		public PadTemplate (string name_template, Gst.PadDirection direction, Gst.PadPresence presence, Gst.Caps caps);
 		[HasEmitter]
@@ -864,7 +864,7 @@
 		public void auto_clock ();
 		public bool get_auto_flush_bus ();
 		public Gst.Bus get_bus ();
-		public weak Gst.Clock get_clock ();
+		public unowned Gst.Clock get_clock ();
 		public Gst.ClockTime get_delay ();
 		public Gst.ClockTime get_last_stream_time ();
 		[CCode (type = "GstElement*", has_construct_function = false)]
@@ -889,20 +889,20 @@
 		public weak Gst.PluginDesc orig_desc;
 		public bool registered;
 		public static GLib.Quark error_quark ();
-		public weak string get_description ();
-		public weak string get_filename ();
-		public weak string get_license ();
-		public weak GLib.Module get_module ();
-		public weak string get_name ();
-		public weak string get_origin ();
-		public weak string get_package ();
-		public weak string get_source ();
-		public weak string get_version ();
+		public unowned string get_description ();
+		public unowned string get_filename ();
+		public unowned string get_license ();
+		public unowned GLib.Module get_module ();
+		public unowned string get_name ();
+		public unowned string get_origin ();
+		public unowned string get_package ();
+		public unowned string get_source ();
+		public unowned string get_version ();
 		public bool is_loaded ();
 		public static void list_free (GLib.List list);
-		public weak Gst.Plugin load ();
-		public static weak Gst.Plugin load_by_name (string name);
-		public static weak Gst.Plugin load_file (string filename) throws GLib.Error;
+		public unowned Gst.Plugin load ();
+		public static unowned Gst.Plugin load_by_name (string name);
+		public static unowned Gst.Plugin load_file (string filename) throws GLib.Error;
 		public bool name_filter (string name);
 		public static bool register_static (int major_version, int minor_version, string name, string description, Gst.PluginInitFunc init_func, string version, string license, string source, string package, string origin);
 	}
@@ -927,10 +927,10 @@
 		public weak string plugin_name;
 		public uint rank;
 		public bool check_version (uint min_major, uint min_minor, uint min_micro);
-		public weak string get_name ();
+		public unowned string get_name ();
 		public uint get_rank ();
 		public static void list_free (GLib.List list);
-		public weak Gst.PluginFeature load ();
+		public unowned Gst.PluginFeature load ();
 		public void set_name (string name);
 		public void set_rank (uint rank);
 		public bool type_name_filter (Gst.TypeNameData data);
@@ -975,7 +975,7 @@
 		public Query.duration (Gst.Format format);
 		[CCode (has_construct_function = false)]
 		public Query.formats ();
-		public weak Gst.Structure get_structure ();
+		public unowned Gst.Structure get_structure ();
 		[CCode (has_construct_function = false)]
 		public Query.latency ();
 		[ReturnsModifiedPointer]
@@ -1009,9 +1009,9 @@
 		public void set_seeking (Gst.Format format, bool seekable, int64 segment_start, int64 segment_end);
 		public void set_segment (double rate, Gst.Format format, int64 start_value, int64 stop_value);
 		public static Gst.QueryType type_get_by_nick (string nick);
-		public static weak Gst.QueryTypeDefinition type_get_details (Gst.QueryType type);
-		public static weak string type_get_name (Gst.QueryType query);
-		public static weak Gst.Iterator type_iterate_definitions ();
+		public static unowned Gst.QueryTypeDefinition type_get_details (Gst.QueryType type);
+		public static unowned string type_get_name (Gst.QueryType query);
+		public static unowned Gst.Iterator type_iterate_definitions ();
 		public static Gst.QueryType type_register (string nick, string description);
 		public static GLib.Quark type_to_quark (Gst.QueryType query);
 		public static bool types_contains (Gst.QueryType types, Gst.QueryType type);
@@ -1038,19 +1038,19 @@
 		public bool add_feature (Gst.PluginFeature feature);
 		public void add_path (string path);
 		public bool add_plugin (Gst.Plugin plugin);
-		public weak GLib.List feature_filter ([CCode (delegate_target_pos = 2.1)] Gst.PluginFeatureFilter filter, bool first);
-		public weak Gst.PluginFeature find_feature (string name, GLib.Type type);
-		public weak Gst.Plugin find_plugin (string name);
+		public unowned GLib.List feature_filter ([CCode (delegate_target_pos = 2.1)] Gst.PluginFeatureFilter filter, bool first);
+		public unowned Gst.PluginFeature find_feature (string name, GLib.Type type);
+		public unowned Gst.Plugin find_plugin (string name);
 		public static bool fork_is_enabled ();
 		public static void fork_set_enabled (bool enabled);
-		public static weak Gst.Registry get_default ();
-		public weak GLib.List get_feature_list (GLib.Type type);
-		public weak GLib.List get_feature_list_by_plugin (string name);
-		public weak GLib.List get_path_list ();
-		public weak GLib.List get_plugin_list ();
-		public weak Gst.Plugin lookup (string filename);
-		public weak Gst.PluginFeature lookup_feature (string name);
-		public weak GLib.List plugin_filter (Gst.PluginFilter filter, bool first);
+		public static unowned Gst.Registry get_default ();
+		public unowned GLib.List get_feature_list (GLib.Type type);
+		public unowned GLib.List get_feature_list_by_plugin (string name);
+		public unowned GLib.List get_path_list ();
+		public unowned GLib.List get_plugin_list ();
+		public unowned Gst.Plugin lookup (string filename);
+		public unowned Gst.PluginFeature lookup_feature (string name);
+		public unowned GLib.List plugin_filter (Gst.PluginFilter filter, bool first);
 		public void remove_feature (Gst.PluginFeature feature);
 		public void remove_plugin (Gst.Plugin plugin);
 		public bool scan_path (string path);
@@ -1095,13 +1095,13 @@
 		public int parent_refcount;
 		public GLib.Type type;
 		public Gst.Structure copy ();
-		public static weak Gst.Structure empty_new (string name);
+		public static unowned Gst.Structure empty_new (string name);
 		public bool fixate_field_boolean (string field_name, bool target);
 		public bool fixate_field_nearest_double (string field_name, double target);
 		public bool fixate_field_nearest_fraction (string field_name, int target_numerator, int target_denominator);
 		public bool fixate_field_nearest_int (string field_name, int target);
 		public bool @foreach (Gst.StructureForeachFunc func);
-		public static Gst.Structure? from_string (string str, out weak string end);
+		public static Gst.Structure? from_string (string str, out unowned string end);
 		public bool get_boolean (string fieldname, out bool value);
 		public bool get_clock_time (string fieldname, Gst.ClockTime value);
 		public bool get_date (string fieldname, out GLib.Date value);
@@ -1111,16 +1111,16 @@
 		public bool get_fourcc (string fieldname, out uint32 value);
 		public bool get_fraction (string fieldname, out int value_numerator, out int value_denominator);
 		public bool get_int (string fieldname, out int value);
-		public weak string get_name ();
+		public unowned string get_name ();
 		public GLib.Quark get_name_id ();
-		public weak string get_string (string fieldname);
+		public unowned string get_string (string fieldname);
 		public bool get_uint (string fieldname, out uint value);
-		public weak Gst.Value? get_value (string fieldname);
+		public unowned Gst.Value? get_value (string fieldname);
 		public bool has_field (string fieldname);
 		public bool has_field_typed (string fieldname, GLib.Type type);
 		public bool has_name (string name);
-		public static weak Gst.Structure id_empty_new (GLib.Quark quark);
-		public weak Gst.Value? id_get_value (GLib.Quark field);
+		public static unowned Gst.Structure id_empty_new (GLib.Quark quark);
+		public unowned Gst.Value? id_get_value (GLib.Quark field);
 		public void id_set (GLib.Quark fieldname, ...);
 		public void id_set_valist (GLib.Quark fieldname, void* varargs);
 		public void id_set_value (GLib.Quark field, Gst.Value value);
@@ -1128,7 +1128,7 @@
 		public int n_fields ();
 		[CCode (has_construct_function = false)]
 		public Structure (string name, string firstfield, ...);
-		public weak string nth_field_name (uint index);
+		public unowned string nth_field_name (uint index);
 		public void remove_all_fields ();
 		public void remove_field (string fieldname);
 		public void remove_fields (string fieldname, ...);
@@ -1146,7 +1146,7 @@
 	public class SystemClock : Gst.Clock {
 		public bool stopping;
 		public weak GLib.Thread thread;
-		public static weak Gst.Clock obtain ();
+		public static unowned Gst.Clock obtain ();
 	}
 	[Compact]
 	[CCode (copy_function = "gst_tag_list_copy", cheader_filename = "gst/gst.h")]
@@ -1187,7 +1187,7 @@
 		public bool get_uint_index (string tag, uint index, out uint value);
 		public bool get_ulong (string tag, out ulong value);
 		public bool get_ulong_index (string tag, uint index, out ulong value);
-		public weak Gst.Value? get_value_index (string tag, uint index);
+		public unowned Gst.Value? get_value_index (string tag, uint index);
 		public void insert (Gst.TagList from, Gst.TagMergeMode mode);
 		public bool is_empty ();
 		public Gst.TagList merge (Gst.TagList list2, Gst.TagMergeMode mode);
@@ -1205,7 +1205,7 @@
 		public bool running;
 		public Gst.TaskState state;
 		public static void cleanup_all ();
-		public static weak Gst.Task create (Gst.TaskFunction func, void* data);
+		public static unowned Gst.Task create (Gst.TaskFunction func, void* data);
 		public Gst.TaskState get_state ();
 		public bool join ();
 		public bool pause ();
@@ -1260,11 +1260,11 @@
 		[CCode (cname = "gst_type_find_factory_call_function")]
 		public void call_function (Gst.TypeFind find);
 		[CCode (cname = "gst_type_find_factory_get_caps")]
-		public weak Gst.Caps get_caps ();
+		public unowned Gst.Caps get_caps ();
 		[CCode (cname = "gst_type_find_factory_get_extensions")]
-		public weak string get_extensions ();
+		public unowned string get_extensions ();
 		[CCode (cname = "gst_type_find_factory_get_list")]
-		public static weak GLib.List get_list ();
+		public static unowned GLib.List get_list ();
 	}
 	[Compact]
 	[CCode (cheader_filename = "gst/gst.h")]
@@ -1284,9 +1284,9 @@
 	public class XML : Gst.Object {
 		public void* ns;
 		public weak GLib.List topelements;
-		public weak Gst.Element get_element (uchar[] name);
-		public weak GLib.List get_topelements ();
-		public static weak Gst.Element make_element (void* cur, Gst.Object parent);
+		public unowned Gst.Element get_element (uchar[] name);
+		public unowned GLib.List get_topelements ();
+		public static unowned Gst.Element make_element (void* cur, Gst.Object parent);
 		[CCode (has_construct_function = false)]
 		public XML ();
 		[NoWrapper]
@@ -1301,12 +1301,12 @@
 	[CCode (cheader_filename = "gst/gst.h")]
 	public interface ChildProxy : Gst.Object {
 		public static void get (Gst.Object object, ...);
-		public abstract weak Gst.Object get_child_by_index (uint index);
-		public weak Gst.Object get_child_by_name (string name);
+		public abstract unowned Gst.Object get_child_by_index (uint index);
+		public unowned Gst.Object get_child_by_name (string name);
 		public abstract uint get_children_count ();
 		public static void get_property (Gst.Object object, string name, Gst.Value value);
 		public static void get_valist (Gst.Object object, string first_property_name, void* var_args);
-		public static bool lookup (Gst.Object object, string name, out weak Gst.Object target, out weak GLib.ParamSpec pspec);
+		public static bool lookup (Gst.Object object, string name, out unowned Gst.Object target, out unowned GLib.ParamSpec pspec);
 		public static void set (Gst.Object object, ...);
 		public static void set_property (Gst.Object object, string name, Gst.Value value);
 		public static void set_valist (Gst.Object object, string first_property_name, void* var_args);
@@ -1324,14 +1324,14 @@
 	}
 	[CCode (cheader_filename = "gst/gst.h")]
 	public interface URIHandler {
-		public abstract weak string get_protocols ();
+		public abstract unowned string get_protocols ();
 		[NoWrapper]
-		public abstract weak string get_protocols_full (GLib.Type type);
+		public abstract unowned string get_protocols_full (GLib.Type type);
 		[NoWrapper]
 		public abstract Gst.URIType get_type ();
 		[NoWrapper]
 		public abstract Gst.URIType get_type_full (GLib.Type type);
-		public abstract weak string get_uri ();
+		public abstract unowned string get_uri ();
 		public uint get_uri_type ();
 		public abstract bool set_uri (string uri);
 		[HasEmitter]
@@ -1381,7 +1381,7 @@
 		public void array_append_value (Gst.Value append_value);
 		public uint array_get_size ();
 		public static GLib.Type array_get_type ();
-		public weak Gst.Value? array_get_value (uint index);
+		public unowned Gst.Value? array_get_value (uint index);
 		public void array_prepend_value (Gst.Value prepend_value);
 		public static bool can_compare (Gst.Value value1, Gst.Value value2);
 		public static bool can_intersect (Gst.Value value1, Gst.Value value2);
@@ -1391,7 +1391,7 @@
 		public bool deserialize (string src);
 		public static bool fraction_multiply (GLib.Value product, GLib.Value factor1, GLib.Value factor2);
 		public static bool fraction_subtract (GLib.Value dest, GLib.Value minuend, GLib.Value subtrahend);
-		public weak Gst.Buffer get_buffer ();
+		public unowned Gst.Buffer get_buffer ();
 		public Gst.Caps get_caps ();
 		public Gst.Date get_date ();
 		public double get_double_range_max ();
@@ -1399,11 +1399,11 @@
 		public uint get_fourcc ();
 		public int get_fraction_denominator ();
 		public int get_fraction_numerator ();
-		public weak Gst.Value? get_fraction_range_max ();
-		public weak Gst.Value? get_fraction_range_min ();
+		public unowned Gst.Value? get_fraction_range_max ();
+		public unowned Gst.Value? get_fraction_range_min ();
 		public int get_int_range_max ();
 		public int get_int_range_min ();
-		public weak Gst.Structure get_structure ();
+		public unowned Gst.Structure get_structure ();
 		public void init_and_copy (Gst.Value src);
 		public static bool intersect (Gst.Value dest, Gst.Value value1, Gst.Value value2);
 		public bool is_fixed ();
@@ -1411,7 +1411,7 @@
 		public void list_concat (Gst.Value value1, Gst.Value value2);
 		public uint list_get_size ();
 		public static GLib.Type list_get_type ();
-		public weak Gst.Value? list_get_value (uint index);
+		public unowned Gst.Value? list_get_value (uint index);
 		public void list_prepend_value (Gst.Value prepend_value);
 		[CCode (cname = "GST_MAKE_FOURCC")]
 		public static uint make_fourcc (char a, char b, char c, char d);
@@ -1974,7 +1974,7 @@
 	[CCode (cheader_filename = "gst/gst.h")]
 	public delegate void LogFunction (Gst.DebugCategory category, Gst.DebugLevel level, string file, string function, int line, GLib.Object object, Gst.DebugMessage message);
 	[CCode (cheader_filename = "gst/gst.h")]
-	public static delegate weak Gst.MiniObject MiniObjectCopyFunction (Gst.MiniObject obj);
+	public static delegate unowned Gst.MiniObject MiniObjectCopyFunction (Gst.MiniObject obj);
 	[CCode (cheader_filename = "gst/gst.h")]
 	public static delegate void MiniObjectFinalizeFunction (Gst.MiniObject obj);
 	[CCode (cheader_filename = "gst/gst.h")]
@@ -1986,7 +1986,7 @@
 	[CCode (cheader_filename = "gst/gst.h")]
 	public delegate void PadBlockCallback (Gst.Pad pad, bool blocked);
 	[CCode (cheader_filename = "gst/gst.h")]
-	public static delegate Gst.FlowReturn PadBufferAllocFunction (Gst.Pad pad, uint64 offset, uint size, Gst.Caps caps, out weak Gst.Buffer buf);
+	public static delegate Gst.FlowReturn PadBufferAllocFunction (Gst.Pad pad, uint64 offset, uint size, Gst.Caps caps, out unowned Gst.Buffer buf);
 	[CCode (cheader_filename = "gst/gst.h")]
 	public static delegate Gst.FlowReturn PadChainFunction (Gst.Pad pad, Gst.Buffer buffer);
 	[CCode (cheader_filename = "gst/gst.h")]
@@ -1998,11 +1998,11 @@
 	[CCode (cheader_filename = "gst/gst.h")]
 	public static delegate void PadFixateCapsFunction (Gst.Pad pad, Gst.Caps caps);
 	[CCode (cheader_filename = "gst/gst.h")]
-	public static delegate weak Gst.Caps PadGetCapsFunction (Gst.Pad pad);
+	public static delegate unowned Gst.Caps PadGetCapsFunction (Gst.Pad pad);
 	[CCode (cheader_filename = "gst/gst.h")]
-	public static delegate Gst.FlowReturn PadGetRangeFunction (Gst.Pad pad, uint64 offset, uint length, out weak Gst.Buffer buffer);
+	public static delegate Gst.FlowReturn PadGetRangeFunction (Gst.Pad pad, uint64 offset, uint length, out unowned Gst.Buffer buffer);
 	[CCode (cheader_filename = "gst/gst.h")]
-	public static delegate weak GLib.List PadIntLinkFunction (Gst.Pad pad);
+	public static delegate unowned GLib.List PadIntLinkFunction (Gst.Pad pad);
 	[CCode (cheader_filename = "gst/gst.h")]
 	public static delegate Gst.PadLinkReturn PadLinkFunction (Gst.Pad pad, Gst.Pad peer);
 	[CCode (cheader_filename = "gst/gst.h")]
@@ -2038,7 +2038,7 @@
 	[CCode (cheader_filename = "gst/gst.h")]
 	public static delegate bool ValueIntersectFunc (Gst.Value dest, Gst.Value value1, Gst.Value value2);
 	[CCode (cheader_filename = "gst/gst.h")]
-	public static delegate weak string ValueSerializeFunc (Gst.Value value1);
+	public static delegate unowned string ValueSerializeFunc (Gst.Value value1);
 	[CCode (cheader_filename = "gst/gst.h")]
 	public static delegate bool ValueSubtractFunc (Gst.Value dest, Gst.Value minuend, Gst.Value subtrahend);
 	[CCode (cheader_filename = "gst/gst.h")]
@@ -2206,9 +2206,9 @@
 	[CCode (cname = "GST_DEBUG_BIN_TO_DOT_FILE_WITH_TS", cheader_filename = "gst/gst.h")]
 	public static void debug_bin_to_dot_file_with_ts (Gst.Bin bin, Gst.DebugGraphDetails details, string prefix);
 	[CCode (cheader_filename = "gst/gst.h")]
-	public static weak string debug_construct_term_color (uint colorinfo);
+	public static unowned string debug_construct_term_color (uint colorinfo);
 	[CCode (cheader_filename = "gst/gst.h")]
-	public static weak GLib.SList debug_get_all_categories ();
+	public static unowned GLib.SList debug_get_all_categories ();
 	[CCode (cheader_filename = "gst/gst.h")]
 	public static Gst.DebugLevel debug_get_default_threshold ();
 	[CCode (cheader_filename = "gst/gst.h")]
@@ -2216,7 +2216,7 @@
 	[CCode (cheader_filename = "gst/gst.h")]
 	public static bool debug_is_colored ();
 	[CCode (cheader_filename = "gst/gst.h")]
-	public static weak string debug_level_get_name (Gst.DebugLevel level);
+	public static unowned string debug_level_get_name (Gst.DebugLevel level);
 	[CCode (cheader_filename = "gst/gst.h")]
 	public static void debug_log (Gst.DebugCategory category, Gst.DebugLevel level, string file, string function, int line, GLib.Object object, string format);
 	[CCode (cheader_filename = "gst/gst.h")]
@@ -2246,11 +2246,11 @@
 	[CCode (cheader_filename = "gst/gst.h")]
 	public static GLib.Type double_range_get_type ();
 	[CCode (cheader_filename = "gst/gst.h")]
-	public static weak string error_get_message (GLib.Quark domain, int code);
+	public static unowned string error_get_message (GLib.Quark domain, int code);
 	[CCode (cheader_filename = "gst/gst.h")]
-	public static weak GLib.List filter_run (GLib.List list, Gst.FilterFunc func, bool first);
+	public static unowned GLib.List filter_run (GLib.List list, Gst.FilterFunc func, bool first);
 	[CCode (cheader_filename = "gst/gst.h")]
-	public static weak string flow_get_name (Gst.FlowReturn ret);
+	public static unowned string flow_get_name (Gst.FlowReturn ret);
 	[CCode (cheader_filename = "gst/gst.h")]
 	public static GLib.Quark flow_to_quark (Gst.FlowReturn ret);
 	[CCode (cheader_filename = "gst/gst.h")]
@@ -2258,9 +2258,9 @@
 	[CCode (cheader_filename = "gst/gst.h")]
 	public static Gst.FormatDefinition format_get_details (Gst.Format format);
 	[CCode (cheader_filename = "gst/gst.h")]
-	public static weak string format_get_name (Gst.Format format);
+	public static unowned string format_get_name (Gst.Format format);
 	[CCode (cheader_filename = "gst/gst.h")]
-	public static weak Gst.Iterator format_iterate_definitions ();
+	public static unowned Gst.Iterator format_iterate_definitions ();
 	[CCode (cheader_filename = "gst/gst.h")]
 	public static Gst.Format format_register (string nick, string description);
 	[CCode (cheader_filename = "gst/gst.h")]
@@ -2274,7 +2274,7 @@
 	[CCode (cheader_filename = "gst/gst.h")]
 	public static GLib.Type fraction_range_get_type ();
 	[CCode (cheader_filename = "gst/gst.h")]
-	public static void init ([CCode (array_length_pos = 0.9)] ref weak string[] args);
+	public static void init ([CCode (array_length_pos = 0.9)] ref unowned string[] args);
 	[CCode (cheader_filename = "gst/gst.h")]
 	public static bool init_check (int argc, string argv) throws GLib.Error;
 	[CCode (cheader_filename = "gst/gst.h")]
@@ -2318,17 +2318,17 @@
 	[CCode (cheader_filename = "gst/gst.h")]
 	public static void marshal_VOID__UINT_BOXED (GLib.Closure closure, Gst.Value return_value, uint n_param_values, Gst.Value param_values, void* invocation_hint, void* marshal_data);
 	[CCode (cheader_filename = "gst/gst.h")]
-	public static weak GLib.ParamSpec param_spec_fraction (string name, string nick, string blurb, int min_num, int min_denom, int max_num, int max_denom, int default_num, int default_denom, GLib.ParamFlags flags);
+	public static unowned GLib.ParamSpec param_spec_fraction (string name, string nick, string blurb, int min_num, int min_denom, int max_num, int max_denom, int default_num, int default_denom, GLib.ParamFlags flags);
 	[CCode (cheader_filename = "gst/gst.h")]
-	public static weak GLib.ParamSpec param_spec_mini_object (string name, string nick, string blurb, GLib.Type object_type, GLib.ParamFlags flags);
+	public static unowned GLib.ParamSpec param_spec_mini_object (string name, string nick, string blurb, GLib.Type object_type, GLib.ParamFlags flags);
 	[CCode (cheader_filename = "gst/gst.h")]
-	public static weak Gst.Element parse_bin_from_description (string bin_description, bool ghost_unconnected_pads) throws GLib.Error;
+	public static unowned Gst.Element parse_bin_from_description (string bin_description, bool ghost_unconnected_pads) throws GLib.Error;
 	[CCode (cheader_filename = "gst/gst.h")]
 	public static GLib.Quark parse_error_quark ();
 	[CCode (cheader_filename = "gst/gst.h")]
-	public static weak Gst.Element parse_launch (string pipeline_description) throws GLib.Error;
+	public static unowned Gst.Element parse_launch (string pipeline_description) throws GLib.Error;
 	[CCode (cheader_filename = "gst/gst.h")]
-	public static weak Gst.Element parse_launchv (string[] argv) throws GLib.Error;
+	public static unowned Gst.Element parse_launchv (string[] argv) throws GLib.Error;
 	[CCode (cheader_filename = "gst/gst.h")]
 	public static void print_element_args (GLib.StringBuilder buf, int indent, Gst.Element element);
 	[CCode (cheader_filename = "gst/gst.h")]
@@ -2344,11 +2344,11 @@
 	[CCode (cheader_filename = "gst/gst.h")]
 	public static bool tag_exists (string tag);
 	[CCode (cheader_filename = "gst/gst.h")]
-	public static weak string tag_get_description (string tag);
+	public static unowned string tag_get_description (string tag);
 	[CCode (cheader_filename = "gst/gst.h")]
 	public static Gst.TagFlag tag_get_flag (string tag);
 	[CCode (cheader_filename = "gst/gst.h")]
-	public static weak string tag_get_nick (string tag);
+	public static unowned string tag_get_nick (string tag);
 	[CCode (cheader_filename = "gst/gst.h")]
 	public static GLib.Type tag_get_type (string tag);
 	[CCode (cheader_filename = "gst/gst.h")]
@@ -2362,11 +2362,11 @@
 	[CCode (cheader_filename = "gst/gst.h")]
 	public static bool update_registry ();
 	[CCode (cheader_filename = "gst/gst.h")]
-	public static weak string uri_construct (string protocol, string location);
+	public static unowned string uri_construct (string protocol, string location);
 	[CCode (cheader_filename = "gst/gst.h")]
-	public static weak string uri_get_location (string uri);
+	public static unowned string uri_get_location (string uri);
 	[CCode (cheader_filename = "gst/gst.h")]
-	public static weak string uri_get_protocol (string uri);
+	public static unowned string uri_get_protocol (string uri);
 	[CCode (cheader_filename = "gst/gst.h")]
 	public static bool uri_has_protocol (string uri, string protocol);
 	[CCode (cheader_filename = "gst/gst.h")]
@@ -2392,7 +2392,7 @@
 	[CCode (cheader_filename = "gst/gst.h")]
 	public static uint64 util_uint64_scale_int (uint64 val, int num, int denom);
 	[CCode (cheader_filename = "gst/gst.h")]
-	public static weak Gst.MiniObject value_dup_mini_object (Gst.Value value);
+	public static unowned Gst.MiniObject value_dup_mini_object (Gst.Value value);
 	[CCode (cheader_filename = "gst/gst.h")]
 	public static void version (out uint major, out uint minor, out uint micro, out uint nano);
 	[CCode (cheader_filename = "gst/gst.h")]

Modified: trunk/vapi/gstreamer-audio-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-audio-0.10.vapi	(original)
+++ trunk/vapi/gstreamer-audio-0.10.vapi	Fri Dec 19 21:56:41 2008
@@ -59,7 +59,7 @@
 		public uint64 next_sample;
 		public weak Gst.Clock provided_clock;
 		public weak Gst.RingBuffer ringbuffer;
-		public virtual weak Gst.RingBuffer create_ringbuffer ();
+		public virtual unowned Gst.RingBuffer create_ringbuffer ();
 		public bool get_provide_clock ();
 		public Gst.BaseAudioSinkSlaveMethod get_slave_method ();
 		public void set_provide_clock (bool provide);
@@ -76,7 +76,7 @@
 		public weak Gst.Clock clock;
 		public uint64 next_sample;
 		public weak Gst.RingBuffer ringbuffer;
-		public virtual weak Gst.RingBuffer create_ringbuffer ();
+		public virtual unowned Gst.RingBuffer create_ringbuffer ();
 		public bool get_provide_clock ();
 		public void set_provide_clock (bool provide);
 		[NoAccessorMethod]
@@ -262,9 +262,9 @@
 	[CCode (cheader_filename = "gst/audio/audio.h")]
 	public const string AUDIO_INT_STANDARD_PAD_TEMPLATE_CAPS;
 	[CCode (cheader_filename = "gst/audio/audio.h")]
-	public static weak Gst.Buffer audio_buffer_clip (Gst.Buffer buffer, Gst.Segment segment, int rate, int frame_size);
+	public static unowned Gst.Buffer audio_buffer_clip (Gst.Buffer buffer, Gst.Segment segment, int rate, int frame_size);
 	[CCode (cheader_filename = "gst/audio/mixerutils.h")]
-	public static weak GLib.List audio_default_registry_mixer_filter (Gst.AudioMixerFilterFunc filter_func, bool first);
+	public static unowned GLib.List audio_default_registry_mixer_filter (Gst.AudioMixerFilterFunc filter_func, bool first);
 	[CCode (cheader_filename = "gst/audio/audio.h")]
 	public static Gst.ClockTime audio_duration_from_pad_buffer (Gst.Pad pad, Gst.Buffer buf);
 	[CCode (cheader_filename = "gst/audio/multichannel.h")]

Modified: trunk/vapi/gstreamer-base-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-base-0.10.vapi	(original)
+++ trunk/vapi/gstreamer-base-0.10.vapi	Fri Dec 19 21:56:41 2008
@@ -43,14 +43,14 @@
 		[NoWrapper]
 		public virtual Gst.StateChangeReturn async_play ();
 		[NoWrapper]
-		public virtual Gst.FlowReturn buffer_alloc (uint64 offset, uint size, Gst.Caps caps, out weak Gst.Buffer buf);
+		public virtual Gst.FlowReturn buffer_alloc (uint64 offset, uint size, Gst.Caps caps, out unowned Gst.Buffer buf);
 		[NoWrapper]
 		public virtual bool event (Gst.Event event);
 		[NoWrapper]
 		public virtual void fixate (Gst.Caps caps);
 		[NoWrapper]
-		public virtual weak Gst.Caps get_caps ();
-		public weak Gst.Buffer get_last_buffer ();
+		public virtual unowned Gst.Caps get_caps ();
+		public unowned Gst.Buffer get_last_buffer ();
 		public Gst.ClockTime get_latency ();
 		public int64 get_max_lateness ();
 		public bool get_sync ();
@@ -114,7 +114,7 @@
 		[NoWrapper]
 		public virtual bool check_get_range ();
 		[NoWrapper]
-		public virtual Gst.FlowReturn create (uint64 offset, uint size, out weak Gst.Buffer buf);
+		public virtual Gst.FlowReturn create (uint64 offset, uint size, out unowned Gst.Buffer buf);
 		[NoWrapper]
 		public virtual bool do_seek (Gst.Segment segment);
 		[NoWrapper]
@@ -122,7 +122,7 @@
 		[NoWrapper]
 		public virtual void fixate (Gst.Caps caps);
 		[NoWrapper]
-		public virtual weak Gst.Caps get_caps ();
+		public virtual unowned Gst.Caps get_caps ();
 		public bool get_do_timestamp ();
 		[NoWrapper]
 		public virtual bool get_size (uint64 size);
@@ -133,7 +133,6 @@
 		public virtual bool is_seekable ();
 		[NoWrapper]
 		public virtual bool negotiate ();
-		public BaseSrc ();
 		[NoWrapper]
 		public virtual bool newsegment ();
 		[NoWrapper]
@@ -191,9 +190,8 @@
 		public bool is_in_place ();
 		public bool is_passthrough ();
 		public bool is_qos_enabled ();
-		public BaseTransform ();
 		[NoWrapper]
-		public virtual Gst.FlowReturn prepare_output_buffer (Gst.Buffer input, int size, Gst.Caps caps, out weak Gst.Buffer buf);
+		public virtual Gst.FlowReturn prepare_output_buffer (Gst.Buffer input, int size, Gst.Caps caps, out unowned Gst.Buffer buf);
 		[NoWrapper]
 		public virtual bool set_caps (Gst.Caps incaps, Gst.Caps outcaps);
 		public void set_gap_aware (bool gap_aware);
@@ -209,7 +207,7 @@
 		[NoWrapper]
 		public virtual Gst.FlowReturn transform (Gst.Buffer inbuf, Gst.Buffer outbuf);
 		[NoWrapper]
-		public virtual weak Gst.Caps transform_caps (Gst.PadDirection direction, Gst.Caps caps);
+		public virtual unowned Gst.Caps transform_caps (Gst.PadDirection direction, Gst.Caps caps);
 		[NoWrapper]
 		public virtual Gst.FlowReturn transform_ip (Gst.Buffer buf);
 		[NoWrapper]
@@ -230,7 +228,7 @@
 	[CCode (cheader_filename = "gst/base/gstcollectpads.h")]
 	public class CollectPads : Gst.Object {
 		public weak GLib.Cond cond;
-		public uint cookie;
+		public uint32 cookie;
 		public weak GLib.SList<Gst.CollectData> data;
 		public uint eospads;
 		public weak Gst.CollectPadsFunction func;
@@ -238,8 +236,8 @@
 		public uint queuedpads;
 		public bool started;
 		public void* user_data;
-		public weak Gst.CollectData add_pad (Gst.Pad pad, uint size);
-		public weak Gst.CollectData add_pad_full (Gst.Pad pad, uint size, Gst.CollectDataDestroyNotify destroy_notify);
+		public unowned Gst.CollectData add_pad (Gst.Pad pad, uint size);
+		public unowned Gst.CollectData add_pad_full (Gst.Pad pad, uint size, Gst.CollectDataDestroyNotify destroy_notify);
 		public uint available ();
 		public Gst.FlowReturn collect ();
 		public Gst.FlowReturn collect_range (uint64 offset, uint length);
@@ -247,10 +245,10 @@
 		public bool is_active (Gst.Pad pad);
 		[CCode (has_construct_function = false)]
 		public CollectPads ();
-		public weak Gst.Buffer peek (Gst.CollectData data);
-		public weak Gst.Buffer pop (Gst.CollectData data);
+		public unowned Gst.Buffer peek (Gst.CollectData data);
+		public unowned Gst.Buffer pop (Gst.CollectData data);
 		public uint read (Gst.CollectData data, uchar bytes, uint size);
-		public weak Gst.Buffer read_buffer (Gst.CollectData data, uint size);
+		public unowned Gst.Buffer read_buffer (Gst.CollectData data, uint size);
 		public bool remove_pad (Gst.Pad pad);
 		public void set_flushing (bool flushing);
 		public void set_function (Gst.CollectPadsFunction func);
@@ -276,7 +274,7 @@
 		public void limits_changed ();
 		[CCode (has_construct_function = false)]
 		public DataQueue (Gst.DataQueueCheckFullFunction checkfull, void* checkdata);
-		public bool pop (out weak Gst.DataQueueItem item);
+		public bool pop (out unowned Gst.DataQueueItem item);
 		public bool push (Gst.DataQueueItem item);
 		public void set_flushing (bool flushing);
 		[NoAccessorMethod]
@@ -307,7 +305,7 @@
 	[CCode (cheader_filename = "gst/base/gstpushsrc.h")]
 	public class PushSrc : Gst.BaseSrc {
 		[NoWrapper]
-		public virtual Gst.FlowReturn create (out weak Gst.Buffer buf);
+		public virtual Gst.FlowReturn create (out unowned Gst.Buffer buf);
 	}
 	[CCode (cprefix = "GST_BASE_SRC_", has_type_id = "0", cheader_filename = "gst/gst.h")]
 	public enum BaseSrcFlags {
@@ -321,11 +319,11 @@
 	[CCode (cheader_filename = "gst/base/gstdataqueue.h")]
 	public static delegate bool DataQueueCheckFullFunction (Gst.DataQueue queue, uint visible, uint bytes, uint64 time, void* checkdata);
 	[CCode (cheader_filename = "gst/base/gsttypefindhelper.h")]
-	public static delegate Gst.FlowReturn TypeFindHelperGetRangeFunction (Gst.Object obj, uint64 offset, uint length, out weak Gst.Buffer buffer);
+	public static delegate Gst.FlowReturn TypeFindHelperGetRangeFunction (Gst.Object obj, uint64 offset, uint length, out unowned Gst.Buffer buffer);
 	[CCode (cheader_filename = "gst/gst.h")]
-	public static weak Gst.Caps type_find_helper (Gst.Pad src, uint64 size);
+	public static unowned Gst.Caps type_find_helper (Gst.Pad src, uint64 size);
 	[CCode (cheader_filename = "gst/gst.h")]
-	public static weak Gst.Caps type_find_helper_for_buffer (Gst.Object obj, Gst.Buffer buf, Gst.TypeFindProbability prob);
+	public static unowned Gst.Caps type_find_helper_for_buffer (Gst.Object obj, Gst.Buffer buf, Gst.TypeFindProbability prob);
 	[CCode (cheader_filename = "gst/gst.h")]
-	public static weak Gst.Caps type_find_helper_get_range (Gst.Object obj, Gst.TypeFindHelperGetRangeFunction func, uint64 size, Gst.TypeFindProbability prob);
+	public static unowned Gst.Caps type_find_helper_get_range (Gst.Object obj, Gst.TypeFindHelperGetRangeFunction func, uint64 size, Gst.TypeFindProbability prob);
 }

Modified: trunk/vapi/gstreamer-check-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-check-0.10.vapi	(original)
+++ trunk/vapi/gstreamer-check-0.10.vapi	Fri Dec 19 21:56:41 2008
@@ -10,7 +10,7 @@
 		public int size;
 	}
 	[CCode (cheader_filename = "gst/gst.h")]
-	public static weak Gst.Buffer buffer_straw_get_buffer (Gst.Element bin, Gst.Pad pad);
+	public static unowned Gst.Buffer buffer_straw_get_buffer (Gst.Element bin, Gst.Pad pad);
 	[CCode (cheader_filename = "gst/gst.h")]
 	public static void buffer_straw_start_pipeline (Gst.Element bin, Gst.Pad pad);
 	[CCode (cheader_filename = "gst/gst.h")]
@@ -26,11 +26,11 @@
 	[CCode (cheader_filename = "gst/gst.h")]
 	public static int check_run_suite (void* suite, string name, string fname);
 	[CCode (cheader_filename = "gst/gst.h")]
-	public static weak Gst.Element check_setup_element (string factory);
+	public static unowned Gst.Element check_setup_element (string factory);
 	[CCode (cheader_filename = "gst/gst.h")]
-	public static weak Gst.Pad check_setup_sink_pad (Gst.Element element, Gst.StaticPadTemplate template, Gst.Caps caps);
+	public static unowned Gst.Pad check_setup_sink_pad (Gst.Element element, Gst.StaticPadTemplate template, Gst.Caps caps);
 	[CCode (cheader_filename = "gst/gst.h")]
-	public static weak Gst.Pad check_setup_src_pad (Gst.Element element, Gst.StaticPadTemplate template, Gst.Caps caps);
+	public static unowned Gst.Pad check_setup_src_pad (Gst.Element element, Gst.StaticPadTemplate template, Gst.Caps caps);
 	[CCode (cheader_filename = "gst/gst.h")]
 	public static void check_teardown_element (Gst.Element element);
 	[CCode (cheader_filename = "gst/gst.h")]

Modified: trunk/vapi/gstreamer-controller-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-controller-0.10.vapi	(original)
+++ trunk/vapi/gstreamer-controller-0.10.vapi	Fri Dec 19 21:56:41 2008
@@ -6,7 +6,7 @@
 	public class ControlSource : GLib.Object {
 		public bool bound;
 		public bool bind (GLib.ParamSpec pspec);
-		public bool get_value (Gst.ClockTime timestamp, GLib.Value value);
+		public bool get_value (Gst.ClockTime timestamp, Gst.Value value);
 		public bool get_value_array (Gst.ClockTime timestamp, Gst.ValueArray value_array);
 	}
 	[CCode (cheader_filename = "gst/controller/gstcontroller.h")]
@@ -14,12 +14,12 @@
 		public weak GLib.Mutex @lock;
 		public weak GLib.Object object;
 		public weak GLib.List properties;
-		public GLib.Value get (string property_name, Gst.ClockTime timestamp);
-		public weak GLib.List get_all (string property_name);
-		public weak Gst.ControlSource get_control_source (string property_name);
+		public Gst.Value get (string property_name, Gst.ClockTime timestamp);
+		public unowned GLib.List get_all (string property_name);
+		public unowned Gst.ControlSource get_control_source (string property_name);
 		public bool get_value_array (Gst.ClockTime timestamp, Gst.ValueArray value_array);
 		public bool get_value_arrays (Gst.ClockTime timestamp, GLib.SList value_arrays);
-		public static bool init (int argc, out weak string argv);
+		public static bool init (int argc, out unowned string argv);
 		[CCode (has_construct_function = false)]
 		public Controller.list (GLib.Object object, GLib.List list);
 		[CCode (has_construct_function = false)]
@@ -27,7 +27,7 @@
 		public bool remove_properties ();
 		public bool remove_properties_list (GLib.List list);
 		public bool remove_properties_valist (void* var_args);
-		public bool set (string property_name, Gst.ClockTime timestamp, GLib.Value value);
+		public bool set (string property_name, Gst.ClockTime timestamp, Gst.Value value);
 		public bool set_control_source (string property_name, Gst.ControlSource csource);
 		public void set_disabled (bool disabled);
 		public bool set_from_list (string property_name, GLib.SList timedvalues);
@@ -45,11 +45,11 @@
 	[CCode (cheader_filename = "gst/controller/gstcontroller.h")]
 	public class InterpolationControlSource : Gst.ControlSource {
 		public weak GLib.Mutex @lock;
-		public weak GLib.List get_all ();
+		public unowned GLib.List get_all ();
 		public int get_count ();
 		[CCode (has_construct_function = false)]
 		public InterpolationControlSource ();
-		public bool set (Gst.ClockTime timestamp, GLib.Value value);
+		public bool set (Gst.ClockTime timestamp, Gst.Value value);
 		public bool set_from_list (GLib.SList timedvalues);
 		public bool set_interpolation_mode (Gst.InterpolateMode mode);
 		public bool unset (Gst.ClockTime timestamp);
@@ -61,11 +61,11 @@
 		[CCode (has_construct_function = false)]
 		public LFOControlSource ();
 		[NoAccessorMethod]
-		public GLib.Value amplitude { get; set; }
+		public Gst.Value amplitude { get; set; }
 		[NoAccessorMethod]
 		public double frequency { get; set; }
 		[NoAccessorMethod]
-		public GLib.Value offset { get; set; }
+		public Gst.Value offset { get; set; }
 		[NoAccessorMethod]
 		public uint64 timeshift { get; set; }
 		[NoAccessorMethod]
@@ -75,7 +75,7 @@
 	[CCode (cheader_filename = "gst/controller/gstcontroller.h")]
 	public class TimedValue {
 		public Gst.ClockTime timestamp;
-		public GLib.Value value;
+		public Gst.Value value;
 	}
 	[Compact]
 	[CCode (cheader_filename = "gst/controller/gstcontroller.h")]
@@ -105,17 +105,17 @@
 	[CCode (cheader_filename = "gst/controller/gstcontroller.h")]
 	public static delegate bool ControlSourceBind (Gst.ControlSource _self, GLib.ParamSpec pspec);
 	[CCode (cheader_filename = "gst/controller/gstcontroller.h")]
-	public static delegate bool ControlSourceGetValue (Gst.ControlSource _self, Gst.ClockTime timestamp, GLib.Value value);
+	public static delegate bool ControlSourceGetValue (Gst.ControlSource _self, Gst.ClockTime timestamp, Gst.Value value);
 	[CCode (cheader_filename = "gst/controller/gstcontroller.h")]
 	public static delegate bool ControlSourceGetValueArray (Gst.ControlSource _self, Gst.ClockTime timestamp, Gst.ValueArray value_array);
 	[CCode (cheader_filename = "gst/controller/gstcontroller.h")]
-	public static weak Gst.Controller object_control_properties (GLib.Object object);
+	public static unowned Gst.Controller object_control_properties (GLib.Object object);
 	[CCode (cheader_filename = "gst/controller/gstcontroller.h")]
 	public static Gst.ClockTime object_get_control_rate (GLib.Object object);
 	[CCode (cheader_filename = "gst/controller/gstcontroller.h")]
-	public static weak Gst.ControlSource object_get_control_source (GLib.Object object, string property_name);
+	public static unowned Gst.ControlSource object_get_control_source (GLib.Object object, string property_name);
 	[CCode (cheader_filename = "gst/controller/gstcontroller.h")]
-	public static weak Gst.Controller object_get_controller (GLib.Object object);
+	public static unowned Gst.Controller object_get_controller (GLib.Object object);
 	[CCode (cheader_filename = "gst/controller/gstcontroller.h")]
 	public static bool object_get_value_array (GLib.Object object, Gst.ClockTime timestamp, Gst.ValueArray value_array);
 	[CCode (cheader_filename = "gst/controller/gstcontroller.h")]

Modified: trunk/vapi/gstreamer-dataprotocol-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-dataprotocol-0.10.vapi	(original)
+++ trunk/vapi/gstreamer-dataprotocol-0.10.vapi	Fri Dec 19 21:56:41 2008
@@ -44,17 +44,17 @@
 	[CCode (cheader_filename = "gst/dataprotocol/dataprotocol.h")]
 	public const int DP_VERSION_MINOR;
 	[CCode (cheader_filename = "gst/dataprotocol/dataprotocol.h")]
-	public static weak Gst.Buffer dp_buffer_from_header (uint header_length, uchar header);
+	public static unowned Gst.Buffer dp_buffer_from_header (uint header_length, uchar header);
 	[CCode (cheader_filename = "gst/dataprotocol/dataprotocol.h")]
-	public static weak Gst.Caps dp_caps_from_packet (uint header_length, uchar header, uchar payload);
+	public static unowned Gst.Caps dp_caps_from_packet (uint header_length, uchar header, uchar payload);
 	[CCode (cheader_filename = "gst/dataprotocol/dataprotocol.h")]
-	public static ushort dp_crc (uchar buffer, uint length);
+	public static uint16 dp_crc (uchar buffer, uint length);
 	[CCode (cheader_filename = "gst/dataprotocol/dataprotocol.h")]
-	public static weak Gst.Event dp_event_from_packet (uint header_length, uchar header, uchar payload);
+	public static unowned Gst.Event dp_event_from_packet (uint header_length, uchar header, uchar payload);
 	[CCode (cheader_filename = "gst/dataprotocol/dataprotocol.h")]
 	public static bool dp_header_from_buffer (Gst.Buffer buffer, Gst.DPHeaderFlag flags, uint length, uchar header);
 	[CCode (cheader_filename = "gst/dataprotocol/dataprotocol.h")]
-	public static uint dp_header_payload_length (uchar header);
+	public static uint32 dp_header_payload_length (uchar header);
 	[CCode (cheader_filename = "gst/dataprotocol/dataprotocol.h")]
 	public static Gst.DPPayloadType dp_header_payload_type (uchar header);
 	[CCode (cheader_filename = "gst/dataprotocol/dataprotocol.h")]

Modified: trunk/vapi/gstreamer-fft-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-fft-0.10.vapi	(original)
+++ trunk/vapi/gstreamer-fft-0.10.vapi	Fri Dec 19 21:56:41 2008
@@ -44,17 +44,17 @@
 		public void* cfg;
 		public bool inverse;
 		public int len;
-		public void fft (short timedata, Gst.FFTS16Complex freqdata);
-		public void inverse_fft (Gst.FFTS16Complex freqdata, short timedata);
+		public void fft (int16 timedata, Gst.FFTS16Complex freqdata);
+		public void inverse_fft (Gst.FFTS16Complex freqdata, int16 timedata);
 		[CCode (has_construct_function = false)]
 		public FFTS16 (int len, bool inverse);
-		public void window (short timedata, Gst.FFTWindow window);
+		public void window (int16 timedata, Gst.FFTWindow window);
 	}
 	[Compact]
 	[CCode (cheader_filename = "gst/fft/gstffts16.h")]
 	public class FFTS16Complex {
-		public short i;
-		public short r;
+		public int16 i;
+		public int16 r;
 	}
 	[Compact]
 	[CCode (cheader_filename = "gst/fft/gstffts32.h")]
@@ -62,17 +62,17 @@
 		public void* cfg;
 		public bool inverse;
 		public int len;
-		public void fft (int timedata, Gst.FFTS32Complex freqdata);
-		public void inverse_fft (Gst.FFTS32Complex freqdata, int timedata);
+		public void fft (int32 timedata, Gst.FFTS32Complex freqdata);
+		public void inverse_fft (Gst.FFTS32Complex freqdata, int32 timedata);
 		[CCode (has_construct_function = false)]
 		public FFTS32 (int len, bool inverse);
-		public void window (int timedata, Gst.FFTWindow window);
+		public void window (int32 timedata, Gst.FFTWindow window);
 	}
 	[Compact]
 	[CCode (cheader_filename = "gst/fft/gstffts32.h")]
 	public class FFTS32Complex {
-		public int i;
-		public int r;
+		public int32 i;
+		public int32 r;
 	}
 	[CCode (cprefix = "GST_FFT_WINDOW_", has_type_id = "0", cheader_filename = "gst/fft/gstfft.h")]
 	public enum FFTWindow {

Modified: trunk/vapi/gstreamer-interfaces-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-interfaces-0.10.vapi	(original)
+++ trunk/vapi/gstreamer-interfaces-0.10.vapi	Fri Dec 19 21:56:41 2008
@@ -12,7 +12,7 @@
 	[CCode (cheader_filename = "gst/interfaces/mixer.h")]
 	public class MixerOptions : Gst.MixerTrack {
 		public weak GLib.List values;
-		public weak GLib.List get_values ();
+		public unowned GLib.List get_values ();
 	}
 	[CCode (cheader_filename = "gst/interfaces/mixer.h")]
 	public class MixerTrack : GLib.Object {
@@ -51,7 +51,7 @@
 	[CCode (cheader_filename = "gst/interfaces/colorbalance.h")]
 	public interface ColorBalance : Gst.ImplementsInterface, Gst.Element {
 		public abstract int get_value (Gst.ColorBalanceChannel channel);
-		public abstract weak GLib.List list_channels ();
+		public abstract unowned GLib.List list_channels ();
 		public abstract void set_value (Gst.ColorBalanceChannel channel, int value);
 		[HasEmitter]
 		public virtual signal void value_changed (Gst.ColorBalanceChannel channel, int value);
@@ -59,14 +59,14 @@
 	[CCode (cheader_filename = "gst/interfaces/mixer.h")]
 	public interface Mixer : Gst.ImplementsInterface, Gst.Element {
 		public abstract Gst.MixerFlags get_mixer_flags ();
-		public abstract weak string get_option (Gst.MixerOptions opts);
+		public abstract unowned string get_option (Gst.MixerOptions opts);
 		public abstract void get_volume (Gst.MixerTrack track, int volumes);
-		public abstract weak GLib.List list_tracks ();
+		public abstract unowned GLib.List list_tracks ();
 		public static Gst.MixerMessageType message_get_type (Gst.Message message);
-		public static void message_parse_mute_toggled (Gst.Message message, out weak Gst.MixerTrack track, bool mute);
-		public static void message_parse_option_changed (Gst.Message message, out weak Gst.MixerOptions options, string value);
-		public static void message_parse_record_toggled (Gst.Message message, out weak Gst.MixerTrack track, bool record);
-		public static void message_parse_volume_changed (Gst.Message message, out weak Gst.MixerTrack track, int volumes, int num_channels);
+		public static void message_parse_mute_toggled (Gst.Message message, out unowned Gst.MixerTrack track, bool mute);
+		public static void message_parse_option_changed (Gst.Message message, out unowned Gst.MixerOptions options, string value);
+		public static void message_parse_record_toggled (Gst.Message message, out unowned Gst.MixerTrack track, bool record);
+		public static void message_parse_volume_changed (Gst.Message message, out unowned Gst.MixerTrack track, int volumes, int num_channels);
 		public abstract void set_mute (Gst.MixerTrack track, bool mute);
 		public abstract void set_option (Gst.MixerOptions opts, string value);
 		public abstract void set_record (Gst.MixerTrack track, bool record);
@@ -88,27 +88,27 @@
 	}
 	[CCode (cheader_filename = "gst/interfaces/propertyprobe.h")]
 	public interface PropertyProbe {
-		public abstract weak GLib.List get_properties ();
-		public weak GLib.ParamSpec get_property (string name);
-		public abstract weak GLib.ValueArray get_values (GLib.ParamSpec pspec);
-		public weak GLib.ValueArray get_values_name (string name);
+		public abstract unowned GLib.List get_properties ();
+		public unowned GLib.ParamSpec get_property (string name);
+		public abstract unowned GLib.ValueArray get_values (GLib.ParamSpec pspec);
+		public unowned GLib.ValueArray get_values_name (string name);
 		public abstract bool needs_probe (GLib.ParamSpec pspec);
 		public bool needs_probe_name (string name);
-		public weak GLib.ValueArray probe_and_get_values (GLib.ParamSpec pspec);
-		public weak GLib.ValueArray probe_and_get_values_name (string name);
+		public unowned GLib.ValueArray probe_and_get_values (GLib.ParamSpec pspec);
+		public unowned GLib.ValueArray probe_and_get_values_name (string name);
 		public abstract void probe_property (GLib.ParamSpec pspec);
 		public void probe_property_name (string name);
 		public virtual signal void probe_needed (void* pspec);
 	}
 	[CCode (cheader_filename = "gst/interfaces/tunerchannel.h")]
 	public interface Tuner : Gst.ImplementsInterface, Gst.Element {
-		public weak Gst.TunerChannel find_channel_by_name (string channel);
-		public weak Gst.TunerNorm find_norm_by_name (string norm);
-		public abstract weak Gst.TunerChannel get_channel ();
+		public unowned Gst.TunerChannel find_channel_by_name (string channel);
+		public unowned Gst.TunerNorm find_norm_by_name (string norm);
+		public abstract unowned Gst.TunerChannel get_channel ();
 		public abstract ulong get_frequency (Gst.TunerChannel channel);
-		public abstract weak Gst.TunerNorm get_norm ();
-		public abstract weak GLib.List list_channels ();
-		public abstract weak GLib.List list_norms ();
+		public abstract unowned Gst.TunerNorm get_norm ();
+		public abstract unowned GLib.List list_channels ();
+		public abstract unowned GLib.List list_norms ();
 		public abstract void set_channel (Gst.TunerChannel channel);
 		public abstract void set_frequency (Gst.TunerChannel channel, ulong frequency);
 		public abstract void set_norm (Gst.TunerNorm norm);

Modified: trunk/vapi/gstreamer-net-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-net-0.10.vapi	(original)
+++ trunk/vapi/gstreamer-net-0.10.vapi	Fri Dec 19 21:56:41 2008
@@ -24,7 +24,7 @@
 		public Gst.ClockTime remote_time;
 		[CCode (has_construct_function = false)]
 		public NetTimePacket (uchar buffer);
-		public static weak Gst.NetTimePacket receive (int fd, void* addr, uint32 len);
+		public static unowned Gst.NetTimePacket receive (int fd, void* addr, uint32 len);
 		public int send (int fd, void* addr, uint32 len);
 		public uchar serialize ();
 	}

Modified: trunk/vapi/gstreamer-pbutils-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-pbutils-0.10.vapi	(original)
+++ trunk/vapi/gstreamer-pbutils-0.10.vapi	Fri Dec 19 21:56:41 2008
@@ -30,7 +30,7 @@
 	[CCode (cheader_filename = "gst/pbutils/pbutils.h")]
 	public static bool install_plugins_installation_in_progress ();
 	[CCode (cheader_filename = "gst/pbutils/pbutils.h")]
-	public static weak string install_plugins_return_get_name (Gst.InstallPluginsReturn ret);
+	public static unowned string install_plugins_return_get_name (Gst.InstallPluginsReturn ret);
 	[CCode (cheader_filename = "gst/pbutils/pbutils.h")]
 	public static bool install_plugins_supported ();
 	[CCode (cheader_filename = "gst/pbutils/pbutils.h")]
@@ -38,43 +38,43 @@
 	[CCode (cheader_filename = "gst/pbutils/pbutils.h")]
 	public static bool is_missing_plugin_message (Gst.Message msg);
 	[CCode (cheader_filename = "gst/pbutils/pbutils.h")]
-	public static weak string missing_decoder_installer_detail_new (Gst.Caps decode_caps);
+	public static unowned string missing_decoder_installer_detail_new (Gst.Caps decode_caps);
 	[CCode (cheader_filename = "gst/pbutils/pbutils.h")]
-	public static weak Gst.Message missing_decoder_message_new (Gst.Element element, Gst.Caps decode_caps);
+	public static unowned Gst.Message missing_decoder_message_new (Gst.Element element, Gst.Caps decode_caps);
 	[CCode (cheader_filename = "gst/pbutils/pbutils.h")]
-	public static weak string missing_element_installer_detail_new (string factory_name);
+	public static unowned string missing_element_installer_detail_new (string factory_name);
 	[CCode (cheader_filename = "gst/pbutils/pbutils.h")]
-	public static weak Gst.Message missing_element_message_new (Gst.Element element, string factory_name);
+	public static unowned Gst.Message missing_element_message_new (Gst.Element element, string factory_name);
 	[CCode (cheader_filename = "gst/pbutils/pbutils.h")]
-	public static weak string missing_encoder_installer_detail_new (Gst.Caps encode_caps);
+	public static unowned string missing_encoder_installer_detail_new (Gst.Caps encode_caps);
 	[CCode (cheader_filename = "gst/pbutils/pbutils.h")]
-	public static weak Gst.Message missing_encoder_message_new (Gst.Element element, Gst.Caps encode_caps);
+	public static unowned Gst.Message missing_encoder_message_new (Gst.Element element, Gst.Caps encode_caps);
 	[CCode (cheader_filename = "gst/pbutils/pbutils.h")]
-	public static weak string missing_plugin_message_get_description (Gst.Message msg);
+	public static unowned string missing_plugin_message_get_description (Gst.Message msg);
 	[CCode (cheader_filename = "gst/pbutils/pbutils.h")]
-	public static weak string missing_plugin_message_get_installer_detail (Gst.Message msg);
+	public static unowned string missing_plugin_message_get_installer_detail (Gst.Message msg);
 	[CCode (cheader_filename = "gst/pbutils/pbutils.h")]
-	public static weak string missing_uri_sink_installer_detail_new (string protocol);
+	public static unowned string missing_uri_sink_installer_detail_new (string protocol);
 	[CCode (cheader_filename = "gst/pbutils/pbutils.h")]
-	public static weak Gst.Message missing_uri_sink_message_new (Gst.Element element, string protocol);
+	public static unowned Gst.Message missing_uri_sink_message_new (Gst.Element element, string protocol);
 	[CCode (cheader_filename = "gst/pbutils/pbutils.h")]
-	public static weak string missing_uri_source_installer_detail_new (string protocol);
+	public static unowned string missing_uri_source_installer_detail_new (string protocol);
 	[CCode (cheader_filename = "gst/pbutils/pbutils.h")]
-	public static weak Gst.Message missing_uri_source_message_new (Gst.Element element, string protocol);
+	public static unowned Gst.Message missing_uri_source_message_new (Gst.Element element, string protocol);
 	[CCode (cheader_filename = "gst/pbutils/pbutils.h")]
 	public static bool pb_utils_add_codec_description_to_tag_list (Gst.TagList taglist, string codec_tag, Gst.Caps caps);
 	[CCode (cheader_filename = "gst/pbutils/pbutils.h")]
-	public static weak string pb_utils_get_codec_description (Gst.Caps caps);
+	public static unowned string pb_utils_get_codec_description (Gst.Caps caps);
 	[CCode (cheader_filename = "gst/pbutils/pbutils.h")]
-	public static weak string pb_utils_get_decoder_description (Gst.Caps caps);
+	public static unowned string pb_utils_get_decoder_description (Gst.Caps caps);
 	[CCode (cheader_filename = "gst/pbutils/pbutils.h")]
-	public static weak string pb_utils_get_element_description (string factory_name);
+	public static unowned string pb_utils_get_element_description (string factory_name);
 	[CCode (cheader_filename = "gst/pbutils/pbutils.h")]
-	public static weak string pb_utils_get_encoder_description (Gst.Caps caps);
+	public static unowned string pb_utils_get_encoder_description (Gst.Caps caps);
 	[CCode (cheader_filename = "gst/pbutils/pbutils.h")]
-	public static weak string pb_utils_get_sink_description (string protocol);
+	public static unowned string pb_utils_get_sink_description (string protocol);
 	[CCode (cheader_filename = "gst/pbutils/pbutils.h")]
-	public static weak string pb_utils_get_source_description (string protocol);
+	public static unowned string pb_utils_get_source_description (string protocol);
 	[CCode (cheader_filename = "gst/pbutils/pbutils.h")]
 	public static void pb_utils_init ();
 }

Modified: trunk/vapi/gstreamer-riff-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-riff-0.10.vapi	(original)
+++ trunk/vapi/gstreamer-riff-0.10.vapi	Fri Dec 19 21:56:41 2008
@@ -5,68 +5,68 @@
 	[Compact]
 	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public class gst_riff_dmlh {
-		public uint totalframes;
+		public uint32 totalframes;
 	}
 	[Compact]
 	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public class gst_riff_index_entry {
-		public uint flags;
-		public uint id;
-		public uint offset;
-		public uint size;
+		public uint32 flags;
+		public uint32 id;
+		public uint32 offset;
+		public uint32 size;
 	}
 	[Compact]
 	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public class gst_riff_strf_auds {
-		public uint av_bps;
-		public ushort blockalign;
-		public ushort channels;
-		public ushort format;
-		public uint rate;
-		public ushort size;
+		public uint32 av_bps;
+		public uint16 blockalign;
+		public uint16 channels;
+		public uint16 format;
+		public uint32 rate;
+		public uint16 size;
 	}
 	[Compact]
 	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public class gst_riff_strf_iavs {
-		public uint DVAAuxCtl;
-		public uint DVAAuxCtl1;
-		public uint DVAAuxSrc;
-		public uint DVAAuxSrc1;
-		public uint DVReserved1;
-		public uint DVReserved2;
-		public uint DVVAuxCtl;
-		public uint DVVAuxSrc;
+		public uint32 DVAAuxCtl;
+		public uint32 DVAAuxCtl1;
+		public uint32 DVAAuxSrc;
+		public uint32 DVAAuxSrc1;
+		public uint32 DVReserved1;
+		public uint32 DVReserved2;
+		public uint32 DVVAuxCtl;
+		public uint32 DVVAuxSrc;
 	}
 	[Compact]
 	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public class gst_riff_strf_vids {
-		public ushort bit_cnt;
-		public uint compression;
-		public uint height;
-		public uint image_size;
-		public uint imp_colors;
-		public uint num_colors;
-		public ushort planes;
-		public uint size;
-		public uint width;
-		public uint xpels_meter;
-		public uint ypels_meter;
+		public uint16 bit_cnt;
+		public uint32 compression;
+		public uint32 height;
+		public uint32 image_size;
+		public uint32 imp_colors;
+		public uint32 num_colors;
+		public uint16 planes;
+		public uint32 size;
+		public uint32 width;
+		public uint32 xpels_meter;
+		public uint32 ypels_meter;
 	}
 	[Compact]
 	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public class gst_riff_strh {
-		public uint bufsize;
-		public uint fcc_handler;
-		public uint flags;
-		public uint init_frames;
-		public uint length;
-		public uint priority;
-		public uint quality;
-		public uint rate;
-		public uint samplesize;
-		public uint scale;
-		public uint start;
-		public uint type;
+		public uint32 bufsize;
+		public uint32 fcc_handler;
+		public uint32 flags;
+		public uint32 init_frames;
+		public uint32 length;
+		public uint32 priority;
+		public uint32 quality;
+		public uint32 rate;
+		public uint32 samplesize;
+		public uint32 scale;
+		public uint32 start;
+		public uint32 type;
 	}
 	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_IBM_FORMAT_ADPCM;
@@ -365,33 +365,33 @@
 	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_ZYXEL_ADPCM;
 	[CCode (cheader_filename = "gst/riff/riff-media.h")]
-	public static weak Gst.Caps riff_create_audio_caps (ushort codec_id, Gst.gst_riff_strh strh, Gst.gst_riff_strf_auds strf, Gst.Buffer strf_data, Gst.Buffer strd_data, out weak string codec_name);
+	public static unowned Gst.Caps riff_create_audio_caps (uint16 codec_id, Gst.gst_riff_strh strh, Gst.gst_riff_strf_auds strf, Gst.Buffer strf_data, Gst.Buffer strd_data, out unowned string codec_name);
 	[CCode (cheader_filename = "gst/riff/riff-media.h")]
-	public static weak Gst.Caps riff_create_audio_template_caps ();
+	public static unowned Gst.Caps riff_create_audio_template_caps ();
 	[CCode (cheader_filename = "gst/riff/riff-media.h")]
-	public static weak Gst.Caps riff_create_iavs_caps (uint codec_fcc, Gst.gst_riff_strh strh, Gst.gst_riff_strf_iavs strf, Gst.Buffer strf_data, Gst.Buffer strd_data, out weak string codec_name);
+	public static unowned Gst.Caps riff_create_iavs_caps (uint32 codec_fcc, Gst.gst_riff_strh strh, Gst.gst_riff_strf_iavs strf, Gst.Buffer strf_data, Gst.Buffer strd_data, out unowned string codec_name);
 	[CCode (cheader_filename = "gst/riff/riff-media.h")]
-	public static weak Gst.Caps riff_create_iavs_template_caps ();
+	public static unowned Gst.Caps riff_create_iavs_template_caps ();
 	[CCode (cheader_filename = "gst/riff/riff-media.h")]
-	public static weak Gst.Caps riff_create_video_caps (uint codec_fcc, Gst.gst_riff_strh strh, Gst.gst_riff_strf_vids strf, Gst.Buffer strf_data, Gst.Buffer strd_data, out weak string codec_name);
+	public static unowned Gst.Caps riff_create_video_caps (uint32 codec_fcc, Gst.gst_riff_strh strh, Gst.gst_riff_strf_vids strf, Gst.Buffer strf_data, Gst.Buffer strd_data, out unowned string codec_name);
 	[CCode (cheader_filename = "gst/riff/riff-media.h")]
-	public static weak Gst.Caps riff_create_video_template_caps ();
+	public static unowned Gst.Caps riff_create_video_template_caps ();
 	[CCode (cheader_filename = "gst/riff/riff-read.h")]
 	public static void riff_init ();
 	[CCode (cheader_filename = "gst/riff/riff-read.h")]
-	public static bool riff_parse_chunk (Gst.Element element, Gst.Buffer buf, uint offset, uint fourcc, out weak Gst.Buffer chunk_data);
+	public static bool riff_parse_chunk (Gst.Element element, Gst.Buffer buf, uint offset, uint32 fourcc, out unowned Gst.Buffer chunk_data);
 	[CCode (cheader_filename = "gst/riff/riff-read.h")]
-	public static bool riff_parse_file_header (Gst.Element element, Gst.Buffer buf, uint doctype);
+	public static bool riff_parse_file_header (Gst.Element element, Gst.Buffer buf, uint32 doctype);
 	[CCode (cheader_filename = "gst/riff/riff-read.h")]
-	public static void riff_parse_info (Gst.Element element, Gst.Buffer buf, out weak Gst.TagList taglist);
+	public static void riff_parse_info (Gst.Element element, Gst.Buffer buf, out unowned Gst.TagList taglist);
 	[CCode (cheader_filename = "gst/riff/riff-read.h")]
-	public static bool riff_parse_strf_auds (Gst.Element element, Gst.Buffer buf, out weak Gst.gst_riff_strf_auds strf, out weak Gst.Buffer data);
+	public static bool riff_parse_strf_auds (Gst.Element element, Gst.Buffer buf, out unowned Gst.gst_riff_strf_auds strf, out unowned Gst.Buffer data);
 	[CCode (cheader_filename = "gst/riff/riff-read.h")]
-	public static bool riff_parse_strf_iavs (Gst.Element element, Gst.Buffer buf, out weak Gst.gst_riff_strf_iavs strf, out weak Gst.Buffer data);
+	public static bool riff_parse_strf_iavs (Gst.Element element, Gst.Buffer buf, out unowned Gst.gst_riff_strf_iavs strf, out unowned Gst.Buffer data);
 	[CCode (cheader_filename = "gst/riff/riff-read.h")]
-	public static bool riff_parse_strf_vids (Gst.Element element, Gst.Buffer buf, out weak Gst.gst_riff_strf_vids strf, out weak Gst.Buffer data);
+	public static bool riff_parse_strf_vids (Gst.Element element, Gst.Buffer buf, out unowned Gst.gst_riff_strf_vids strf, out unowned Gst.Buffer data);
 	[CCode (cheader_filename = "gst/riff/riff-read.h")]
-	public static bool riff_parse_strh (Gst.Element element, Gst.Buffer buf, out weak Gst.gst_riff_strh strh);
+	public static bool riff_parse_strh (Gst.Element element, Gst.Buffer buf, out unowned Gst.gst_riff_strh strh);
 	[CCode (cheader_filename = "gst/riff/riff-read.h")]
-	public static Gst.FlowReturn riff_read_chunk (Gst.Element element, Gst.Pad pad, uint64 offset, uint tag, out weak Gst.Buffer chunk_data);
+	public static Gst.FlowReturn riff_read_chunk (Gst.Element element, Gst.Pad pad, uint64 offset, uint32 tag, out unowned Gst.Buffer chunk_data);
 }

Modified: trunk/vapi/gstreamer-rtp-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-rtp-0.10.vapi	(original)
+++ trunk/vapi/gstreamer-rtp-0.10.vapi	Fri Dec 19 21:56:41 2008
@@ -8,7 +8,7 @@
 		public int frame_duration;
 		public int frame_size;
 		public int sample_size;
-		public weak Gst.Adapter get_adapter ();
+		public unowned Gst.Adapter get_adapter ();
 		public Gst.FlowReturn push (uchar data, uint payload_len, Gst.ClockTime timestamp);
 		public void set_frame_based ();
 		public void set_frame_options (int frame_duration, int frame_size);
@@ -20,7 +20,7 @@
 		public uint clock_rate;
 		public bool need_newsegment;
 		public weak GLib.Queue queue;
-		public GLib.StaticRecMutex queuelock;
+		public void* queuelock;
 		public weak Gst.Segment segment;
 		public weak Gst.Pad sinkpad;
 		public weak Gst.Pad srcpad;
@@ -29,34 +29,34 @@
 		[NoWrapper]
 		public virtual Gst.FlowReturn add_to_queue (Gst.Buffer @in);
 		[NoWrapper]
-		public virtual weak Gst.Buffer process (Gst.Buffer @in);
+		public virtual unowned Gst.Buffer process (Gst.Buffer @in);
 		public Gst.FlowReturn push (Gst.Buffer out_buf);
-		public Gst.FlowReturn push_ts (uint timestamp, Gst.Buffer out_buf);
+		public Gst.FlowReturn push_ts (uint32 timestamp, Gst.Buffer out_buf);
 		[NoWrapper]
 		public virtual bool set_caps (Gst.Caps caps);
 		[NoWrapper]
-		public virtual void set_gst_timestamp (uint timestamp, Gst.Buffer buf);
+		public virtual void set_gst_timestamp (uint32 timestamp, Gst.Buffer buf);
 		[NoAccessorMethod]
 		public uint queue_delay { get; set; }
 	}
 	[CCode (cheader_filename = "gst/rtp/gstbasertpaudiopayload.h")]
 	public class BaseRTPPayload : Gst.Element {
-		public uint clock_rate;
+		public uint32 clock_rate;
 		public uint current_ssrc;
 		public bool dynamic;
 		public weak string encoding_name;
 		public weak string media;
 		public weak Gst.Segment segment;
 		public weak GLib.Rand seq_rand;
-		public ushort seqnum_base;
+		public uint16 seqnum_base;
 		public weak Gst.Pad sinkpad;
 		public weak Gst.Pad srcpad;
 		public weak GLib.Rand ssrc_rand;
-		public uint ts_base;
-		public int ts_offset;
+		public uint32 ts_base;
+		public int32 ts_offset;
 		public weak GLib.Rand ts_rand;
 		[NoWrapper]
-		public virtual weak Gst.Caps get_caps (Gst.Pad pad);
+		public virtual unowned Gst.Caps get_caps (Gst.Pad pad);
 		[NoWrapper]
 		public virtual Gst.FlowReturn handle_buffer (Gst.Buffer buffer);
 		[NoWrapper]
@@ -68,7 +68,7 @@
 		[NoWrapper]
 		public virtual bool set_caps (Gst.Caps caps);
 		[CCode (cname = "gst_basertppayload_set_options")]
-		public void set_options (string media, bool dynamic, string encoding_name, uint clock_rate);
+		public void set_options (string media, bool dynamic, string encoding_name, uint32 clock_rate);
 		[CCode (cname = "gst_basertppayload_set_outcaps")]
 		public bool set_outcaps (string fieldname);
 		[NoAccessorMethod]
@@ -98,40 +98,40 @@
 		public uint entry_offset;
 		public uint item_count;
 		public uint item_offset;
-		public ushort length;
+		public uint16 length;
 		public uint offset;
 		public bool padding;
 		public Gst.RTCPType type;
-		public bool add_rb (uint ssrc, uchar fractionlost, int packetslost, uint exthighestseq, uint jitter, uint lsr, uint dlsr);
-		public bool bye_add_ssrc (uint ssrc);
-		public bool bye_add_ssrcs (uint ssrc, uint len);
-		public uint bye_get_nth_ssrc (uint nth);
-		public weak string bye_get_reason ();
+		public bool add_rb (uint32 ssrc, uchar fractionlost, int32 packetslost, uint32 exthighestseq, uint32 jitter, uint32 lsr, uint32 dlsr);
+		public bool bye_add_ssrc (uint32 ssrc);
+		public bool bye_add_ssrcs (uint32 ssrc, uint len);
+		public uint32 bye_get_nth_ssrc (uint nth);
+		public unowned string bye_get_reason ();
 		public uchar bye_get_reason_len ();
 		public uint bye_get_ssrc_count ();
 		public bool bye_set_reason (string reason);
 		public uchar get_count ();
-		public ushort get_length ();
+		public uint16 get_length ();
 		public bool get_padding ();
-		public void get_rb (uint nth, uint ssrc, uchar fractionlost, int packetslost, uint exthighestseq, uint jitter, uint lsr, uint dlsr);
+		public void get_rb (uint nth, uint32 ssrc, uchar fractionlost, int32 packetslost, uint32 exthighestseq, uint32 jitter, uint32 lsr, uint32 dlsr);
 		public uint get_rb_count ();
 		public bool move_to_next ();
 		public void remove ();
-		public uint rr_get_ssrc ();
-		public void rr_set_ssrc (uint ssrc);
+		public uint32 rr_get_ssrc ();
+		public void rr_set_ssrc (uint32 ssrc);
 		public bool sdes_add_entry (Gst.RTCPSDESType type, uchar len, uchar data);
-		public bool sdes_add_item (uint ssrc);
+		public bool sdes_add_item (uint32 ssrc);
 		public bool sdes_copy_entry (Gst.RTCPSDESType type, uchar len, uchar data);
 		public bool sdes_first_entry ();
 		public bool sdes_first_item ();
 		public bool sdes_get_entry (Gst.RTCPSDESType type, uchar len, uchar data);
 		public uint sdes_get_item_count ();
-		public uint sdes_get_ssrc ();
+		public uint32 sdes_get_ssrc ();
 		public bool sdes_next_entry ();
 		public bool sdes_next_item ();
-		public void set_rb (uint nth, uint ssrc, uchar fractionlost, int packetslost, uint exthighestseq, uint jitter, uint lsr, uint dlsr);
-		public void sr_get_sender_info (uint ssrc, uint64 ntptime, uint rtptime, uint packet_count, uint octet_count);
-		public void sr_set_sender_info (uint ssrc, uint64 ntptime, uint rtptime, uint packet_count, uint octet_count);
+		public void set_rb (uint nth, uint32 ssrc, uchar fractionlost, int32 packetslost, uint32 exthighestseq, uint32 jitter, uint32 lsr, uint32 dlsr);
+		public void sr_get_sender_info (uint32 ssrc, uint64 ntptime, uint32 rtptime, uint32 packet_count, uint32 octet_count);
+		public void sr_set_sender_info (uint32 ssrc, uint64 ntptime, uint32 rtptime, uint32 packet_count, uint32 octet_count);
 	}
 	[Compact]
 	[CCode (cheader_filename = "gst/rtp/gstrtppayloads.h")]
@@ -142,8 +142,8 @@
 		public weak string encoding_parameters;
 		public weak string media;
 		public uchar payload_type;
-		public static weak Gst.RTPPayloadInfo for_name (string media, string encoding_name);
-		public static weak Gst.RTPPayloadInfo for_pt (uchar payload_type);
+		public static unowned Gst.RTPPayloadInfo for_name (string media, string encoding_name);
+		public static unowned Gst.RTPPayloadInfo for_pt (uchar payload_type);
 	}
 	[CCode (cprefix = "GST_RTCP_SDES_", has_type_id = "0", cheader_filename = "gst/rtp/gstrtcpbuffer.h")]
 	public enum RTCPSDESType {
@@ -291,11 +291,11 @@
 	[CCode (cheader_filename = "gst/gst.h")]
 	public static uint rtcp_buffer_get_packet_count (Gst.Buffer buffer);
 	[CCode (cheader_filename = "gst/gst.h")]
-	public static weak Gst.Buffer rtcp_buffer_new (uint mtu);
+	public static unowned Gst.Buffer rtcp_buffer_new (uint mtu);
 	[CCode (cheader_filename = "gst/gst.h")]
-	public static weak Gst.Buffer rtcp_buffer_new_copy_data (void* data, uint len);
+	public static unowned Gst.Buffer rtcp_buffer_new_copy_data (void* data, uint len);
 	[CCode (cheader_filename = "gst/gst.h")]
-	public static weak Gst.Buffer rtcp_buffer_new_take_data (void* data, uint len);
+	public static unowned Gst.Buffer rtcp_buffer_new_take_data (void* data, uint len);
 	[CCode (cheader_filename = "gst/rtp/gstrtcpbuffer.h")]
 	public static bool rtcp_buffer_validate (Gst.Buffer buffer);
 	[CCode (cheader_filename = "gst/rtp/gstrtcpbuffer.h")]
@@ -313,19 +313,19 @@
 	[CCode (cheader_filename = "gst/rtp/gstrtpbuffer.h")]
 	public static uint rtp_buffer_calc_payload_len (uint packet_len, uchar pad_len, uchar csrc_count);
 	[CCode (cheader_filename = "gst/rtp/gstrtpbuffer.h")]
-	public static int rtp_buffer_compare_seqnum (ushort seqnum1, ushort seqnum2);
+	public static int rtp_buffer_compare_seqnum (uint16 seqnum1, uint16 seqnum2);
 	[CCode (cheader_filename = "gst/rtp/gstrtpbuffer.h")]
-	public static uint rtp_buffer_default_clock_rate (uchar payload_type);
+	public static uint32 rtp_buffer_default_clock_rate (uchar payload_type);
 	[CCode (cheader_filename = "gst/rtp/gstrtpbuffer.h")]
-	public static uint64 rtp_buffer_ext_timestamp (uint64 exttimestamp, uint timestamp);
+	public static uint64 rtp_buffer_ext_timestamp (uint64 exttimestamp, uint32 timestamp);
 	[CCode (cheader_filename = "gst/rtp/gstrtpbuffer.h")]
-	public static uint rtp_buffer_get_csrc (Gst.Buffer buffer, uchar idx);
+	public static uint32 rtp_buffer_get_csrc (Gst.Buffer buffer, uchar idx);
 	[CCode (cheader_filename = "gst/rtp/gstrtpbuffer.h")]
 	public static uchar rtp_buffer_get_csrc_count (Gst.Buffer buffer);
 	[CCode (cheader_filename = "gst/rtp/gstrtpbuffer.h")]
 	public static bool rtp_buffer_get_extension (Gst.Buffer buffer);
 	[CCode (cheader_filename = "gst/rtp/gstrtpbuffer.h")]
-	public static bool rtp_buffer_get_extension_data (Gst.Buffer buffer, ushort bits, void* data, uint wordlen);
+	public static bool rtp_buffer_get_extension_data (Gst.Buffer buffer, uint16 bits, void* data, uint wordlen);
 	[CCode (cheader_filename = "gst/rtp/gstrtpbuffer.h")]
 	public static uint rtp_buffer_get_header_len (Gst.Buffer buffer);
 	[CCode (cheader_filename = "gst/rtp/gstrtpbuffer.h")]
@@ -337,33 +337,33 @@
 	[CCode (cheader_filename = "gst/rtp/gstrtpbuffer.h")]
 	public static void* rtp_buffer_get_payload (Gst.Buffer buffer);
 	[CCode (cheader_filename = "gst/rtp/gstrtpbuffer.h")]
-	public static weak Gst.Buffer rtp_buffer_get_payload_buffer (Gst.Buffer buffer);
+	public static unowned Gst.Buffer rtp_buffer_get_payload_buffer (Gst.Buffer buffer);
 	[CCode (cheader_filename = "gst/rtp/gstrtpbuffer.h")]
 	public static uint rtp_buffer_get_payload_len (Gst.Buffer buffer);
 	[CCode (cheader_filename = "gst/rtp/gstrtpbuffer.h")]
-	public static weak Gst.Buffer rtp_buffer_get_payload_subbuffer (Gst.Buffer buffer, uint offset, uint len);
+	public static unowned Gst.Buffer rtp_buffer_get_payload_subbuffer (Gst.Buffer buffer, uint offset, uint len);
 	[CCode (cheader_filename = "gst/rtp/gstrtpbuffer.h")]
 	public static uchar rtp_buffer_get_payload_type (Gst.Buffer buffer);
 	[CCode (cheader_filename = "gst/rtp/gstrtpbuffer.h")]
-	public static ushort rtp_buffer_get_seq (Gst.Buffer buffer);
+	public static uint16 rtp_buffer_get_seq (Gst.Buffer buffer);
 	[CCode (cheader_filename = "gst/rtp/gstrtpbuffer.h")]
-	public static uint rtp_buffer_get_ssrc (Gst.Buffer buffer);
+	public static uint32 rtp_buffer_get_ssrc (Gst.Buffer buffer);
 	[CCode (cheader_filename = "gst/rtp/gstrtpbuffer.h")]
-	public static uint rtp_buffer_get_timestamp (Gst.Buffer buffer);
+	public static uint32 rtp_buffer_get_timestamp (Gst.Buffer buffer);
 	[CCode (cheader_filename = "gst/rtp/gstrtpbuffer.h")]
 	public static uchar rtp_buffer_get_version (Gst.Buffer buffer);
 	[CCode (cheader_filename = "gst/rtp/gstrtpbuffer.h")]
-	public static weak Gst.Buffer rtp_buffer_new_allocate (uint payload_len, uchar pad_len, uchar csrc_count);
+	public static unowned Gst.Buffer rtp_buffer_new_allocate (uint payload_len, uchar pad_len, uchar csrc_count);
 	[CCode (cheader_filename = "gst/rtp/gstrtpbuffer.h")]
-	public static weak Gst.Buffer rtp_buffer_new_allocate_len (uint packet_len, uchar pad_len, uchar csrc_count);
+	public static unowned Gst.Buffer rtp_buffer_new_allocate_len (uint packet_len, uchar pad_len, uchar csrc_count);
 	[CCode (cheader_filename = "gst/rtp/gstrtpbuffer.h")]
-	public static weak Gst.Buffer rtp_buffer_new_copy_data (void* data, uint len);
+	public static unowned Gst.Buffer rtp_buffer_new_copy_data (void* data, uint len);
 	[CCode (cheader_filename = "gst/rtp/gstrtpbuffer.h")]
-	public static weak Gst.Buffer rtp_buffer_new_take_data (void* data, uint len);
+	public static unowned Gst.Buffer rtp_buffer_new_take_data (void* data, uint len);
 	[CCode (cheader_filename = "gst/rtp/gstrtpbuffer.h")]
 	public static void rtp_buffer_pad_to (Gst.Buffer buffer, uint len);
 	[CCode (cheader_filename = "gst/rtp/gstrtpbuffer.h")]
-	public static void rtp_buffer_set_csrc (Gst.Buffer buffer, uchar idx, uint csrc);
+	public static void rtp_buffer_set_csrc (Gst.Buffer buffer, uchar idx, uint32 csrc);
 	[CCode (cheader_filename = "gst/rtp/gstrtpbuffer.h")]
 	public static void rtp_buffer_set_extension (Gst.Buffer buffer, bool extension);
 	[CCode (cheader_filename = "gst/rtp/gstrtpbuffer.h")]
@@ -375,11 +375,11 @@
 	[CCode (cheader_filename = "gst/rtp/gstrtpbuffer.h")]
 	public static void rtp_buffer_set_payload_type (Gst.Buffer buffer, uchar payload_type);
 	[CCode (cheader_filename = "gst/rtp/gstrtpbuffer.h")]
-	public static void rtp_buffer_set_seq (Gst.Buffer buffer, ushort seq);
+	public static void rtp_buffer_set_seq (Gst.Buffer buffer, uint16 seq);
 	[CCode (cheader_filename = "gst/rtp/gstrtpbuffer.h")]
-	public static void rtp_buffer_set_ssrc (Gst.Buffer buffer, uint ssrc);
+	public static void rtp_buffer_set_ssrc (Gst.Buffer buffer, uint32 ssrc);
 	[CCode (cheader_filename = "gst/rtp/gstrtpbuffer.h")]
-	public static void rtp_buffer_set_timestamp (Gst.Buffer buffer, uint timestamp);
+	public static void rtp_buffer_set_timestamp (Gst.Buffer buffer, uint32 timestamp);
 	[CCode (cheader_filename = "gst/rtp/gstrtpbuffer.h")]
 	public static void rtp_buffer_set_version (Gst.Buffer buffer, uchar version);
 	[CCode (cheader_filename = "gst/rtp/gstrtpbuffer.h")]

Modified: trunk/vapi/gstreamer-rtsp-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-rtsp-0.10.vapi	(original)
+++ trunk/vapi/gstreamer-rtsp-0.10.vapi	Fri Dec 19 21:56:41 2008
@@ -10,7 +10,7 @@
 		public Gst.RTSPResult connect (GLib.TimeVal timeout);
 		public static Gst.RTSPResult create (Gst.RTSPUrl url, out Gst.RTSPConnection conn);
 		public Gst.RTSPResult flush (bool flush);
-		public weak string get_ip ();
+		public unowned string get_ip ();
 		public Gst.RTSPResult next_timeout (GLib.TimeVal timeout);
 		public Gst.RTSPResult poll (Gst.RTSPEvent events, Gst.RTSPEvent revents, GLib.TimeVal timeout);
 		public Gst.RTSPResult read (uchar data, uint size, GLib.TimeVal timeout);
@@ -33,8 +33,8 @@
 		public Gst.RTSPResult add_header (Gst.RTSPHeaderField field, string value);
 		public Gst.RTSPResult append_headers (GLib.StringBuilder str);
 		public Gst.RTSPResult dump ();
-		public Gst.RTSPResult get_body (out weak uchar[] data, uint size);
-		public Gst.RTSPResult get_header (Gst.RTSPHeaderField field, out weak string value, int indx);
+		public Gst.RTSPResult get_body (out unowned uchar[] data, uint size);
+		public Gst.RTSPResult get_header (Gst.RTSPHeaderField field, out unowned string value, int indx);
 		public Gst.RTSPResult init ();
 		public Gst.RTSPResult init_data (uchar channel);
 		public Gst.RTSPResult init_request (Gst.RTSPMethod method, string uri);
@@ -49,7 +49,7 @@
 		public Gst.RTSPResult remove_header (Gst.RTSPHeaderField field, int indx);
 		public Gst.RTSPResult set_body (uchar[] data, uint size);
 		public Gst.RTSPResult steal_body (out uchar[] data, uint size);
-		public Gst.RTSPResult take_body (uchar[]# data, uint size);
+		public Gst.RTSPResult take_body (owned uchar[] data, uint size);
 		public Gst.RTSPResult unset ();
 	}
 	[Compact]
@@ -104,14 +104,14 @@
 		public Gst.RTSPFamily family;
 		public string host;
 		public string passwd;
-		public ushort port;
+		public uint16 port;
 		public string query;
 		public Gst.RTSPLowerTrans transports;
 		public string user;
-		public Gst.RTSPResult get_port (ushort port);
+		public Gst.RTSPResult get_port (uint16 port);
 		public string get_request_uri ();
 		public static Gst.RTSPResult parse (string urlstr, out Gst.RTSPUrl url);
-		public Gst.RTSPResult set_port (ushort port);
+		public Gst.RTSPResult set_port (uint16 port);
 	}
 	[CCode (cheader_filename = "gst/rtsp/gstrtspextension.h")]
 	public interface RTSPExtension {
@@ -343,19 +343,19 @@
 	[CCode (cheader_filename = "gst/rtsp/gstrtspbase64.h")]
 	public static void rtsp_base64_decode_ip (string data, size_t len);
 	[CCode (cheader_filename = "gst/rtsp/gstrtspbase64.h")]
-	public static weak string rtsp_base64_encode (string data, size_t len);
+	public static unowned string rtsp_base64_encode (string data, size_t len);
 	[CCode (cheader_filename = "gst/rtsp/gstrtspdefs.h")]
 	public static Gst.RTSPHeaderField rtsp_find_header_field (string header);
 	[CCode (cheader_filename = "gst/rtsp/gstrtspdefs.h")]
 	public static Gst.RTSPMethod rtsp_find_method (string method);
 	[CCode (cheader_filename = "gst/rtsp/gstrtspdefs.h")]
-	public static weak string rtsp_header_as_text (Gst.RTSPHeaderField field);
+	public static unowned string rtsp_header_as_text (Gst.RTSPHeaderField field);
 	[CCode (cheader_filename = "gst/rtsp/gstrtspdefs.h")]
-	public static weak string rtsp_method_as_text (Gst.RTSPMethod method);
+	public static unowned string rtsp_method_as_text (Gst.RTSPMethod method);
 	[CCode (cheader_filename = "gst/rtsp/gstrtspdefs.h")]
-	public static weak string rtsp_status_as_text (Gst.RTSPStatusCode code);
+	public static unowned string rtsp_status_as_text (Gst.RTSPStatusCode code);
 	[CCode (cheader_filename = "gst/rtsp/gstrtspdefs.h")]
-	public static weak string rtsp_strresult (Gst.RTSPResult _result);
+	public static unowned string rtsp_strresult (Gst.RTSPResult _result);
 	[CCode (cheader_filename = "gst/rtsp/gstrtspdefs.h")]
-	public static weak string rtsp_version_as_text (Gst.RTSPVersion version);
+	public static unowned string rtsp_version_as_text (Gst.RTSPVersion version);
 }

Modified: trunk/vapi/gstreamer-sdp-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-sdp-0.10.vapi	(original)
+++ trunk/vapi/gstreamer-sdp-0.10.vapi	Fri Dec 19 21:56:41 2008
@@ -46,26 +46,26 @@
 		public Gst.SDPResult add_bandwidth (string bwtype, uint bandwidth);
 		public Gst.SDPResult add_connection (string nettype, string addrtype, string address, uint ttl, uint addr_number);
 		public Gst.SDPResult add_format (string format);
-		public weak string as_text ();
+		public unowned string as_text ();
 		public uint attributes_len ();
 		public uint bandwidths_len ();
 		public uint connections_len ();
 		public uint formats_len ();
-		public weak Gst.SDPAttribute get_attribute (uint idx);
-		public weak string get_attribute_val (string key);
-		public weak string get_attribute_val_n (string key, uint nth);
-		public weak Gst.SDPBandwidth get_bandwidth (uint idx);
-		public weak Gst.SDPConnection get_connection (uint idx);
-		public weak string get_format (uint idx);
-		public weak string get_information ();
-		public weak Gst.SDPKey get_key ();
-		public weak string get_media ();
+		public unowned Gst.SDPAttribute get_attribute (uint idx);
+		public unowned string get_attribute_val (string key);
+		public unowned string get_attribute_val_n (string key, uint nth);
+		public unowned Gst.SDPBandwidth get_bandwidth (uint idx);
+		public unowned Gst.SDPConnection get_connection (uint idx);
+		public unowned string get_format (uint idx);
+		public unowned string get_information ();
+		public unowned Gst.SDPKey get_key ();
+		public unowned string get_media ();
 		public uint get_num_ports ();
 		public uint get_port ();
-		public weak string get_proto ();
+		public unowned string get_proto ();
 		public Gst.SDPResult init ();
 		[CCode (type = "GstSDPResult", has_construct_function = false)]
-		public SDPMedia (out weak Gst.SDPMedia media);
+		public SDPMedia (out unowned Gst.SDPMedia media);
 		public Gst.SDPResult set_information (string information);
 		public Gst.SDPResult set_key (string type, string data);
 		public Gst.SDPResult set_media (string med);
@@ -97,31 +97,31 @@
 		public Gst.SDPResult add_phone (string phone);
 		public Gst.SDPResult add_time (string start, string stop, string repeat);
 		public Gst.SDPResult add_zone (string adj_time, string typed_time);
-		public weak string as_text ();
+		public unowned string as_text ();
 		public uint attributes_len ();
 		public uint bandwidths_len ();
 		public Gst.SDPResult dump ();
 		public uint emails_len ();
-		public weak Gst.SDPAttribute get_attribute (uint idx);
-		public weak string get_attribute_val (string key);
-		public weak string get_attribute_val_n (string key, uint nth);
-		public weak Gst.SDPBandwidth get_bandwidth (uint idx);
-		public weak Gst.SDPConnection get_connection ();
-		public weak string get_email (uint idx);
-		public weak string get_information ();
-		public weak Gst.SDPKey get_key ();
-		public weak Gst.SDPMedia get_media (uint idx);
-		public weak Gst.SDPOrigin get_origin ();
-		public weak string get_phone (uint idx);
-		public weak string get_session_name ();
-		public weak Gst.SDPTime get_time (uint idx);
-		public weak string get_uri ();
-		public weak string get_version ();
-		public weak Gst.SDPZone get_zone (uint idx);
+		public unowned Gst.SDPAttribute get_attribute (uint idx);
+		public unowned string get_attribute_val (string key);
+		public unowned string get_attribute_val_n (string key, uint nth);
+		public unowned Gst.SDPBandwidth get_bandwidth (uint idx);
+		public unowned Gst.SDPConnection get_connection ();
+		public unowned string get_email (uint idx);
+		public unowned string get_information ();
+		public unowned Gst.SDPKey get_key ();
+		public unowned Gst.SDPMedia get_media (uint idx);
+		public unowned Gst.SDPOrigin get_origin ();
+		public unowned string get_phone (uint idx);
+		public unowned string get_session_name ();
+		public unowned Gst.SDPTime get_time (uint idx);
+		public unowned string get_uri ();
+		public unowned string get_version ();
+		public unowned Gst.SDPZone get_zone (uint idx);
 		public Gst.SDPResult init ();
 		public uint medias_len ();
 		[CCode (type = "GstSDPResult", has_construct_function = false)]
-		public SDPMessage (out weak Gst.SDPMessage msg);
+		public SDPMessage (out unowned Gst.SDPMessage msg);
 		public static Gst.SDPResult parse_buffer (uchar data, uint size, Gst.SDPMessage msg);
 		public uint phones_len ();
 		public Gst.SDPResult set_connection (string nettype, string addrtype, string address, uint ttl, uint addr_number);

Modified: trunk/vapi/gstreamer-tag-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-tag-0.10.vapi	(original)
+++ trunk/vapi/gstreamer-tag-0.10.vapi	Fri Dec 19 21:56:41 2008
@@ -8,9 +8,9 @@
 		[NoWrapper]
 		public virtual bool identify_tag (Gst.Buffer buffer, bool start_tag, uint tag_size);
 		[NoWrapper]
-		public virtual weak Gst.TagList merge_tags (Gst.TagList start_tags, Gst.TagList end_tags);
+		public virtual unowned Gst.TagList merge_tags (Gst.TagList start_tags, Gst.TagList end_tags);
 		[NoWrapper]
-		public virtual Gst.TagDemuxResult parse_tag (Gst.Buffer buffer, bool start_tag, uint tag_size, out weak Gst.TagList tags);
+		public virtual Gst.TagDemuxResult parse_tag (Gst.Buffer buffer, bool start_tag, uint tag_size, out unowned Gst.TagList tags);
 	}
 	[CCode (cprefix = "GST_TAG_DEMUX_RESULT_", has_type_id = "0", cheader_filename = "gst/tag/gsttagdemux.h")]
 	public enum TagDemuxResult {
@@ -65,33 +65,33 @@
 	[CCode (cheader_filename = "gst/tag/tag.h")]
 	public const string TAG_MUSICBRAINZ_TRMID;
 	[CCode (cheader_filename = "gst/tag/tag.h")]
-	public static weak string tag_freeform_string_to_utf8 (string data, int size, string env_vars);
+	public static unowned string tag_freeform_string_to_utf8 (string data, int size, string env_vars);
 	[CCode (cheader_filename = "gst/tag/tag.h")]
-	public static weak string tag_from_id3_tag (string id3_tag);
+	public static unowned string tag_from_id3_tag (string id3_tag);
 	[CCode (cheader_filename = "gst/tag/tag.h")]
-	public static weak string tag_from_id3_user_tag (string type, string id3_user_tag);
+	public static unowned string tag_from_id3_user_tag (string type, string id3_user_tag);
 	[CCode (cheader_filename = "gst/tag/tag.h")]
-	public static weak string tag_from_vorbis_tag (string vorbis_tag);
+	public static unowned string tag_from_vorbis_tag (string vorbis_tag);
 	[CCode (cheader_filename = "gst/tag/tag.h")]
 	public static uint tag_id3_genre_count ();
 	[CCode (cheader_filename = "gst/tag/tag.h")]
-	public static weak string tag_id3_genre_get (uint id);
+	public static unowned string tag_id3_genre_get (uint id);
 	[CCode (cheader_filename = "gst/tag/tag.h")]
-	public static weak Gst.TagList tag_list_from_vorbiscomment_buffer (Gst.Buffer buffer, uchar id_data, uint id_data_length, string vendor_string);
+	public static unowned Gst.TagList tag_list_from_vorbiscomment_buffer (Gst.Buffer buffer, uchar id_data, uint id_data_length, string vendor_string);
 	[CCode (cheader_filename = "gst/tag/tag.h")]
-	public static weak Gst.TagList tag_list_new_from_id3v1 (uchar data);
+	public static unowned Gst.TagList tag_list_new_from_id3v1 (uchar data);
 	[CCode (cheader_filename = "gst/tag/tag.h")]
-	public static weak Gst.Buffer tag_list_to_vorbiscomment_buffer (Gst.TagList list, uchar id_data, uint id_data_length, string vendor_string);
+	public static unowned Gst.Buffer tag_list_to_vorbiscomment_buffer (Gst.TagList list, uchar id_data, uint id_data_length, string vendor_string);
 	[CCode (cheader_filename = "gst/tag/tag.h")]
 	public static bool tag_parse_extended_comment (string ext_comment, string key, string lang, string value, bool fail_if_no_key);
 	[CCode (cheader_filename = "gst/tag/tag.h")]
 	public static void tag_register_musicbrainz_tags ();
 	[CCode (cheader_filename = "gst/tag/tag.h")]
-	public static weak string tag_to_id3_tag (string gst_tag);
+	public static unowned string tag_to_id3_tag (string gst_tag);
 	[CCode (cheader_filename = "gst/tag/tag.h")]
-	public static weak GLib.List tag_to_vorbis_comments (Gst.TagList list, string tag);
+	public static unowned GLib.List tag_to_vorbis_comments (Gst.TagList list, string tag);
 	[CCode (cheader_filename = "gst/tag/tag.h")]
-	public static weak string tag_to_vorbis_tag (string gst_tag);
+	public static unowned string tag_to_vorbis_tag (string gst_tag);
 	[CCode (cheader_filename = "gst/tag/tag.h")]
 	public static void vorbis_tag_add (Gst.TagList list, string tag, string value);
 }

Modified: trunk/vapi/gstreamer-video-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-video-0.10.vapi	(original)
+++ trunk/vapi/gstreamer-video-0.10.vapi	Fri Dec 19 21:56:41 2008
@@ -4,106 +4,106 @@
 namespace Gst {
 	[CCode (cprefix = "GST_VIDEO_CAPS_", lower_case_cprefix = "gst_video_caps_")]
 	namespace VideoCaps {
-		[CCode (cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		[CCode (cheader_filename = "gst/video/video.h")]
 		public const string ABGR;
-		[CCode (cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		[CCode (cheader_filename = "gst/video/video.h")]
 		public const string ARGB;
-		[CCode (cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		[CCode (cheader_filename = "gst/video/video.h")]
 		public const string BGR;
-		[CCode (cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		[CCode (cheader_filename = "gst/video/video.h")]
 		public const string BGRA;
-		[CCode (cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		[CCode (cheader_filename = "gst/video/video.h")]
 		public const string BGRx;
-		[CCode (cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		[CCode (cheader_filename = "gst/video/video.h")]
 		public const string BGRx_HOST_ENDIAN;
-		[CCode (cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		[CCode (cheader_filename = "gst/video/video.h")]
 		public const string RGB;
-		[CCode (cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		[CCode (cheader_filename = "gst/video/video.h")]
 		public const string RGBA;
-		[CCode (cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		[CCode (cheader_filename = "gst/video/video.h")]
 		public const string RGB_15;
-		[CCode (cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		[CCode (cheader_filename = "gst/video/video.h")]
 		public const string RGB_16;
-		[CCode (cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		[CCode (cheader_filename = "gst/video/video.h")]
 		public const string RGBx;
-		[CCode (cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		[CCode (cheader_filename = "gst/video/video.h")]
 		public const string xBGR;
-		[CCode (cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		[CCode (cheader_filename = "gst/video/video.h")]
 		public const string xRGB;
-		[CCode (cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		[CCode (cheader_filename = "gst/video/video.h")]
 		public const string xRGB_HOST_ENDIAN;
-		[CCode (cname = "GST_VIDEO_CAPS_YUV", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
-		public static weak string YUV (string fourcc);
+		[CCode (cname = "GST_VIDEO_CAPS_YUV", cheader_filename = "gst/video/video.h")]
+		public static unowned string YUV (string fourcc);
 	}
 	[CCode (cprefix = "GstVideoMask15", lower_case_cprefix = "gst_video_mask15_")]
 	namespace VideoMask15 {
-		[CCode (cname = "GST_VIDEO_BLUE_MASK_15", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		[CCode (cname = "GST_VIDEO_BLUE_MASK_15", cheader_filename = "gst/video/video.h")]
 		public const string BLUE;
-		[CCode (cname = "GST_VIDEO_BLUE_MASK_15_INT", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		[CCode (cname = "GST_VIDEO_BLUE_MASK_15_INT", cheader_filename = "gst/video/video.h")]
 		public const int BLUE_INT;
-		[CCode (cname = "GST_VIDEO_GREEN_MASK_15", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		[CCode (cname = "GST_VIDEO_GREEN_MASK_15", cheader_filename = "gst/video/video.h")]
 		public const string GREEN;
-		[CCode (cname = "GST_VIDEO_GREEN_MASK_15_INT", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		[CCode (cname = "GST_VIDEO_GREEN_MASK_15_INT", cheader_filename = "gst/video/video.h")]
 		public const int GREEN_INT;
-		[CCode (cname = "GST_VIDEO_RED_MASK_15", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		[CCode (cname = "GST_VIDEO_RED_MASK_15", cheader_filename = "gst/video/video.h")]
 		public const string RED;
-		[CCode (cname = "GST_VIDEO_RED_MASK_15_INT", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		[CCode (cname = "GST_VIDEO_RED_MASK_15_INT", cheader_filename = "gst/video/video.h")]
 		public const int RED_INT;
 	}
 	[CCode (cprefix = "GstVideoMask16", lower_case_cprefix = "gst_video_mask16_")]
 	namespace VideoMask16 {
-		[CCode (cname = "GST_VIDEO_BLUE_MASK_16", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		[CCode (cname = "GST_VIDEO_BLUE_MASK_16", cheader_filename = "gst/video/video.h")]
 		public const string BLUE;
-		[CCode (cname = "GST_VIDEO_BLUE_MASK_16_INT", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		[CCode (cname = "GST_VIDEO_BLUE_MASK_16_INT", cheader_filename = "gst/video/video.h")]
 		public const int BLUE_INT;
-		[CCode (cname = "GST_VIDEO_GREEN_MASK_16", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		[CCode (cname = "GST_VIDEO_GREEN_MASK_16", cheader_filename = "gst/video/video.h")]
 		public const string GREEN;
-		[CCode (cname = "GST_VIDEO_GREEN_MASK_16_INT", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		[CCode (cname = "GST_VIDEO_GREEN_MASK_16_INT", cheader_filename = "gst/video/video.h")]
 		public const int GREEN_INT;
-		[CCode (cname = "GST_VIDEO_RED_MASK_16", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		[CCode (cname = "GST_VIDEO_RED_MASK_16", cheader_filename = "gst/video/video.h")]
 		public const string RED;
-		[CCode (cname = "GST_VIDEO_RED_MASK_16_INT", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		[CCode (cname = "GST_VIDEO_RED_MASK_16_INT", cheader_filename = "gst/video/video.h")]
 		public const int RED_INT;
 	}
 	[CCode (cprefix = "GstVideoMask24", lower_case_cprefix = "gst_video_mask24_")]
 	namespace VideoMask24 {
-		[CCode (cname = "GST_VIDEO_BYTE1_MASK_24", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		[CCode (cname = "GST_VIDEO_BYTE1_MASK_24", cheader_filename = "gst/video/video.h")]
 		public const string BYTE1;
-		[CCode (cname = "GST_VIDEO_BYTE1_MASK_24_INT", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		[CCode (cname = "GST_VIDEO_BYTE1_MASK_24_INT", cheader_filename = "gst/video/video.h")]
 		public const int BYTE1_INT;
-		[CCode (cname = "GST_VIDEO_BYTE2_MASK_24", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		[CCode (cname = "GST_VIDEO_BYTE2_MASK_24", cheader_filename = "gst/video/video.h")]
 		public const string BYTE2;
-		[CCode (cname = "GST_VIDEO_BYTE2_MASK_24_INT", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		[CCode (cname = "GST_VIDEO_BYTE2_MASK_24_INT", cheader_filename = "gst/video/video.h")]
 		public const int BYTE2_INT;
-		[CCode (cname = "GST_VIDEO_BYTE3_MASK_24", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		[CCode (cname = "GST_VIDEO_BYTE3_MASK_24", cheader_filename = "gst/video/video.h")]
 		public const string BYTE3;
-		[CCode (cname = "GST_VIDEO_BYTE3_MASK_24_INT", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		[CCode (cname = "GST_VIDEO_BYTE3_MASK_24_INT", cheader_filename = "gst/video/video.h")]
 		public const int BYTE3_INT;
 	}
 	[CCode (cprefix = "GstVideoMask32", lower_case_cprefix = "gst_video_mask32_")]
 	namespace VideoMask32 {
-		[CCode (cname = "GST_VIDEO_BYTE1_MASK_32", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		[CCode (cname = "GST_VIDEO_BYTE1_MASK_32", cheader_filename = "gst/video/video.h")]
 		public const string BYTE1;
-		[CCode (cname = "GST_VIDEO_BYTE1_MASK_32_INT", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		[CCode (cname = "GST_VIDEO_BYTE1_MASK_32_INT", cheader_filename = "gst/video/video.h")]
 		public const int BYTE1_INT;
-		[CCode (cname = "GST_VIDEO_BYTE2_MASK_32", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		[CCode (cname = "GST_VIDEO_BYTE2_MASK_32", cheader_filename = "gst/video/video.h")]
 		public const string BYTE2;
-		[CCode (cname = "GST_VIDEO_BYTE2_MASK_32_INT", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		[CCode (cname = "GST_VIDEO_BYTE2_MASK_32_INT", cheader_filename = "gst/video/video.h")]
 		public const int BYTE2_INT;
-		[CCode (cname = "GST_VIDEO_BYTE3_MASK_32", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		[CCode (cname = "GST_VIDEO_BYTE3_MASK_32", cheader_filename = "gst/video/video.h")]
 		public const string BYTE3;
-		[CCode (cname = "GST_VIDEO_BYTE3_MASK_32_INT", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		[CCode (cname = "GST_VIDEO_BYTE3_MASK_32_INT", cheader_filename = "gst/video/video.h")]
 		public const int BYTE3_INT;
-		[CCode (cname = "GST_VIDEO_BYTE4_MASK_32", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		[CCode (cname = "GST_VIDEO_BYTE4_MASK_32", cheader_filename = "gst/video/video.h")]
 		public const string BYTE4;
-		[CCode (cname = "GST_VIDEO_BYTE4_MASK_32_INT", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		[CCode (cname = "GST_VIDEO_BYTE4_MASK_32_INT", cheader_filename = "gst/video/video.h")]
 		public const int BYTE4_INT;
 	}
 	[CCode (cprefix = "GstVideoRange", lower_case_cprefix = "gst_video_range_")]
 	namespace VideoRange {
-		[CCode (cname = "GST_VIDEO_FPS_RANGE", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		[CCode (cname = "GST_VIDEO_FPS_RANGE", cheader_filename = "gst/video/video.h")]
 		public const string FPS;
-		[CCode (cname = "GST_VIDEO_SIZE_RANGE", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		[CCode (cname = "GST_VIDEO_SIZE_RANGE", cheader_filename = "gst/video/video.h")]
 		public const string SIZE;
 	}
 	[CCode (cheader_filename = "gst/video/gstvideofilter.h")]
@@ -150,7 +150,7 @@
 	[CCode (cheader_filename = "gst/video/video.h")]
 	public static bool video_format_convert (Gst.VideoFormat format, int width, int height, int fps_n, int fps_d, Gst.Format src_format, int64 src_value, Gst.Format dest_format, ref int64 dest_value);
 	[CCode (cheader_filename = "gst/video/video.h")]
-	public static Gst.VideoFormat video_format_from_fourcc (uint fourcc);
+	public static Gst.VideoFormat video_format_from_fourcc (uint32 fourcc);
 	[CCode (cheader_filename = "gst/video/video.h")]
 	public static int video_format_get_component_height (Gst.VideoFormat format, ref int component, ref int height);
 	[CCode (cheader_filename = "gst/video/video.h")]
@@ -170,13 +170,13 @@
 	[CCode (cheader_filename = "gst/video/video.h")]
 	public static bool video_format_is_yuv (Gst.VideoFormat format);
 	[CCode (cheader_filename = "gst/video/video.h")]
-	public static weak Gst.Caps video_format_new_caps (Gst.VideoFormat format, int width, int height, int framerate_n, int framerate_d, int par_n, int par_d);
+	public static unowned Gst.Caps video_format_new_caps (Gst.VideoFormat format, int width, int height, int framerate_n, int framerate_d, int par_n, int par_d);
 	[CCode (cheader_filename = "gst/video/video.h")]
 	public static bool video_format_parse_caps (Gst.Caps caps, ref Gst.VideoFormat format, ref int width, ref int height);
 	[CCode (cheader_filename = "gst/video/video.h")]
-	public static uint video_format_to_fourcc (Gst.VideoFormat format);
+	public static uint32 video_format_to_fourcc (Gst.VideoFormat format);
 	[CCode (cheader_filename = "gst/video/video.h")]
-	public static GLib.Value video_frame_rate (Gst.Pad pad);
+	public static Gst.Value video_frame_rate (Gst.Pad pad);
 	[CCode (cheader_filename = "gst/video/video.h")]
 	public static bool video_get_size (Gst.Pad pad, ref int width, ref int height);
 	[CCode (cheader_filename = "gst/video/video.h")]

Modified: trunk/vapi/gtk+-2.0.vapi
==============================================================================
--- trunk/vapi/gtk+-2.0.vapi	(original)
+++ trunk/vapi/gtk+-2.0.vapi	Fri Dec 19 21:56:41 2008
@@ -4,19 +4,19 @@
 namespace Gtk {
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class AboutDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
-		public weak string get_artists ();
-		public weak string get_authors ();
-		public weak string get_comments ();
-		public weak string get_copyright ();
-		public weak string get_documenters ();
-		public weak string get_license ();
-		public weak Gdk.Pixbuf get_logo ();
-		public weak string get_logo_icon_name ();
-		public weak string get_program_name ();
-		public weak string get_translator_credits ();
-		public weak string get_version ();
-		public weak string get_website ();
-		public weak string get_website_label ();
+		public unowned string get_artists ();
+		public unowned string get_authors ();
+		public unowned string get_comments ();
+		public unowned string get_copyright ();
+		public unowned string get_documenters ();
+		public unowned string get_license ();
+		public unowned Gdk.Pixbuf get_logo ();
+		public unowned string get_logo_icon_name ();
+		public unowned string get_program_name ();
+		public unowned string get_translator_credits ();
+		public unowned string get_version ();
+		public unowned string get_website ();
+		public unowned string get_website_label ();
 		public bool get_wrap_license ();
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public AboutDialog ();
@@ -28,13 +28,13 @@
 		public void set_copyright (string copyright);
 		[NoArrayLength]
 		public void set_documenters (string[] documenters);
-		public static void set_email_hook (Gtk.AboutDialogActivateLinkFunc# func);
+		public static void set_email_hook (owned Gtk.AboutDialogActivateLinkFunc func);
 		public void set_license (string license);
 		public void set_logo (Gdk.Pixbuf logo);
 		public void set_logo_icon_name (string icon_name);
 		public void set_program_name (string name);
 		public void set_translator_credits (string translator_credits);
-		public static void set_url_hook (Gtk.AboutDialogActivateLinkFunc# func);
+		public static void set_url_hook (owned Gtk.AboutDialogActivateLinkFunc func);
 		public void set_version (string version);
 		public void set_website (string website);
 		public void set_website_label (string website_label);
@@ -65,12 +65,12 @@
 		public void connect_by_path (string accel_path, GLib.Closure closure);
 		public bool disconnect (GLib.Closure closure);
 		public bool disconnect_key (uint accel_key, Gdk.ModifierType accel_mods);
-		public weak Gtk.AccelKey find (Gtk.AccelGroupFindFunc find_func, void* data);
-		public static weak Gtk.AccelGroup from_accel_closure (GLib.Closure closure);
+		public unowned Gtk.AccelKey find (Gtk.AccelGroupFindFunc find_func, void* data);
+		public static unowned Gtk.AccelGroup from_accel_closure (GLib.Closure closure);
 		public void @lock ();
 		[CCode (has_construct_function = false)]
 		public AccelGroup ();
-		public weak Gtk.AccelGroupEntry query (uint accel_key, Gdk.ModifierType accel_mods, uint n_entries);
+		public unowned Gtk.AccelGroupEntry query (uint accel_key, Gdk.ModifierType accel_mods, uint n_entries);
 		public void unlock ();
 		public virtual signal bool accel_activate (GLib.Object p0, uint p1, Gdk.ModifierType p2);
 		public virtual signal void accel_changed (uint keyval, Gdk.ModifierType modifier, GLib.Closure accel_closure);
@@ -96,7 +96,7 @@
 		public weak string accel_string;
 		public uint16 accel_string_width;
 		public uint gtk_reserved;
-		public weak Gtk.Widget get_accel_widget ();
+		public unowned Gtk.Widget get_accel_widget ();
 		public uint get_accel_width ();
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public AccelLabel (string str);
@@ -114,7 +114,7 @@
 		public static bool change_entry (string accel_path, uint accel_key, Gdk.ModifierType accel_mods, bool replace);
 		public static void @foreach (void* data, Gtk.AccelMapForeach foreach_func);
 		public static void foreach_unfiltered (void* data, Gtk.AccelMapForeach foreach_func);
-		public static weak Gtk.AccelMap get ();
+		public static unowned Gtk.AccelMap get ();
 		public static void load (string file_name);
 		public static void load_fd (int fd);
 		public static void load_scanner (GLib.Scanner scanner);
@@ -139,15 +139,15 @@
 		public void block_activate_from (Gtk.Widget proxy);
 		public void connect_accelerator ();
 		public virtual void connect_proxy (Gtk.Widget proxy);
-		public weak Gtk.Widget create_icon (Gtk.IconSize icon_size);
-		public virtual weak Gtk.Widget create_menu ();
-		public virtual weak Gtk.Widget create_menu_item ();
-		public virtual weak Gtk.Widget create_tool_item ();
+		public unowned Gtk.Widget create_icon (Gtk.IconSize icon_size);
+		public virtual unowned Gtk.Widget create_menu ();
+		public virtual unowned Gtk.Widget create_menu_item ();
+		public virtual unowned Gtk.Widget create_tool_item ();
 		public void disconnect_accelerator ();
 		public virtual void disconnect_proxy (Gtk.Widget proxy);
-		public weak GLib.Closure get_accel_closure ();
-		public weak string get_accel_path ();
-		public weak GLib.SList get_proxies ();
+		public unowned GLib.Closure get_accel_closure ();
+		public unowned string get_accel_path ();
+		public unowned GLib.SList get_proxies ();
 		public bool get_sensitive ();
 		public bool get_visible ();
 		public bool is_sensitive ();
@@ -198,10 +198,10 @@
 		public void add_radio_actions_full (Gtk.RadioActionEntry[] entries, int value, [CCode (type = "GCallback")] Gtk.RadioActionCallback on_change, GLib.DestroyNotify? destroy);
 		public void add_toggle_actions (Gtk.ToggleActionEntry[] entries, void* user_data);
 		public void add_toggle_actions_full (Gtk.ToggleActionEntry[] entries, void* user_data, GLib.DestroyNotify? destroy);
-		public virtual weak Gtk.Action get_action (string action_name);
+		public virtual unowned Gtk.Action get_action (string action_name);
 		public bool get_sensitive ();
 		public bool get_visible ();
-		public weak GLib.List list_actions ();
+		public unowned GLib.List list_actions ();
 		[CCode (has_construct_function = false)]
 		public ActionGroup (string name);
 		public void remove_action (Gtk.Action action);
@@ -209,7 +209,7 @@
 		public void set_translate_func (Gtk.TranslateFunc func, void* data, Gtk.DestroyNotify notify);
 		public void set_translation_domain (string domain);
 		public void set_visible (bool visible);
-		public weak string translate_string (string str);
+		public unowned string translate_string (string str);
 		[NoAccessorMethod]
 		public string name { get; construct; }
 		public bool sensitive { get; set; }
@@ -306,11 +306,11 @@
 		public int append_page (Gtk.Widget page);
 		public int get_current_page ();
 		public int get_n_pages ();
-		public weak Gtk.Widget get_nth_page (int page_num);
+		public unowned Gtk.Widget get_nth_page (int page_num);
 		public bool get_page_complete (Gtk.Widget page);
-		public weak Gdk.Pixbuf get_page_header_image (Gtk.Widget page);
-		public weak Gdk.Pixbuf get_page_side_image (Gtk.Widget page);
-		public weak string get_page_title (Gtk.Widget page);
+		public unowned Gdk.Pixbuf get_page_header_image (Gtk.Widget page);
+		public unowned Gdk.Pixbuf get_page_side_image (Gtk.Widget page);
+		public unowned string get_page_title (Gtk.Widget page);
 		public Gtk.AssistantPageType get_page_type (Gtk.Widget page);
 		public int insert_page (Gtk.Widget page, int position);
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
@@ -318,7 +318,7 @@
 		public int prepend_page (Gtk.Widget page);
 		public void remove_action_widget (Gtk.Widget child);
 		public void set_current_page (int page_num);
-		public void set_forward_page_func (Gtk.AssistantPageFunc# page_func);
+		public void set_forward_page_func (owned Gtk.AssistantPageFunc page_func);
 		public void set_page_complete (Gtk.Widget page, bool complete);
 		public void set_page_header_image (Gtk.Widget page, Gdk.Pixbuf pixbuf);
 		public void set_page_side_image (Gtk.Widget page, Gdk.Pixbuf pixbuf);
@@ -333,7 +333,7 @@
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class Bin : Gtk.Container, Atk.Implementor, Gtk.Buildable {
 		public weak Gtk.Widget child;
-		public weak Gtk.Widget get_child ();
+		public unowned Gtk.Widget get_child ();
 	}
 	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
@@ -369,8 +369,8 @@
 		public weak GLib.SList widget_path_pspecs;
 		public bool activate (uint keyval, Gdk.ModifierType modifiers, Gtk.Object object);
 		public void add_path (Gtk.PathType path_type, string path_pattern, Gtk.PathPriorityType priority);
-		public static weak Gtk.BindingSet by_class (void* object_class);
-		public static weak Gtk.BindingSet find (string set_name);
+		public static unowned Gtk.BindingSet by_class (void* object_class);
+		public static unowned Gtk.BindingSet find (string set_name);
 		[CCode (has_construct_function = false)]
 		public BindingSet (string set_name);
 	}
@@ -416,9 +416,9 @@
 		public void connect_signals (void* user_data);
 		public void connect_signals_full (Gtk.BuilderConnectFunc func);
 		public static GLib.Quark error_quark ();
-		public weak GLib.Object get_object (string name);
-		public weak GLib.SList get_objects ();
-		public weak string get_translation_domain ();
+		public unowned GLib.Object get_object (string name);
+		public unowned GLib.SList get_objects ();
+		public unowned string get_translation_domain ();
 		public virtual GLib.Type get_type_from_name (string type_name);
 		[CCode (has_construct_function = false)]
 		public Builder ();
@@ -441,9 +441,9 @@
 		public Button.from_stock (string stock_id);
 		public void get_alignment (float xalign, float yalign);
 		public bool get_focus_on_click ();
-		public weak Gtk.Widget get_image ();
+		public unowned Gtk.Widget get_image ();
 		public Gtk.PositionType get_image_position ();
-		public weak string get_label ();
+		public unowned string get_label ();
 		public Gtk.ReliefStyle get_relief ();
 		public bool get_use_stock ();
 		public bool get_use_underline ();
@@ -528,7 +528,7 @@
 		public Calendar ();
 		public void select_day (uint day);
 		public bool select_month (uint month, uint year);
-		public void set_detail_func (Gtk.CalendarDetailFunc# func);
+		public void set_detail_func (owned Gtk.CalendarDetailFunc func);
 		public void set_detail_height_rows (int rows);
 		public void set_detail_width_chars (int chars);
 		public void set_display_options (Gtk.CalendarDisplayOptions flags);
@@ -567,7 +567,7 @@
 		public abstract void get_size (Gtk.Widget widget, Gdk.Rectangle? cell_area, out int x_offset, out int y_offset, out int width, out int height);
 		public abstract void render (Gdk.Window window, Gtk.Widget widget, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gdk.Rectangle expose_area, Gtk.CellRendererState flags);
 		public void set_fixed_size (int width, int height);
-		public virtual weak Gtk.CellEditable start_editing (Gdk.Event event, Gtk.Widget widget, string path, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gtk.CellRendererState flags);
+		public virtual unowned Gtk.CellEditable start_editing (Gdk.Event event, Gtk.Widget widget, string path, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gtk.CellRendererState flags);
 		public void stop_editing (bool canceled);
 		[NoAccessorMethod]
 		public string cell_background { set; }
@@ -801,8 +801,8 @@
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class CellView : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.CellLayout {
-		public weak GLib.List get_cell_renderers ();
-		public weak Gtk.TreePath get_displayed_row ();
+		public unowned GLib.List get_cell_renderers ();
+		public unowned Gtk.TreePath get_displayed_row ();
 		public bool get_size_of_row (Gtk.TreePath path, out Gtk.Requisition requisition);
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public CellView ();
@@ -861,10 +861,10 @@
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class Clipboard : GLib.Object {
 		public void clear ();
-		public static weak Gtk.Clipboard get (Gdk.Atom selection);
-		public weak Gdk.Display get_display ();
-		public static weak Gtk.Clipboard get_for_display (Gdk.Display display, Gdk.Atom selection);
-		public weak GLib.Object get_owner ();
+		public static unowned Gtk.Clipboard get (Gdk.Atom selection);
+		public unowned Gdk.Display get_display ();
+		public static unowned Gtk.Clipboard get_for_display (Gdk.Display display, Gdk.Atom selection);
+		public unowned GLib.Object get_owner ();
 		public void request_contents (Gdk.Atom target, Gtk.ClipboardReceivedFunc callback);
 		public void request_image (Gtk.ClipboardImageReceivedFunc callback);
 		public void request_rich_text (Gtk.TextBuffer buffer, Gtk.ClipboardRichTextReceivedFunc callback);
@@ -876,11 +876,11 @@
 		public bool set_with_data (Gtk.TargetEntry[] targets, Gtk.ClipboardGetFunc get_func, Gtk.ClipboardClearFunc clear_func);
 		public bool set_with_owner (Gtk.TargetEntry[] targets, Gtk.ClipboardGetFunc get_func, Gtk.ClipboardClearFunc clear_func, GLib.Object owner);
 		public void store ();
-		public weak Gtk.SelectionData wait_for_contents (Gdk.Atom target);
-		public weak Gdk.Pixbuf wait_for_image ();
+		public unowned Gtk.SelectionData wait_for_contents (Gdk.Atom target);
+		public unowned Gdk.Pixbuf wait_for_image ();
 		public uchar wait_for_rich_text (Gtk.TextBuffer buffer, out Gdk.Atom format, size_t length);
 		public bool wait_for_targets (Gdk.Atom[] targets);
-		public weak string wait_for_text ();
+		public unowned string wait_for_text ();
 		public bool wait_is_image_available ();
 		public bool wait_is_rich_text_available (Gtk.TextBuffer buffer);
 		public bool wait_is_target_available (Gdk.Atom target);
@@ -891,7 +891,7 @@
 	public class ColorButton : Gtk.Button, Atk.Implementor, Gtk.Buildable {
 		public uint16 get_alpha ();
 		public void get_color (out Gdk.Color color);
-		public weak string get_title ();
+		public unowned string get_title ();
 		public bool get_use_alpha ();
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public ColorButton ();
@@ -919,8 +919,8 @@
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public ColorSelection ();
 		public static bool palette_from_string (string str, Gdk.Color[] colors);
-		public static weak string palette_to_string (Gdk.Color[] colors);
-		public static weak Gtk.ColorSelectionChangePaletteWithScreenFunc set_change_palette_with_screen_hook (Gtk.ColorSelectionChangePaletteWithScreenFunc func);
+		public static unowned string palette_to_string (Gdk.Color[] colors);
+		public static unowned Gtk.ColorSelectionChangePaletteWithScreenFunc set_change_palette_with_screen_hook (Gtk.ColorSelectionChangePaletteWithScreenFunc func);
 		public void set_current_alpha (uint16 alpha);
 		public void set_current_color (Gdk.Color color);
 		public void set_has_opacity_control (bool has_opacity);
@@ -947,15 +947,15 @@
 		public void append_text (string text);
 		public int get_active ();
 		public bool get_active_iter (out Gtk.TreeIter iter);
-		public virtual weak string get_active_text ();
+		public virtual unowned string get_active_text ();
 		public bool get_add_tearoffs ();
 		public int get_column_span_column ();
 		public bool get_focus_on_click ();
-		public weak Gtk.TreeModel get_model ();
-		public weak Atk.Object get_popup_accessible ();
-		public weak Gtk.TreeViewRowSeparatorFunc get_row_separator_func ();
+		public unowned Gtk.TreeModel get_model ();
+		public unowned Atk.Object get_popup_accessible ();
+		public unowned Gtk.TreeViewRowSeparatorFunc get_row_separator_func ();
 		public int get_row_span_column ();
-		public weak string get_title ();
+		public unowned string get_title ();
 		public int get_wrap_width ();
 		public void insert_text (int position, string text);
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
@@ -1022,10 +1022,10 @@
 		public void child_set_property (Gtk.Widget child, string property_name, GLib.Value value);
 		public void child_set_valist (Gtk.Widget child, string first_property_name, void* var_args);
 		public virtual GLib.Type child_type ();
-		public static weak GLib.ParamSpec class_find_child_property (GLib.ObjectClass cclass, string property_name);
-		public static weak GLib.ParamSpec class_list_child_properties (GLib.ObjectClass cclass, uint n_properties);
+		public static unowned GLib.ParamSpec class_find_child_property (GLib.ObjectClass cclass, string property_name);
+		public static unowned GLib.ParamSpec class_list_child_properties (GLib.ObjectClass cclass, uint n_properties);
 		[NoWrapper]
-		public virtual weak string composite_name (Gtk.Widget child);
+		public virtual unowned string composite_name (Gtk.Widget child);
 		public virtual void forall (Gtk.Callback callback, void* callback_data);
 		public void @foreach (Gtk.Callback callback);
 		public uint get_border_width ();
@@ -1033,8 +1033,8 @@
 		public virtual void get_child_property (Gtk.Widget child, uint property_id, GLib.Value value, GLib.ParamSpec pspec);
 		public GLib.List<weak Gtk.Widget> get_children ();
 		public bool get_focus_chain (GLib.List focusable_widgets);
-		public weak Gtk.Adjustment get_focus_hadjustment ();
-		public weak Gtk.Adjustment get_focus_vadjustment ();
+		public unowned Gtk.Adjustment get_focus_hadjustment ();
+		public unowned Gtk.Adjustment get_focus_vadjustment ();
 		public Gtk.ResizeMode get_resize_mode ();
 		[CCode (cname = "gtk_container_class_install_child_property")]
 		public class void install_child_property (uint property_id, GLib.ParamSpec pspec);
@@ -1100,7 +1100,7 @@
 		public weak Gtk.Widget separator;
 		public weak Gtk.VBox vbox;
 		public void add_action_widget (Gtk.Widget child, int response_id);
-		public weak Gtk.Widget add_button (string button_text, int response_id);
+		public unowned Gtk.Widget add_button (string button_text, int response_id);
 		public void add_buttons (...);
 		public bool get_has_separator ();
 		public int get_response_for_widget (Gtk.Widget widget);
@@ -1162,15 +1162,15 @@
 		public uint visible;
 		public bool get_activates_default ();
 		public float get_alignment ();
-		public weak Gtk.EntryCompletion get_completion ();
-		public weak Gtk.Adjustment get_cursor_hadjustment ();
+		public unowned Gtk.EntryCompletion get_completion ();
+		public unowned Gtk.Adjustment get_cursor_hadjustment ();
 		public bool get_has_frame ();
 		public Gtk.Border get_inner_border ();
 		public unichar get_invisible_char ();
-		public weak Pango.Layout get_layout ();
+		public unowned Pango.Layout get_layout ();
 		public void get_layout_offsets (int x, int y);
 		public int get_max_length ();
-		public weak string get_text ();
+		public unowned string get_text ();
 		[NoWrapper]
 		public virtual void get_text_area_size (int x, int y, int width, int height);
 		public bool get_visibility ();
@@ -1227,12 +1227,12 @@
 	public class EntryCompletion : GLib.Object, Gtk.Buildable, Gtk.CellLayout {
 		public void complete ();
 		public void delete_action (int index_);
-		public weak string get_completion_prefix ();
-		public weak Gtk.Widget get_entry ();
+		public unowned string get_completion_prefix ();
+		public unowned Gtk.Widget get_entry ();
 		public bool get_inline_completion ();
 		public bool get_inline_selection ();
 		public int get_minimum_key_length ();
-		public weak Gtk.TreeModel get_model ();
+		public unowned Gtk.TreeModel get_model ();
 		public bool get_popup_completion ();
 		public bool get_popup_set_width ();
 		public bool get_popup_single_match ();
@@ -1278,8 +1278,8 @@
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class Expander : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
 		public bool get_expanded ();
-		public weak string get_label ();
-		public weak Gtk.Widget get_label_widget ();
+		public unowned string get_label ();
+		public unowned Gtk.Widget get_label_widget ();
 		public int get_spacing ();
 		public bool get_use_markup ();
 		public bool get_use_underline ();
@@ -1304,7 +1304,7 @@
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class FileChooserButton : Gtk.HBox, Atk.Implementor, Gtk.Buildable, Gtk.FileChooser {
 		public bool get_focus_on_click ();
-		public weak string get_title ();
+		public unowned string get_title ();
 		public int get_width_chars ();
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public FileChooserButton (string title, Gtk.FileChooserAction action);
@@ -1343,7 +1343,7 @@
 		public void add_pattern (string pattern);
 		public void add_pixbuf_formats ();
 		public bool filter (Gtk.FileFilterInfo filter_info);
-		public weak string get_name ();
+		public unowned string get_name ();
 		public Gtk.FileFilterFlags get_needed ();
 		[CCode (has_construct_function = false)]
 		public FileFilter ();
@@ -1377,10 +1377,10 @@
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class FontButton : Gtk.Button, Atk.Implementor, Gtk.Buildable {
-		public weak string get_font_name ();
+		public unowned string get_font_name ();
 		public bool get_show_size ();
 		public bool get_show_style ();
-		public weak string get_title ();
+		public unowned string get_title ();
 		public bool get_use_font ();
 		public bool get_use_size ();
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
@@ -1416,8 +1416,8 @@
 		public int size;
 		public weak Gtk.Widget size_entry;
 		public weak Gtk.Widget size_list;
-		public weak string get_font_name ();
-		public weak string get_preview_text ();
+		public unowned string get_font_name ();
+		public unowned string get_preview_text ();
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public FontSelection ();
 		public bool set_font_name (string fontname);
@@ -1437,8 +1437,8 @@
 		public weak Gtk.Widget fontsel;
 		public weak Gtk.Widget main_vbox;
 		public weak Gtk.Widget ok_button;
-		public weak string get_font_name ();
-		public weak string get_preview_text ();
+		public unowned string get_font_name ();
+		public unowned string get_preview_text ();
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public FontSelectionDialog (string title);
 		public bool set_font_name (string fontname);
@@ -1449,9 +1449,9 @@
 		public Gtk.Allocation child_allocation;
 		[NoWrapper]
 		public virtual void compute_child_allocation (Gtk.Allocation allocation);
-		public weak string get_label ();
+		public unowned string get_label ();
 		public void get_label_align (float xalign, float yalign);
-		public weak Gtk.Widget get_label_widget ();
+		public unowned Gtk.Widget get_label_widget ();
 		public Gtk.ShadowType get_shadow_type ();
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Frame (string? label);
@@ -1552,7 +1552,7 @@
 		public virtual bool filter_keypress (Gdk.EventKey event);
 		public virtual void focus_in ();
 		public virtual void focus_out ();
-		public virtual void get_preedit_string (string str, out weak Pango.AttrList attrs, int cursor_pos);
+		public virtual void get_preedit_string (string str, out unowned Pango.AttrList attrs, int cursor_pos);
 		public virtual bool get_surrounding (string text, int cursor_index);
 		public virtual void reset ();
 		public virtual void set_client_window (Gdk.Window window);
@@ -1602,8 +1602,8 @@
 		public weak GLib.HashTable icons;
 		public void add (string stock_id, Gtk.IconSet icon_set);
 		public void add_default ();
-		public weak Gtk.IconSet lookup (string stock_id);
-		public static weak Gtk.IconSet lookup_default (string stock_id);
+		public unowned Gtk.IconSet lookup (string stock_id);
+		public static unowned Gtk.IconSet lookup_default (string stock_id);
 		[CCode (has_construct_function = false)]
 		public IconFactory ();
 		public void remove_default ();
@@ -1611,39 +1611,39 @@
 	[Compact]
 	[CCode (copy_function = "gtk_icon_info_copy", cheader_filename = "gtk/gtk.h")]
 	public class IconInfo {
-		public weak Gtk.IconInfo copy ();
+		public unowned Gtk.IconInfo copy ();
 		[CCode (has_construct_function = false)]
 		public IconInfo.for_pixbuf (Gtk.IconTheme icon_theme, Gdk.Pixbuf pixbuf);
 		public bool get_attach_points (Gdk.Point[] points);
 		public int get_base_size ();
-		public weak Gdk.Pixbuf get_builtin_pixbuf ();
-		public weak string get_display_name ();
+		public unowned Gdk.Pixbuf get_builtin_pixbuf ();
+		public unowned string get_display_name ();
 		public bool get_embedded_rect (out Gdk.Rectangle rectangle);
-		public weak string get_filename ();
-		public weak Gdk.Pixbuf load_icon () throws GLib.Error;
+		public unowned string get_filename ();
+		public unowned Gdk.Pixbuf load_icon () throws GLib.Error;
 		public void set_raw_coordinates (bool raw_coordinates);
 	}
 	[Compact]
 	[CCode (ref_function = "gtk_icon_set_ref", unref_function = "gtk_icon_set_unref", cheader_filename = "gtk/gtk.h")]
 	public class IconSet {
 		public void add_source (Gtk.IconSource source);
-		public weak Gtk.IconSet copy ();
+		public unowned Gtk.IconSet copy ();
 		[CCode (has_construct_function = false)]
 		public IconSet.from_pixbuf (Gdk.Pixbuf pixbuf);
 		public void get_sizes (Gtk.IconSize[] sizes);
 		[CCode (has_construct_function = false)]
 		public IconSet ();
-		public weak Gdk.Pixbuf render_icon (Gtk.Style style, Gtk.TextDirection direction, Gtk.StateType state, Gtk.IconSize size, Gtk.Widget widget, string detail);
+		public unowned Gdk.Pixbuf render_icon (Gtk.Style style, Gtk.TextDirection direction, Gtk.StateType state, Gtk.IconSize size, Gtk.Widget widget, string detail);
 	}
 	[Compact]
 	[CCode (copy_function = "gtk_icon_source_copy", cheader_filename = "gtk/gtk.h")]
 	public class IconSource {
-		public weak Gtk.IconSource copy ();
+		public unowned Gtk.IconSource copy ();
 		public Gtk.TextDirection get_direction ();
 		public bool get_direction_wildcarded ();
-		public weak string get_filename ();
-		public weak string get_icon_name ();
-		public weak Gdk.Pixbuf get_pixbuf ();
+		public unowned string get_filename ();
+		public unowned string get_icon_name ();
+		public unowned Gdk.Pixbuf get_pixbuf ();
 		public Gtk.IconSize get_size ();
 		public bool get_size_wildcarded ();
 		public Gtk.StateType get_state ();
@@ -1664,19 +1664,19 @@
 	public class IconTheme : GLib.Object {
 		public static void add_builtin_icon (string icon_name, int size, Gdk.Pixbuf pixbuf);
 		public void append_search_path (string path);
-		public weak Gtk.IconInfo choose_icon (string[] icon_names, int size, Gtk.IconLookupFlags flags);
+		public unowned Gtk.IconInfo choose_icon (string[] icon_names, int size, Gtk.IconLookupFlags flags);
 		public static GLib.Quark error_quark ();
-		public static weak Gtk.IconTheme get_default ();
-		public weak string get_example_icon_name ();
-		public static weak Gtk.IconTheme get_for_screen (Gdk.Screen screen);
+		public static unowned Gtk.IconTheme get_default ();
+		public unowned string get_example_icon_name ();
+		public static unowned Gtk.IconTheme get_for_screen (Gdk.Screen screen);
 		public int get_icon_sizes (string icon_name);
 		public void get_search_path (string path, int n_elements);
 		public bool has_icon (string icon_name);
-		public weak GLib.List list_contexts ();
-		public weak GLib.List list_icons (string context);
-		public weak Gdk.Pixbuf load_icon (string icon_name, int size, Gtk.IconLookupFlags flags) throws GLib.Error;
-		public weak Gtk.IconInfo lookup_by_gicon (GLib.Icon icon, int size, Gtk.IconLookupFlags flags);
-		public weak Gtk.IconInfo lookup_icon (string icon_name, int size, Gtk.IconLookupFlags flags);
+		public unowned GLib.List list_contexts ();
+		public unowned GLib.List list_icons (string context);
+		public unowned Gdk.Pixbuf load_icon (string icon_name, int size, Gtk.IconLookupFlags flags) throws GLib.Error;
+		public unowned Gtk.IconInfo lookup_by_gicon (GLib.Icon icon, int size, Gtk.IconLookupFlags flags);
+		public unowned Gtk.IconInfo lookup_icon (string icon_name, int size, Gtk.IconLookupFlags flags);
 		[CCode (has_construct_function = false)]
 		public IconTheme ();
 		public void prepend_search_path (string path);
@@ -1689,31 +1689,31 @@
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class IconView : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.CellLayout {
 		public void convert_widget_to_bin_window_coords (int wx, int wy, int bx, int by);
-		public weak Gdk.Pixmap create_drag_icon (Gtk.TreePath path);
+		public unowned Gdk.Pixmap create_drag_icon (Gtk.TreePath path);
 		public void enable_model_drag_dest (Gtk.TargetEntry[] targets, Gdk.DragAction actions);
 		public void enable_model_drag_source (Gdk.ModifierType start_button_mask, Gtk.TargetEntry[] targets, Gdk.DragAction actions);
 		public int get_column_spacing ();
 		public int get_columns ();
-		public bool get_cursor (out Gtk.TreePath path, out weak Gtk.CellRenderer cell);
-		public bool get_dest_item_at_pos (int drag_x, int drag_y, out weak Gtk.TreePath path, Gtk.IconViewDropPosition pos);
-		public void get_drag_dest_item (out weak Gtk.TreePath path, Gtk.IconViewDropPosition pos);
-		public bool get_item_at_pos (int x, int y, out weak Gtk.TreePath path, out weak Gtk.CellRenderer cell);
+		public bool get_cursor (out Gtk.TreePath path, out unowned Gtk.CellRenderer cell);
+		public bool get_dest_item_at_pos (int drag_x, int drag_y, out unowned Gtk.TreePath path, Gtk.IconViewDropPosition pos);
+		public void get_drag_dest_item (out unowned Gtk.TreePath path, Gtk.IconViewDropPosition pos);
+		public bool get_item_at_pos (int x, int y, out unowned Gtk.TreePath path, out unowned Gtk.CellRenderer cell);
 		public int get_item_width ();
 		public int get_margin ();
 		public int get_markup_column ();
-		public weak Gtk.TreeModel get_model ();
+		public unowned Gtk.TreeModel get_model ();
 		public Gtk.Orientation get_orientation ();
-		public weak Gtk.TreePath get_path_at_pos (int x, int y);
+		public unowned Gtk.TreePath get_path_at_pos (int x, int y);
 		public int get_pixbuf_column ();
 		public bool get_reorderable ();
 		public int get_row_spacing ();
-		public weak GLib.List get_selected_items ();
+		public unowned GLib.List get_selected_items ();
 		public Gtk.SelectionMode get_selection_mode ();
 		public int get_spacing ();
 		public int get_text_column ();
 		public int get_tooltip_column ();
-		public bool get_tooltip_context (int x, int y, bool keyboard_tip, out weak Gtk.TreeModel model, out weak Gtk.TreePath path, out Gtk.TreeIter iter);
-		public bool get_visible_range (out weak Gtk.TreePath start_path, out weak Gtk.TreePath end_path);
+		public bool get_tooltip_context (int x, int y, bool keyboard_tip, out unowned Gtk.TreeModel model, out unowned Gtk.TreePath path, out Gtk.TreeIter iter);
+		public bool get_visible_range (out unowned Gtk.TreePath start_path, out unowned Gtk.TreePath end_path);
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public IconView ();
 		public bool path_is_selected (Gtk.TreePath path);
@@ -1789,15 +1789,15 @@
 		public Image.from_pixmap (Gdk.Pixmap pixmap, Gdk.Bitmap mask);
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Image.from_stock (string stock_id, Gtk.IconSize size);
-		public weak Gdk.PixbufAnimation get_animation ();
-		public void get_gicon (out weak GLib.Icon gicon, Gtk.IconSize size);
-		public void get_icon_name (out weak string icon_name, out Gtk.IconSize size);
-		public void get_icon_set (out weak Gtk.IconSet icon_set, out Gtk.IconSize size);
-		public void get_image (out weak Gdk.Image gdk_image, out weak Gdk.Bitmap mask);
-		public weak Gdk.Pixbuf get_pixbuf ();
+		public unowned Gdk.PixbufAnimation get_animation ();
+		public void get_gicon (out unowned GLib.Icon gicon, Gtk.IconSize size);
+		public void get_icon_name (out unowned string icon_name, out Gtk.IconSize size);
+		public void get_icon_set (out unowned Gtk.IconSet icon_set, out Gtk.IconSize size);
+		public void get_image (out unowned Gdk.Image gdk_image, out unowned Gdk.Bitmap mask);
+		public unowned Gdk.Pixbuf get_pixbuf ();
 		public int get_pixel_size ();
-		public void get_pixmap (out weak Gdk.Pixmap pixmap, out weak Gdk.Bitmap mask);
-		public void get_stock (out weak string stock_id, out Gtk.IconSize size);
+		public void get_pixmap (out unowned Gdk.Pixmap pixmap, out unowned Gdk.Bitmap mask);
+		public void get_stock (out unowned string stock_id, out Gtk.IconSize size);
 		public Gtk.ImageType get_storage_type ();
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Image ();
@@ -1871,7 +1871,7 @@
 	public class ImageMenuItem : Gtk.MenuItem, Atk.Implementor, Gtk.Buildable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public ImageMenuItem.from_stock (string stock_id, Gtk.AccelGroup? accel_group);
-		public weak Gtk.Widget get_image ();
+		public unowned Gtk.Widget get_image ();
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public ImageMenuItem ();
 		public void set_image (Gtk.Widget image);
@@ -1918,7 +1918,7 @@
 		public bool has_user_ref_count;
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Invisible.for_screen (Gdk.Screen screen);
-		public weak Gdk.Screen get_screen ();
+		public unowned Gdk.Screen get_screen ();
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Invisible ();
 		public void set_screen (Gdk.Screen screen);
@@ -1946,21 +1946,21 @@
 		public weak Gtk.LabelSelectionInfo select_info;
 		public weak string text;
 		public double get_angle ();
-		public weak Pango.AttrList get_attributes ();
+		public unowned Pango.AttrList get_attributes ();
 		public Pango.EllipsizeMode get_ellipsize ();
 		public Gtk.Justification get_justify ();
-		public weak string get_label ();
-		public weak Pango.Layout get_layout ();
+		public unowned string get_label ();
+		public unowned Pango.Layout get_layout ();
 		public void get_layout_offsets (int x, int y);
 		public bool get_line_wrap ();
 		public Pango.WrapMode get_line_wrap_mode ();
 		public int get_max_width_chars ();
 		public uint get_mnemonic_keyval ();
-		public weak Gtk.Widget get_mnemonic_widget ();
+		public unowned Gtk.Widget get_mnemonic_widget ();
 		public bool get_selectable ();
 		public bool get_selection_bounds (int start, int end);
 		public bool get_single_line_mode ();
-		public weak string get_text ();
+		public unowned string get_text ();
 		public bool get_use_markup ();
 		public bool get_use_underline ();
 		public int get_width_chars ();
@@ -2026,9 +2026,9 @@
 		public int scroll_x;
 		public int scroll_y;
 		public Gdk.VisibilityState visibility;
-		public weak Gtk.Adjustment get_hadjustment ();
+		public unowned Gtk.Adjustment get_hadjustment ();
 		public void get_size (out uint width, out uint height);
-		public weak Gtk.Adjustment get_vadjustment ();
+		public unowned Gtk.Adjustment get_vadjustment ();
 		public void move (Gtk.Widget child_widget, int x, int y);
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Layout (Gtk.Adjustment hadjustment, Gtk.Adjustment vadjustment);
@@ -2046,11 +2046,11 @@
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class LinkButton : Gtk.Button, Atk.Implementor, Gtk.Buildable {
-		public weak string get_uri ();
+		public unowned string get_uri ();
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public LinkButton (string uri);
 		public void set_uri (string uri);
-		public static void set_uri_hook (Gtk.LinkButtonUriFunc# func);
+		public static void set_uri_hook (owned Gtk.LinkButtonUriFunc func);
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public LinkButton.with_label (string uri, string label);
 		public string uri { get; set; }
@@ -2129,12 +2129,12 @@
 		public void attach (Gtk.Widget child, uint left_attach, uint right_attach, uint top_attach, uint bottom_attach);
 		public void attach_to_widget (Gtk.Widget attach_widget, Gtk.MenuDetachFunc detacher);
 		public void detach ();
-		public weak Gtk.AccelGroup get_accel_group ();
-		public weak Gtk.Widget get_active ();
-		public weak Gtk.Widget get_attach_widget ();
-		public static weak GLib.List get_for_attach_widget (Gtk.Widget widget);
+		public unowned Gtk.AccelGroup get_accel_group ();
+		public unowned Gtk.Widget get_active ();
+		public unowned Gtk.Widget get_attach_widget ();
+		public static unowned GLib.List get_for_attach_widget (Gtk.Widget widget);
 		public bool get_tearoff_state ();
-		public weak string get_title ();
+		public unowned string get_title ();
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Menu ();
 		public void popdown ();
@@ -2178,7 +2178,7 @@
 		public uint timer_from_keypress;
 		public uint16 toggle_size;
 		public bool get_right_justified ();
-		public weak Gtk.Widget get_submenu ();
+		public unowned Gtk.Widget get_submenu ();
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public MenuItem ();
 		public void set_accel_path (string accel_path);
@@ -2236,7 +2236,7 @@
 	public class MenuToolButton : Gtk.ToolButton, Atk.Implementor, Gtk.Buildable {
 		[CCode (type = "GtkToolItem*", has_construct_function = false)]
 		public MenuToolButton.from_stock (string stock_id);
-		public weak Gtk.Widget get_menu ();
+		public unowned Gtk.Widget get_menu ();
 		[CCode (type = "GtkToolItem*", has_construct_function = false)]
 		public MenuToolButton (Gtk.Widget icon_widget, string label);
 		public void set_arrow_tooltip_markup (string markup);
@@ -2288,8 +2288,8 @@
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class MountOperation : GLib.MountOperation {
-		public weak Gtk.Window get_parent ();
-		public weak Gdk.Screen get_screen ();
+		public unowned Gtk.Window get_parent ();
+		public unowned Gdk.Screen get_screen ();
 		[CCode (type = "GMountOperation*", has_construct_function = false)]
 		public MountOperation (Gtk.Window parent);
 		public void set_parent (Gtk.Window parent);
@@ -2326,16 +2326,16 @@
 		public int append_page_menu (Gtk.Widget child, Gtk.Widget tab_label, Gtk.Widget menu_label);
 		public int get_current_page ();
 		public void* get_group ();
-		public weak Gtk.Widget get_menu_label (Gtk.Widget child);
-		public weak string get_menu_label_text (Gtk.Widget child);
+		public unowned Gtk.Widget get_menu_label (Gtk.Widget child);
+		public unowned string get_menu_label_text (Gtk.Widget child);
 		public int get_n_pages ();
-		public weak Gtk.Widget get_nth_page (int page_num);
+		public unowned Gtk.Widget get_nth_page (int page_num);
 		public bool get_scrollable ();
 		public bool get_show_border ();
 		public bool get_show_tabs ();
 		public bool get_tab_detachable (Gtk.Widget child);
-		public weak Gtk.Widget get_tab_label (Gtk.Widget child);
-		public weak string get_tab_label_text (Gtk.Widget child);
+		public unowned Gtk.Widget get_tab_label (Gtk.Widget child);
+		public unowned string get_tab_label_text (Gtk.Widget child);
 		public Gtk.PositionType get_tab_pos ();
 		public bool get_tab_reorderable (Gtk.Widget child);
 		public virtual int insert_page (Gtk.Widget child, Gtk.Widget tab_label, int position);
@@ -2386,7 +2386,7 @@
 		[NoAccessorMethod]
 		public uint tab_vborder { get; set; }
 		public virtual signal bool change_current_page (int offset);
-		public virtual signal weak Gtk.Notebook create_window (Gtk.Widget page, int x, int y);
+		public virtual signal unowned Gtk.Notebook create_window (Gtk.Widget page, int x, int y);
 		public virtual signal bool focus_tab (Gtk.NotebookTab type);
 		public virtual signal void move_focus_out (Gtk.DirectionType direction);
 		public virtual signal void page_added (Gtk.Widget p0, uint p1);
@@ -2420,7 +2420,7 @@
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class PageSetup : GLib.Object {
-		public weak Gtk.PageSetup copy ();
+		public unowned Gtk.PageSetup copy ();
 		[CCode (has_construct_function = false)]
 		public PageSetup.from_file (string file_name) throws GLib.Error;
 		[CCode (has_construct_function = false)]
@@ -2431,7 +2431,7 @@
 		public double get_page_height (Gtk.Unit unit);
 		public double get_page_width (Gtk.Unit unit);
 		public double get_paper_height (Gtk.Unit unit);
-		public weak Gtk.PaperSize get_paper_size ();
+		public unowned Gtk.PaperSize get_paper_size ();
 		public double get_paper_width (Gtk.Unit unit);
 		public double get_right_margin (Gtk.Unit unit);
 		public double get_top_margin (Gtk.Unit unit);
@@ -2474,8 +2474,8 @@
 		public void add1 (Gtk.Widget child);
 		public void add2 (Gtk.Widget child);
 		public void compute_position (int allocation, int child1_req, int child2_req);
-		public weak Gtk.Widget get_child1 ();
-		public weak Gtk.Widget get_child2 ();
+		public unowned Gtk.Widget get_child1 ();
+		public unowned Gtk.Widget get_child2 ();
 		public int get_position ();
 		public void pack1 (Gtk.Widget child, bool resize, bool shrink);
 		public void pack2 (Gtk.Widget child, bool resize, bool shrink);
@@ -2497,23 +2497,23 @@
 	[Compact]
 	[CCode (copy_function = "gtk_paper_size_copy", cheader_filename = "gtk/gtk.h")]
 	public class PaperSize {
-		public weak Gtk.PaperSize copy ();
+		public unowned Gtk.PaperSize copy ();
 		[CCode (has_construct_function = false)]
 		public PaperSize.custom (string name, string display_name, double width, double height, Gtk.Unit unit);
 		[CCode (has_construct_function = false)]
 		public PaperSize.from_key_file (GLib.KeyFile key_file, string group_name) throws GLib.Error;
 		[CCode (has_construct_function = false)]
 		public PaperSize.from_ppd (string ppd_name, string ppd_display_name, double width, double height);
-		public static weak string get_default ();
+		public static unowned string get_default ();
 		public double get_default_bottom_margin (Gtk.Unit unit);
 		public double get_default_left_margin (Gtk.Unit unit);
 		public double get_default_right_margin (Gtk.Unit unit);
 		public double get_default_top_margin (Gtk.Unit unit);
-		public weak string get_display_name ();
+		public unowned string get_display_name ();
 		public double get_height (Gtk.Unit unit);
-		public weak string get_name ();
-		public static weak GLib.List get_paper_sizes (bool include_custom);
-		public weak string get_ppd_name ();
+		public unowned string get_name ();
+		public static unowned GLib.List get_paper_sizes (bool include_custom);
+		public unowned string get_ppd_name ();
 		public double get_width (Gtk.Unit unit);
 		public bool is_custom ();
 		public bool is_equal (Gtk.PaperSize size2);
@@ -2541,25 +2541,25 @@
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class PrintContext : GLib.Object {
-		public weak Pango.Context create_pango_context ();
-		public weak Pango.Layout create_pango_layout ();
-		public weak Cairo.Context get_cairo_context ();
+		public unowned Pango.Context create_pango_context ();
+		public unowned Pango.Layout create_pango_layout ();
+		public unowned Cairo.Context get_cairo_context ();
 		public double get_dpi_x ();
 		public double get_dpi_y ();
 		public double get_height ();
-		public weak Gtk.PageSetup get_page_setup ();
-		public weak Pango.FontMap get_pango_fontmap ();
+		public unowned Gtk.PageSetup get_page_setup ();
+		public unowned Pango.FontMap get_pango_fontmap ();
 		public double get_width ();
 		public void set_cairo_context (Cairo.Context cr, double dpi_x, double dpi_y);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class PrintOperation : GLib.Object, Gtk.PrintOperationPreview {
 		public void cancel ();
-		public weak Gtk.PageSetup get_default_page_setup ();
+		public unowned Gtk.PageSetup get_default_page_setup ();
 		public void get_error () throws GLib.Error;
-		public weak Gtk.PrintSettings get_print_settings ();
+		public unowned Gtk.PrintSettings get_print_settings ();
 		public Gtk.PrintStatus get_status ();
-		public weak string get_status_string ();
+		public unowned string get_status_string ();
 		public bool is_finished ();
 		[CCode (has_construct_function = false)]
 		public PrintOperation ();
@@ -2601,7 +2601,7 @@
 		[NoAccessorMethod]
 		public bool use_full_page { get; set; }
 		public virtual signal void begin_print (Gtk.PrintContext context);
-		public virtual signal weak GLib.Object create_custom_widget ();
+		public virtual signal unowned GLib.Object create_custom_widget ();
 		public virtual signal void custom_widget_apply (Gtk.Widget widget);
 		public virtual signal void done (Gtk.PrintOperationResult result);
 		public virtual signal void draw_page (Gtk.PrintContext context, int page_nr);
@@ -2613,36 +2613,36 @@
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class PrintSettings : GLib.Object {
-		public weak Gtk.PrintSettings copy ();
+		public unowned Gtk.PrintSettings copy ();
 		public void @foreach (Gtk.PrintSettingsFunc func);
 		[CCode (has_construct_function = false)]
 		public PrintSettings.from_file (string file_name) throws GLib.Error;
 		[CCode (has_construct_function = false)]
 		public PrintSettings.from_key_file (GLib.KeyFile key_file, string group_name) throws GLib.Error;
-		public weak string get (string key);
+		public unowned string get (string key);
 		public bool get_bool (string key);
 		public bool get_collate ();
-		public weak string get_default_source ();
-		public weak string get_dither ();
+		public unowned string get_default_source ();
+		public unowned string get_dither ();
 		public double get_double (string key);
 		public double get_double_with_default (string key, double def);
 		public Gtk.PrintDuplex get_duplex ();
-		public weak string get_finishings ();
+		public unowned string get_finishings ();
 		public int get_int (string key);
 		public int get_int_with_default (string key, int def);
 		public double get_length (string key, Gtk.Unit unit);
-		public weak string get_media_type ();
+		public unowned string get_media_type ();
 		public int get_n_copies ();
 		public int get_number_up ();
 		public Gtk.PageOrientation get_orientation ();
-		public weak string get_output_bin ();
-		public weak Gtk.PageRange get_page_ranges (int num_ranges);
+		public unowned string get_output_bin ();
+		public unowned Gtk.PageRange get_page_ranges (int num_ranges);
 		public Gtk.PageSet get_page_set ();
 		public double get_paper_height (Gtk.Unit unit);
-		public weak Gtk.PaperSize get_paper_size ();
+		public unowned Gtk.PaperSize get_paper_size ();
 		public double get_paper_width (Gtk.Unit unit);
 		public Gtk.PrintPages get_print_pages ();
-		public weak string get_printer ();
+		public unowned string get_printer ();
 		public Gtk.PrintQuality get_quality ();
 		public int get_resolution ();
 		public bool get_reverse ();
@@ -2696,7 +2696,7 @@
 		public double get_fraction ();
 		public Gtk.ProgressBarOrientation get_orientation ();
 		public double get_pulse_step ();
-		public weak string get_text ();
+		public unowned string get_text ();
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public ProgressBar ();
 		public void pulse ();
@@ -2724,7 +2724,7 @@
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class RadioAction : Gtk.ToggleAction, Gtk.Buildable {
 		public int get_current_value ();
-		public weak GLib.SList get_group ();
+		public unowned GLib.SList get_group ();
 		[CCode (has_construct_function = false)]
 		public RadioAction (string name, string? label, string? tooltip, string? stock_id, int value);
 		public void set_current_value (int current_value);
@@ -2739,7 +2739,7 @@
 	public class RadioButton : Gtk.CheckButton, Atk.Implementor, Gtk.Buildable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public RadioButton.from_widget (Gtk.RadioButton radio_group_member);
-		public weak GLib.SList get_group ();
+		public unowned GLib.SList get_group ();
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public RadioButton (GLib.SList? group);
 		public void set_group (GLib.SList group);
@@ -2758,7 +2758,7 @@
 	public class RadioMenuItem : Gtk.CheckMenuItem, Atk.Implementor, Gtk.Buildable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public RadioMenuItem.from_widget (Gtk.RadioMenuItem group);
-		public weak GLib.SList get_group ();
+		public unowned GLib.SList get_group ();
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public RadioMenuItem (GLib.SList group);
 		public void set_group (GLib.SList group);
@@ -2779,7 +2779,7 @@
 		public RadioToolButton.from_stock (GLib.SList group, string stock_id);
 		[CCode (type = "GtkToolItem*", has_construct_function = false)]
 		public RadioToolButton.from_widget (Gtk.RadioToolButton group);
-		public weak GLib.SList get_group ();
+		public unowned GLib.SList get_group ();
 		[CCode (type = "GtkToolItem*", has_construct_function = false)]
 		public RadioToolButton (GLib.SList group);
 		public void set_group (GLib.SList group);
@@ -2810,7 +2810,7 @@
 		public uint trough_click_forward;
 		public uint update_pending;
 		public uint update_timeout_id;
-		public weak Gtk.Adjustment get_adjustment ();
+		public unowned Gtk.Adjustment get_adjustment ();
 		public double get_fill_level ();
 		public bool get_inverted ();
 		public Gtk.SensitivityType get_lower_stepper_sensitivity ();
@@ -2892,11 +2892,11 @@
 		public weak Gdk.Color[] text;
 		public int xthickness;
 		public int ythickness;
-		public weak Gtk.RcStyle copy ();
+		public unowned Gtk.RcStyle copy ();
 		[NoWrapper]
-		public virtual weak Gtk.RcStyle create_rc_style ();
+		public virtual unowned Gtk.RcStyle create_rc_style ();
 		[NoWrapper]
-		public virtual weak Gtk.Style create_style ();
+		public virtual unowned Gtk.Style create_style ();
 		[NoWrapper]
 		public virtual void merge (Gtk.RcStyle src);
 		[CCode (has_construct_function = false)]
@@ -2956,7 +2956,7 @@
 		public void add_pattern (string pattern);
 		public void add_pixbuf_formats ();
 		public bool filter (Gtk.RecentFilterInfo filter_info);
-		public weak string get_name ();
+		public unowned string get_name ();
 		public Gtk.RecentFilterFlags get_needed ();
 		[CCode (has_construct_function = false)]
 		public RecentFilter ();
@@ -2980,22 +2980,22 @@
 		public ulong get_added ();
 		public int get_age ();
 		public bool get_application_info (string app_name, string app_exec, uint count, ulong time_);
-		public weak string get_applications (size_t length);
-		public weak string get_description ();
-		public weak string get_display_name ();
-		public weak string get_groups (size_t length);
-		public weak Gdk.Pixbuf get_icon (int size);
-		public weak string get_mime_type ();
+		public unowned string get_applications (size_t length);
+		public unowned string get_description ();
+		public unowned string get_display_name ();
+		public unowned string get_groups (size_t length);
+		public unowned Gdk.Pixbuf get_icon (int size);
+		public unowned string get_mime_type ();
 		public ulong get_modified ();
 		public bool get_private_hint ();
-		public weak string get_short_name ();
-		public weak string get_uri ();
-		public weak string get_uri_display ();
+		public unowned string get_short_name ();
+		public unowned string get_uri ();
+		public unowned string get_uri_display ();
 		public ulong get_visited ();
 		public bool has_application (string app_name);
 		public bool has_group (string group_name);
 		public bool is_local ();
-		public weak string last_application ();
+		public unowned string last_application ();
 		public bool match (Gtk.RecentInfo info_b);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
@@ -3003,11 +3003,11 @@
 		public bool add_full (string uri, Gtk.RecentData recent_data);
 		public bool add_item (string uri);
 		public static GLib.Quark error_quark ();
-		public static weak Gtk.RecentManager get_default ();
-		public weak GLib.List get_items ();
+		public static unowned Gtk.RecentManager get_default ();
+		public unowned GLib.List get_items ();
 		public int get_limit ();
 		public bool has_item (string uri);
-		public weak Gtk.RecentInfo lookup_item (string uri) throws GLib.Error;
+		public unowned Gtk.RecentInfo lookup_item (string uri) throws GLib.Error;
 		public bool move_item (string uri, string new_uri) throws GLib.Error;
 		[CCode (has_construct_function = false)]
 		public RecentManager ();
@@ -3059,7 +3059,7 @@
 	public class Scale : Gtk.Range, Atk.Implementor, Gtk.Buildable {
 		public int get_digits ();
 		public bool get_draw_value ();
-		public weak Pango.Layout get_layout ();
+		public unowned Pango.Layout get_layout ();
 		public virtual void get_layout_offsets (int x, int y);
 		public Gtk.PositionType get_value_pos ();
 		public void set_digits (int digits);
@@ -3068,13 +3068,13 @@
 		public int digits { get; set; }
 		public bool draw_value { get; set; }
 		public Gtk.PositionType value_pos { get; set; }
-		public virtual signal weak string format_value (double value);
+		public virtual signal unowned string format_value (double value);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class ScaleButton : Gtk.Button, Atk.Implementor, Gtk.Buildable {
 		public weak Gtk.Widget minus_button;
 		public weak Gtk.Widget plus_button;
-		public weak Gtk.Adjustment get_adjustment ();
+		public unowned Gtk.Adjustment get_adjustment ();
 		public double get_value ();
 		[NoArrayLength]
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
@@ -3104,13 +3104,13 @@
 		public weak Gtk.Widget vscrollbar;
 		public uint vscrollbar_visible;
 		public void add_with_viewport (Gtk.Widget child);
-		public weak Gtk.Adjustment get_hadjustment ();
-		public weak Gtk.Widget get_hscrollbar ();
+		public unowned Gtk.Adjustment get_hadjustment ();
+		public unowned Gtk.Widget get_hscrollbar ();
 		public Gtk.CornerType get_placement ();
 		public void get_policy (Gtk.PolicyType hscrollbar_policy, Gtk.PolicyType vscrollbar_policy);
 		public Gtk.ShadowType get_shadow_type ();
-		public weak Gtk.Adjustment get_vadjustment ();
-		public weak Gtk.Widget get_vscrollbar ();
+		public unowned Gtk.Adjustment get_vadjustment ();
+		public unowned Gtk.Widget get_vscrollbar ();
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public ScrolledWindow (Gtk.Adjustment? hadjustment, Gtk.Adjustment? vadjustment);
 		public void set_hadjustment (Gtk.Adjustment hadjustment);
@@ -3180,8 +3180,8 @@
 		public weak Gtk.SettingsPropertyValue property_values;
 		public weak Gtk.RcContext rc_context;
 		public weak Gdk.Screen screen;
-		public static weak Gtk.Settings get_default ();
-		public static weak Gtk.Settings get_for_screen (Gdk.Screen screen);
+		public static unowned Gtk.Settings get_default ();
+		public static unowned Gtk.Settings get_for_screen (Gdk.Screen screen);
 		public static void install_property (GLib.ParamSpec pspec);
 		public static void install_property_parser (GLib.ParamSpec pspec, Gtk.RcPropertyParser parser);
 		public void set_double_property (string name, double v_double, string origin);
@@ -3304,7 +3304,7 @@
 		public void add_widget (Gtk.Widget widget);
 		public bool get_ignore_hidden ();
 		public Gtk.SizeGroupMode get_mode ();
-		public weak GLib.SList get_widgets ();
+		public unowned GLib.SList get_widgets ();
 		[CCode (has_construct_function = false)]
 		public SizeGroup (Gtk.SizeGroupMode mode);
 		public void remove_widget (Gtk.Widget widget);
@@ -3348,7 +3348,7 @@
 		public uint timer_calls;
 		public double timer_step;
 		public void configure (Gtk.Adjustment adjustment, double climb_rate, uint digits);
-		public weak Gtk.Adjustment get_adjustment ();
+		public unowned Gtk.Adjustment get_adjustment ();
 		public uint get_digits ();
 		public void get_increments (double step, double page);
 		public bool get_numeric ();
@@ -3399,12 +3399,12 @@
 		[CCode (has_construct_function = false)]
 		public StatusIcon.from_stock (string stock_id);
 		public bool get_blinking ();
-		public bool get_geometry (out weak Gdk.Screen screen, out Gdk.Rectangle area, out Gtk.Orientation orientation);
-		public weak string get_icon_name ();
-		public weak Gdk.Pixbuf get_pixbuf ();
-		public weak Gdk.Screen get_screen ();
+		public bool get_geometry (out unowned Gdk.Screen screen, out Gdk.Rectangle area, out Gtk.Orientation orientation);
+		public unowned string get_icon_name ();
+		public unowned Gdk.Pixbuf get_pixbuf ();
+		public unowned Gdk.Screen get_screen ();
 		public int get_size ();
-		public weak string get_stock ();
+		public unowned string get_stock ();
 		public Gtk.ImageType get_storage_type ();
 		public bool get_visible ();
 		public uint32 get_x11_window_id ();
@@ -3471,7 +3471,7 @@
 		public Gdk.ModifierType modifier;
 		public weak string stock_id;
 		public weak string translation_domain;
-		public weak Gtk.StockItem copy ();
+		public unowned Gtk.StockItem copy ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class Style : GLib.Object {
@@ -3524,9 +3524,9 @@
 		public int xthickness;
 		public int ythickness;
 		public void apply_default_background (Gdk.Window window, bool set_bg, Gtk.StateType state_type, Gdk.Rectangle area, int x, int y, int width, int height);
-		public weak Gtk.Style attach (Gdk.Window window);
+		public unowned Gtk.Style attach (Gdk.Window window);
 		[NoWrapper]
-		public virtual weak Gtk.Style clone ();
+		public virtual unowned Gtk.Style clone ();
 		public virtual void copy ();
 		public void detach ();
 		[NoWrapper]
@@ -3574,10 +3574,10 @@
 		[NoWrapper]
 		public virtual void init_from_rc (Gtk.RcStyle rc_style);
 		public bool lookup_color (string color_name, out Gdk.Color color);
-		public weak Gtk.IconSet lookup_icon_set (string stock_id);
+		public unowned Gtk.IconSet lookup_icon_set (string stock_id);
 		[CCode (has_construct_function = false)]
 		public Style ();
-		public virtual weak Gdk.Pixbuf render_icon (Gtk.IconSource source, Gtk.TextDirection direction, Gtk.StateType state, Gtk.IconSize size, Gtk.Widget widget, string detail);
+		public virtual unowned Gdk.Pixbuf render_icon (Gtk.IconSource source, Gtk.TextDirection direction, Gtk.StateType state, Gtk.IconSize size, Gtk.Widget widget, string detail);
 		public virtual void set_background (Gdk.Window window, Gtk.StateType state_type);
 		public virtual signal void realize ();
 		public virtual signal void unrealize ();
@@ -3717,7 +3717,7 @@
 		public int right_margin;
 		public weak Pango.TabArray tabs;
 		public Gtk.WrapMode wrap_mode;
-		public weak Gtk.TextAttributes copy ();
+		public unowned Gtk.TextAttributes copy ();
 		public void copy_values (Gtk.TextAttributes dest);
 		[CCode (has_construct_function = false)]
 		public TextAttributes ();
@@ -3739,9 +3739,9 @@
 		public void apply_tag_by_name (string name, Gtk.TextIter start, Gtk.TextIter end);
 		public bool backspace (Gtk.TextIter iter, bool interactive, bool default_editable);
 		public void copy_clipboard (Gtk.Clipboard clipboard);
-		public weak Gtk.TextChildAnchor create_child_anchor (Gtk.TextIter iter);
-		public weak Gtk.TextMark create_mark (string? mark_name, Gtk.TextIter where, bool left_gravity);
-		public weak Gtk.TextTag create_tag (string tag_name, ...);
+		public unowned Gtk.TextChildAnchor create_child_anchor (Gtk.TextIter iter);
+		public unowned Gtk.TextMark create_mark (string? mark_name, Gtk.TextIter where, bool left_gravity);
+		public unowned Gtk.TextTag create_tag (string tag_name, ...);
 		public void cut_clipboard (Gtk.Clipboard clipboard, bool default_editable);
 		public void @delete (Gtk.TextIter start, Gtk.TextIter end);
 		public bool delete_interactive (Gtk.TextIter start_iter, Gtk.TextIter end_iter, bool default_editable);
@@ -3753,11 +3753,11 @@
 		public void deserialize_set_can_create_tags (Gdk.Atom format, bool can_create_tags);
 		public void get_bounds (out Gtk.TextIter start, out Gtk.TextIter end);
 		public int get_char_count ();
-		public weak Gtk.TargetList get_copy_target_list ();
+		public unowned Gtk.TargetList get_copy_target_list ();
 		public Gdk.Atom get_deserialize_formats (int n_formats);
 		public void get_end_iter (out Gtk.TextIter iter);
 		public bool get_has_selection ();
-		public weak Gtk.TextMark get_insert ();
+		public unowned Gtk.TextMark get_insert ();
 		public void get_iter_at_child_anchor (out Gtk.TextIter iter, Gtk.TextChildAnchor anchor);
 		public void get_iter_at_line (out Gtk.TextIter iter, int line_number);
 		public void get_iter_at_line_index (out Gtk.TextIter iter, int line_number, int byte_index);
@@ -3765,16 +3765,16 @@
 		public void get_iter_at_mark (out Gtk.TextIter iter, Gtk.TextMark mark);
 		public void get_iter_at_offset (out Gtk.TextIter iter, int char_offset);
 		public int get_line_count ();
-		public weak Gtk.TextMark get_mark (string name);
+		public unowned Gtk.TextMark get_mark (string name);
 		public bool get_modified ();
-		public weak Gtk.TargetList get_paste_target_list ();
-		public weak Gtk.TextMark get_selection_bound ();
+		public unowned Gtk.TargetList get_paste_target_list ();
+		public unowned Gtk.TextMark get_selection_bound ();
 		public bool get_selection_bounds (out Gtk.TextIter start, out Gtk.TextIter end);
 		public Gdk.Atom get_serialize_formats (int n_formats);
-		public weak string get_slice (Gtk.TextIter start, Gtk.TextIter end, bool include_hidden_chars);
+		public unowned string get_slice (Gtk.TextIter start, Gtk.TextIter end, bool include_hidden_chars);
 		public void get_start_iter (out Gtk.TextIter iter);
-		public weak Gtk.TextTagTable get_tag_table ();
-		public weak string get_text (Gtk.TextIter start, Gtk.TextIter end, bool include_hidden_chars);
+		public unowned Gtk.TextTagTable get_tag_table ();
+		public unowned string get_text (Gtk.TextIter start, Gtk.TextIter end, bool include_hidden_chars);
 		public void insert (Gtk.TextIter iter, string text, int len);
 		public void insert_at_cursor (string text, int len);
 		public bool insert_interactive (Gtk.TextIter iter, string text, int len, bool default_editable);
@@ -3833,7 +3833,7 @@
 	public class TextChildAnchor : GLib.Object {
 		public void* segment;
 		public bool get_deleted ();
-		public weak GLib.List get_widgets ();
+		public unowned GLib.List get_widgets ();
 		[CCode (has_construct_function = false)]
 		public TextChildAnchor ();
 	}
@@ -3844,10 +3844,10 @@
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class TextMark : GLib.Object {
 		public void* segment;
-		public weak Gtk.TextBuffer get_buffer ();
+		public unowned Gtk.TextBuffer get_buffer ();
 		public bool get_deleted ();
 		public bool get_left_gravity ();
-		public weak string get_name ();
+		public unowned string get_name ();
 		public bool get_visible ();
 		[CCode (has_construct_function = false)]
 		public TextMark (string name, bool left_gravity);
@@ -4019,7 +4019,7 @@
 		public void add (Gtk.TextTag tag);
 		public void @foreach (Gtk.TextTagTableForeach func, void* data);
 		public int get_size ();
-		public weak Gtk.TextTag lookup (string name);
+		public unowned Gtk.TextTag lookup (string name);
 		[CCode (has_construct_function = false)]
 		public TextTagTable ();
 		public void remove (Gtk.TextTag tag);
@@ -4072,9 +4072,9 @@
 		public bool forward_display_line_end (Gtk.TextIter iter);
 		public bool get_accepts_tab ();
 		public int get_border_window_size (Gtk.TextWindowType type);
-		public weak Gtk.TextBuffer get_buffer ();
+		public unowned Gtk.TextBuffer get_buffer ();
 		public bool get_cursor_visible ();
-		public weak Gtk.TextAttributes get_default_attributes ();
+		public unowned Gtk.TextAttributes get_default_attributes ();
 		public bool get_editable ();
 		public int get_indent ();
 		public void get_iter_at_location (out Gtk.TextIter iter, int x, int y);
@@ -4089,9 +4089,9 @@
 		public int get_pixels_below_lines ();
 		public int get_pixels_inside_wrap ();
 		public int get_right_margin ();
-		public weak Pango.TabArray get_tabs ();
+		public unowned Pango.TabArray get_tabs ();
 		public void get_visible_rect (out Gdk.Rectangle visible_rect);
-		public weak Gdk.Window get_window (Gtk.TextWindowType win);
+		public unowned Gdk.Window get_window (Gtk.TextWindowType win);
 		public Gtk.TextWindowType get_window_type (Gdk.Window window);
 		public Gtk.WrapMode get_wrap_mode ();
 		public void move_child (Gtk.Widget child, int xpos, int ypos);
@@ -4211,11 +4211,11 @@
 	public class ToolButton : Gtk.ToolItem, Atk.Implementor, Gtk.Buildable {
 		[CCode (type = "GtkToolItem*", has_construct_function = false)]
 		public ToolButton.from_stock (string stock_id);
-		public weak string get_icon_name ();
-		public weak Gtk.Widget get_icon_widget ();
-		public weak string get_label ();
-		public weak Gtk.Widget get_label_widget ();
-		public weak string get_stock_id ();
+		public unowned string get_icon_name ();
+		public unowned Gtk.Widget get_icon_widget ();
+		public unowned string get_label ();
+		public unowned Gtk.Widget get_label_widget ();
+		public unowned string get_stock_id ();
 		public bool get_use_underline ();
 		[CCode (type = "GtkToolItem*", has_construct_function = false)]
 		public ToolButton (Gtk.Widget icon_widget, string label);
@@ -4240,7 +4240,7 @@
 		public Gtk.IconSize get_icon_size ();
 		public bool get_is_important ();
 		public Gtk.Orientation get_orientation ();
-		public weak Gtk.Widget get_proxy_menu_item (string menu_item_id);
+		public unowned Gtk.Widget get_proxy_menu_item (string menu_item_id);
 		public Gtk.ReliefStyle get_relief_style ();
 		public Gtk.ToolbarStyle get_toolbar_style ();
 		public bool get_use_drag_window ();
@@ -4249,7 +4249,7 @@
 		[CCode (has_construct_function = false)]
 		public ToolItem ();
 		public void rebuild_menu ();
-		public weak Gtk.Widget retrieve_proxy_menu_item ();
+		public unowned Gtk.Widget retrieve_proxy_menu_item ();
 		public void set_expand (bool expand);
 		public void set_homogeneous (bool homogeneous);
 		public void set_is_important (bool is_important);
@@ -4276,7 +4276,7 @@
 		public int get_drop_index (int x, int y);
 		public int get_item_index (Gtk.ToolItem item);
 		public int get_n_items ();
-		public weak Gtk.ToolItem get_nth_item (int n);
+		public unowned Gtk.ToolItem get_nth_item (int n);
 		public bool get_show_arrow ();
 		public bool get_tooltips ();
 		public void insert (Gtk.ToolItem item, int pos);
@@ -4318,16 +4318,16 @@
 	public class TreeModelFilter : GLib.Object, Gtk.TreeModel, Gtk.TreeDragSource {
 		public void clear_cache ();
 		public bool convert_child_iter_to_iter (out Gtk.TreeIter filter_iter, Gtk.TreeIter child_iter);
-		public weak Gtk.TreePath convert_child_path_to_path (Gtk.TreePath child_path);
+		public unowned Gtk.TreePath convert_child_path_to_path (Gtk.TreePath child_path);
 		public void convert_iter_to_child_iter (out Gtk.TreeIter child_iter, Gtk.TreeIter filter_iter);
-		public weak Gtk.TreePath convert_path_to_child_path (Gtk.TreePath filter_path);
-		public weak Gtk.TreeModel get_model ();
+		public unowned Gtk.TreePath convert_path_to_child_path (Gtk.TreePath filter_path);
+		public unowned Gtk.TreeModel get_model ();
 		[CCode (type = "GtkTreeModel*", has_construct_function = false)]
 		public TreeModelFilter (Gtk.TreeModel child_model, Gtk.TreePath? root);
 		public void refilter ();
 		public void set_modify_func (int n_columns, GLib.Type[] types, Gtk.TreeModelFilterModifyFunc func, void* data, Gtk.DestroyNotify destroy);
 		public void set_visible_column (int column);
-		public void set_visible_func (Gtk.TreeModelFilterVisibleFunc# func);
+		public void set_visible_func (owned Gtk.TreeModelFilterVisibleFunc func);
 		[NoAccessorMethod]
 		public Gtk.TreeModel child_model { get; construct; }
 		[NoAccessorMethod]
@@ -4353,10 +4353,10 @@
 		public int zero_ref_count;
 		public void clear_cache ();
 		public bool convert_child_iter_to_iter (out Gtk.TreeIter sort_iter, Gtk.TreeIter child_iter);
-		public weak Gtk.TreePath convert_child_path_to_path (Gtk.TreePath child_path);
+		public unowned Gtk.TreePath convert_child_path_to_path (Gtk.TreePath child_path);
 		public void convert_iter_to_child_iter (out Gtk.TreeIter child_iter, Gtk.TreeIter sorted_iter);
-		public weak Gtk.TreePath convert_path_to_child_path (Gtk.TreePath sorted_path);
-		public weak Gtk.TreeModel get_model ();
+		public unowned Gtk.TreePath convert_path_to_child_path (Gtk.TreePath sorted_path);
+		public unowned Gtk.TreeModel get_model ();
 		public bool iter_is_valid (Gtk.TreeIter iter);
 		public void reset_default_sort_func ();
 		[CCode (type = "GtkTreeModel*", has_construct_function = false)]
@@ -4379,7 +4379,7 @@
 		public TreePath.from_string (string path);
 		public int get_depth ();
 		[NoArrayLength]
-		public weak int[] get_indices ();
+		public unowned int[] get_indices ();
 		public bool is_ancestor (Gtk.TreePath descendant);
 		public bool is_descendant (Gtk.TreePath ancestor);
 		[CCode (has_construct_function = false)]
@@ -4387,15 +4387,15 @@
 		public void next ();
 		public void prepend_index (int index_);
 		public bool prev ();
-		public weak string to_string ();
+		public unowned string to_string ();
 		public bool up ();
 	}
 	[Compact]
 	[CCode (copy_function = "gtk_tree_row_reference_copy", cheader_filename = "gtk/gtk.h")]
 	public class TreeRowReference {
-		public weak Gtk.TreeRowReference copy ();
+		public unowned Gtk.TreeRowReference copy ();
 		public static void deleted (GLib.Object proxy, Gtk.TreePath path);
-		public weak Gtk.TreeModel get_model ();
+		public unowned Gtk.TreeModel get_model ();
 		public Gtk.TreePath get_path ();
 		public static void inserted (GLib.Object proxy, Gtk.TreePath path);
 		[CCode (has_construct_function = false)]
@@ -4414,9 +4414,9 @@
 		public weak Gtk.TreeSelectionFunc user_func;
 		public int count_selected_rows ();
 		public Gtk.SelectionMode get_mode ();
-		public bool get_selected (out weak Gtk.TreeModel model, out Gtk.TreeIter iter);
-		public GLib.List<Gtk.TreePath> get_selected_rows (out weak Gtk.TreeModel model);
-		public weak Gtk.TreeView get_tree_view ();
+		public bool get_selected (out unowned Gtk.TreeModel model, out Gtk.TreeIter iter);
+		public GLib.List<Gtk.TreePath> get_selected_rows (out unowned Gtk.TreeModel model);
+		public unowned Gtk.TreeView get_tree_view ();
 		public void* get_user_data ();
 		public bool iter_is_selected (Gtk.TreeIter iter);
 		public bool path_is_selected (Gtk.TreePath path);
@@ -4488,47 +4488,47 @@
 		public void convert_tree_to_widget_coords (int tx, int ty, int wx, int wy);
 		public void convert_widget_to_bin_window_coords (int wx, int wy, int bx, int by);
 		public void convert_widget_to_tree_coords (int wx, int wy, int tx, int ty);
-		public weak Gdk.Pixmap create_row_drag_icon (Gtk.TreePath path);
+		public unowned Gdk.Pixmap create_row_drag_icon (Gtk.TreePath path);
 		public void enable_model_drag_dest (Gtk.TargetEntry[] targets, Gdk.DragAction actions);
 		public void enable_model_drag_source (Gdk.ModifierType start_button_mask, Gtk.TargetEntry[] targets, Gdk.DragAction actions);
 		public void expand_all ();
 		public bool expand_row (Gtk.TreePath path, bool open_all);
 		public void expand_to_path (Gtk.TreePath path);
 		public void get_background_area (Gtk.TreePath path, Gtk.TreeViewColumn column, out Gdk.Rectangle rect);
-		public weak Gdk.Window get_bin_window ();
+		public unowned Gdk.Window get_bin_window ();
 		public void get_cell_area (Gtk.TreePath path, Gtk.TreeViewColumn column, out Gdk.Rectangle rect);
-		public weak Gtk.TreeViewColumn get_column (int n);
-		public weak GLib.List get_columns ();
-		public void get_cursor (out Gtk.TreePath? path, out weak Gtk.TreeViewColumn? focus_column);
+		public unowned Gtk.TreeViewColumn get_column (int n);
+		public unowned GLib.List get_columns ();
+		public void get_cursor (out Gtk.TreePath? path, out unowned Gtk.TreeViewColumn? focus_column);
 		public bool get_dest_row_at_pos (int drag_x, int drag_y, out Gtk.TreePath? path, out Gtk.TreeViewDropPosition pos);
 		public void get_drag_dest_row (out Gtk.TreePath? path, out Gtk.TreeViewDropPosition pos);
 		public bool get_enable_search ();
 		public bool get_enable_tree_lines ();
-		public weak Gtk.TreeViewColumn get_expander_column ();
+		public unowned Gtk.TreeViewColumn get_expander_column ();
 		public bool get_fixed_height_mode ();
 		public Gtk.TreeViewGridLines get_grid_lines ();
-		public weak Gtk.Adjustment get_hadjustment ();
+		public unowned Gtk.Adjustment get_hadjustment ();
 		public bool get_headers_clickable ();
 		public bool get_headers_visible ();
 		public bool get_hover_expand ();
 		public bool get_hover_selection ();
 		public int get_level_indentation ();
-		public weak Gtk.TreeModel get_model ();
-		public bool get_path_at_pos (int x, int y, out Gtk.TreePath? path, out weak Gtk.TreeViewColumn? column, out int cell_x, out int cell_y);
+		public unowned Gtk.TreeModel get_model ();
+		public bool get_path_at_pos (int x, int y, out Gtk.TreePath? path, out unowned Gtk.TreeViewColumn? column, out int cell_x, out int cell_y);
 		public bool get_reorderable ();
-		public weak Gtk.TreeViewRowSeparatorFunc get_row_separator_func ();
+		public unowned Gtk.TreeViewRowSeparatorFunc get_row_separator_func ();
 		public bool get_rubber_banding ();
 		public bool get_rules_hint ();
 		public int get_search_column ();
-		public weak Gtk.Entry get_search_entry ();
-		public weak Gtk.TreeViewSearchEqualFunc get_search_equal_func ();
-		public weak Gtk.TreeViewSearchPositionFunc get_search_position_func ();
-		public weak Gtk.TreeSelection get_selection ();
+		public unowned Gtk.Entry get_search_entry ();
+		public unowned Gtk.TreeViewSearchEqualFunc get_search_equal_func ();
+		public unowned Gtk.TreeViewSearchPositionFunc get_search_position_func ();
+		public unowned Gtk.TreeSelection get_selection ();
 		public bool get_show_expanders ();
 		public int get_tooltip_column ();
-		public bool get_tooltip_context (int x, int y, bool keyboard_tip, out weak Gtk.TreeModel model, out weak Gtk.TreePath path, out Gtk.TreeIter iter);
-		public weak Gtk.Adjustment get_vadjustment ();
-		public bool get_visible_range (out weak Gtk.TreePath start_path, out weak Gtk.TreePath end_path);
+		public bool get_tooltip_context (int x, int y, bool keyboard_tip, out unowned Gtk.TreeModel model, out unowned Gtk.TreePath path, out Gtk.TreeIter iter);
+		public unowned Gtk.Adjustment get_vadjustment ();
+		public bool get_visible_range (out unowned Gtk.TreePath start_path, out unowned Gtk.TreePath end_path);
 		public void get_visible_rect (out Gdk.Rectangle visible_rect);
 		public int insert_column (Gtk.TreeViewColumn column, int position);
 		public int insert_column_with_attributes (int position, string? title, Gtk.CellRenderer cell, ...);
@@ -4564,7 +4564,7 @@
 		public void set_rules_hint (bool setting);
 		public void set_search_column (int column);
 		public void set_search_entry (Gtk.Entry entry);
-		public void set_search_equal_func (Gtk.TreeViewSearchEqualFunc# search_equal_func);
+		public void set_search_equal_func (owned Gtk.TreeViewSearchEqualFunc search_equal_func);
 		public void set_search_position_func (Gtk.TreeViewSearchPositionFunc func, void* data, GLib.DestroyNotify destroy);
 		public void set_show_expanders (bool enabled);
 		public void set_tooltip_cell (Gtk.Tooltip tooltip, Gtk.TreePath path, Gtk.TreeViewColumn column, Gtk.CellRenderer cell);
@@ -4644,7 +4644,7 @@
 		public void cell_set_cell_data (Gtk.TreeModel tree_model, Gtk.TreeIter iter, bool is_expander, bool is_expanded);
 		public void focus_cell (Gtk.CellRenderer cell);
 		public float get_alignment ();
-		public weak GLib.List get_cell_renderers ();
+		public unowned GLib.List get_cell_renderers ();
 		public bool get_clickable ();
 		public bool get_expand ();
 		public int get_fixed_width ();
@@ -4657,10 +4657,10 @@
 		public bool get_sort_indicator ();
 		public Gtk.SortType get_sort_order ();
 		public int get_spacing ();
-		public weak string get_title ();
-		public weak Gtk.Widget get_tree_view ();
+		public unowned string get_title ();
+		public unowned Gtk.Widget get_tree_view ();
 		public bool get_visible ();
-		public weak Gtk.Widget get_widget ();
+		public unowned Gtk.Widget get_widget ();
 		public int get_width ();
 		[CCode (has_construct_function = false)]
 		public TreeViewColumn ();
@@ -4715,13 +4715,13 @@
 		public uint add_ui_from_file (string filename) throws GLib.Error;
 		public uint add_ui_from_string (string buffer, ssize_t length) throws GLib.Error;
 		public void ensure_update ();
-		public weak Gtk.AccelGroup get_accel_group ();
-		public virtual weak Gtk.Action get_action (string path);
-		public weak GLib.List get_action_groups ();
+		public unowned Gtk.AccelGroup get_accel_group ();
+		public virtual unowned Gtk.Action get_action (string path);
+		public unowned GLib.List get_action_groups ();
 		public bool get_add_tearoffs ();
-		public weak GLib.SList get_toplevels (Gtk.UIManagerItemType types);
-		public weak string get_ui ();
-		public virtual weak Gtk.Widget get_widget (string path);
+		public unowned GLib.SList get_toplevels (Gtk.UIManagerItemType types);
+		public unowned string get_ui ();
+		public virtual unowned Gtk.Widget get_widget (string path);
 		public void insert_action_group (Gtk.ActionGroup action_group, int pos);
 		[CCode (has_construct_function = false)]
 		public UIManager ();
@@ -4779,9 +4779,9 @@
 	public class Viewport : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
 		public weak Gdk.Window bin_window;
 		public weak Gdk.Window view_window;
-		public weak Gtk.Adjustment get_hadjustment ();
+		public unowned Gtk.Adjustment get_hadjustment ();
 		public Gtk.ShadowType get_shadow_type ();
-		public weak Gtk.Adjustment get_vadjustment ();
+		public unowned Gtk.Adjustment get_vadjustment ();
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Viewport (Gtk.Adjustment? hadjustment, Gtk.Adjustment? vadjustment);
 		public void set_hadjustment (Gtk.Adjustment adjustment);
@@ -4809,53 +4809,53 @@
 		public void add_events (int events);
 		public void add_mnemonic_label (Gtk.Widget label);
 		public bool child_focus (Gtk.DirectionType direction);
-		public void class_path (out uint path_length, out weak string path, out weak string path_reversed);
-		public weak Pango.Context create_pango_context ();
-		public weak Pango.Layout create_pango_layout (string? text);
-		public void destroyed (out weak Gtk.Widget widget_pointer);
+		public void class_path (out uint path_length, out unowned string path, out unowned string path_reversed);
+		public unowned Pango.Context create_pango_context ();
+		public unowned Pango.Layout create_pango_layout (string? text);
+		public void destroyed (out unowned Gtk.Widget widget_pointer);
 		[NoWrapper]
-		public virtual void dispatch_child_properties_changed (uint n_pspecs, out weak GLib.ParamSpec pspecs);
+		public virtual void dispatch_child_properties_changed (uint n_pspecs, out unowned GLib.ParamSpec pspecs);
 		public void ensure_style ();
 		public void error_bell ();
 		[CCode (cname = "gtk_widget_class_find_style_property")]
-		public class weak GLib.ParamSpec find_style_property (string property_name);
+		public class unowned GLib.ParamSpec find_style_property (string property_name);
 		public void freeze_child_notify ();
-		public virtual weak Atk.Object get_accessible ();
-		public weak Gtk.Action get_action ();
-		public weak Gtk.Widget get_ancestor (GLib.Type widget_type);
+		public virtual unowned Atk.Object get_accessible ();
+		public unowned Gtk.Action get_action ();
+		public unowned Gtk.Widget get_ancestor (GLib.Type widget_type);
 		public void get_child_requisition (out Gtk.Requisition requisition);
 		public bool get_child_visible ();
-		public weak Gtk.Clipboard get_clipboard (Gdk.Atom selection);
-		public weak Gdk.Colormap get_colormap ();
-		public weak string get_composite_name ();
-		public static weak Gdk.Colormap get_default_colormap ();
+		public unowned Gtk.Clipboard get_clipboard (Gdk.Atom selection);
+		public unowned Gdk.Colormap get_colormap ();
+		public unowned string get_composite_name ();
+		public static unowned Gdk.Colormap get_default_colormap ();
 		public static Gtk.TextDirection get_default_direction ();
-		public static weak Gtk.Style get_default_style ();
-		public static weak Gdk.Visual get_default_visual ();
+		public static unowned Gtk.Style get_default_style ();
+		public static unowned Gdk.Visual get_default_visual ();
 		public Gtk.TextDirection get_direction ();
-		public weak Gdk.Display get_display ();
+		public unowned Gdk.Display get_display ();
 		public int get_events ();
 		public Gdk.ExtensionMode get_extension_events ();
 		[CCode (cname = "GTK_WIDGET_FLAGS")]
 		public Gtk.WidgetFlags get_flags ();
 		public bool get_has_tooltip ();
-		public weak Gtk.RcStyle get_modifier_style ();
+		public unowned Gtk.RcStyle get_modifier_style ();
 		public bool get_no_show_all ();
-		public weak Pango.Context get_pango_context ();
-		public weak Gtk.Widget get_parent ();
-		public weak Gdk.Window get_parent_window ();
+		public unowned Pango.Context get_pango_context ();
+		public unowned Gtk.Widget get_parent ();
+		public unowned Gdk.Window get_parent_window ();
 		public void get_pointer (out int x, out int y);
-		public weak Gdk.Window get_root_window ();
-		public weak Gdk.Screen get_screen ();
-		public weak Gtk.Settings get_settings ();
+		public unowned Gdk.Window get_root_window ();
+		public unowned Gdk.Screen get_screen ();
+		public unowned Gtk.Settings get_settings ();
 		public void get_size_request (out int width, out int height);
-		public weak Gdk.Pixmap get_snapshot (Gdk.Rectangle clip_rect);
-		public weak Gtk.Style get_style ();
-		public weak string get_tooltip_markup ();
-		public weak string get_tooltip_text ();
-		public weak Gtk.Window get_tooltip_window ();
-		public weak Gtk.Widget get_toplevel ();
-		public weak Gdk.Visual get_visual ();
+		public unowned Gdk.Pixmap get_snapshot (Gdk.Rectangle clip_rect);
+		public unowned Gtk.Style get_style ();
+		public unowned string get_tooltip_markup ();
+		public unowned string get_tooltip_text ();
+		public unowned Gtk.Window get_tooltip_window ();
+		public unowned Gtk.Widget get_toplevel ();
+		public unowned Gdk.Visual get_visual ();
 		public void grab_default ();
 		[CCode (cname = "GTK_WIDGET_HAS_GRAB")]
 		public bool has_grab ();
@@ -4886,10 +4886,10 @@
 		public bool is_realized ();
 		[CCode (cname = "GTK_WIDGET_TOPLEVEL")]
 		public bool is_toplevel ();
-		public weak GLib.List list_accel_closures ();
-		public weak GLib.List list_mnemonic_labels ();
+		public unowned GLib.List list_accel_closures ();
+		public unowned GLib.List list_mnemonic_labels ();
 		[CCode (cname = "gtk_widget_class_list_style_properties")]
-		public class weak GLib.ParamSpec list_style_properties (uint n_properties);
+		public class unowned GLib.ParamSpec list_style_properties (uint n_properties);
 		public void modify_base (Gtk.StateType state, Gdk.Color? color);
 		public void modify_bg (Gtk.StateType state, Gdk.Color? color);
 		public void modify_cursor (Gdk.Color? primary, Gdk.Color? secondary);
@@ -4898,7 +4898,7 @@
 		public void modify_style (Gtk.RcStyle style);
 		public void modify_text (Gtk.StateType state, Gdk.Color? color);
 		public Widget (GLib.Type type, ...);
-		public void path (out uint path_length, out weak string path, out weak string path_reversed);
+		public void path (out uint path_length, out unowned string path, out unowned string path_reversed);
 		public static void pop_colormap ();
 		public static void pop_composite_child ();
 		public static void push_colormap (Gdk.Colormap cmap);
@@ -4907,7 +4907,7 @@
 		public void queue_draw_area (int x, int y, int width, int height);
 		public void queue_resize ();
 		public void queue_resize_no_redraw ();
-		public weak Gdk.Region region_intersect (Gdk.Region region);
+		public unowned Gdk.Region region_intersect (Gdk.Region region);
 		public bool remove_accelerator (Gtk.AccelGroup accel_group, uint accel_key, Gdk.ModifierType accel_mods);
 		public void remove_mnemonic_label (Gtk.Widget label);
 		public Gdk.Pixbuf render_icon (string stock_id, Gtk.IconSize size, string? detail);
@@ -5126,35 +5126,35 @@
 		public void fullscreen ();
 		public bool get_accept_focus ();
 		public bool get_decorated ();
-		public static weak GLib.List get_default_icon_list ();
+		public static unowned GLib.List get_default_icon_list ();
 		public void get_default_size (out int width, out int height);
 		public bool get_deletable ();
 		public bool get_destroy_with_parent ();
-		public weak Gtk.Widget get_focus ();
+		public unowned Gtk.Widget get_focus ();
 		public bool get_focus_on_map ();
 		public void get_frame_dimensions (int left, int top, int right, int bottom);
 		public Gdk.Gravity get_gravity ();
-		public weak Gtk.WindowGroup get_group ();
+		public unowned Gtk.WindowGroup get_group ();
 		public bool get_has_frame ();
-		public weak Gdk.Pixbuf get_icon ();
-		public weak GLib.List get_icon_list ();
-		public weak string get_icon_name ();
+		public unowned Gdk.Pixbuf get_icon ();
+		public unowned GLib.List get_icon_list ();
+		public unowned string get_icon_name ();
 		public Gdk.ModifierType get_mnemonic_modifier ();
 		public bool get_modal ();
 		public double get_opacity ();
 		public void get_position (out int root_x, out int root_y);
 		public bool get_resizable ();
-		public weak string get_role ();
-		public weak Gdk.Screen get_screen ();
+		public unowned string get_role ();
+		public unowned Gdk.Screen get_screen ();
 		public void get_size (out int width, out int height);
 		public bool get_skip_pager_hint ();
 		public bool get_skip_taskbar_hint ();
-		public weak string get_title ();
-		public weak Gtk.Window get_transient_for ();
+		public unowned string get_title ();
+		public unowned Gtk.Window get_transient_for ();
 		public Gdk.WindowTypeHint get_type_hint ();
 		public bool get_urgency_hint ();
 		public void iconify ();
-		public static weak GLib.List list_toplevels ();
+		public static unowned GLib.List list_toplevels ();
 		public void maximize ();
 		public bool mnemonic_activate (uint keyval, Gdk.ModifierType modifier);
 		public void move (int x, int y);
@@ -5270,12 +5270,12 @@
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public interface Buildable {
 		public abstract void add_child (Gtk.Builder builder, GLib.Object child, string type);
-		public abstract weak GLib.Object construct_child (Gtk.Builder builder, string name);
+		public abstract unowned GLib.Object construct_child (Gtk.Builder builder, string name);
 		public abstract void custom_finished (Gtk.Builder builder, GLib.Object child, string tagname, void* data);
 		public abstract void custom_tag_end (Gtk.Builder builder, GLib.Object child, string tagname, void* data);
 		public abstract bool custom_tag_start (Gtk.Builder builder, GLib.Object child, string tagname, GLib.MarkupParser parser, void* data);
-		public abstract weak GLib.Object get_internal_child (Gtk.Builder builder, string childname);
-		public abstract weak string get_name ();
+		public abstract unowned GLib.Object get_internal_child (Gtk.Builder builder, string childname);
+		public abstract unowned string get_name ();
 		public abstract void parser_finished (Gtk.Builder builder);
 		public abstract void set_buildable_property (Gtk.Builder builder, string name, GLib.Value value);
 		public abstract void set_name (string name);
@@ -5292,12 +5292,12 @@
 		public abstract void add_attribute (Gtk.CellRenderer cell, string attribute, int column);
 		public abstract void clear ();
 		public abstract void clear_attributes (Gtk.CellRenderer cell);
-		public abstract weak GLib.List get_cells ();
+		public abstract unowned GLib.List get_cells ();
 		public abstract void pack_end (Gtk.CellRenderer cell, bool expand);
 		public abstract void pack_start (Gtk.CellRenderer cell, bool expand);
 		public abstract void reorder (Gtk.CellRenderer cell, int position);
 		public void set_attributes (Gtk.CellRenderer cell, ...);
-		public abstract void set_cell_data_func (Gtk.CellRenderer cell, Gtk.CellLayoutDataFunc# func);
+		public abstract void set_cell_data_func (Gtk.CellRenderer cell, owned Gtk.CellLayoutDataFunc func);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public interface Editable {
@@ -5308,7 +5308,7 @@
 		public abstract void do_delete_text (int start_pos, int end_pos);
 		[NoWrapper]
 		public abstract void do_insert_text (string text, int length, int position);
-		public abstract weak string get_chars (int start_pos, int end_pos);
+		public abstract unowned string get_chars (int start_pos, int end_pos);
 		public bool get_editable ();
 		public abstract int get_position ();
 		public abstract bool get_selection_bounds (int start, int end);
@@ -5331,26 +5331,26 @@
 		public bool add_shortcut_folder_uri (string uri) throws GLib.Error;
 		public static GLib.Quark error_quark ();
 		public Gtk.FileChooserAction get_action ();
-		public weak string get_current_folder ();
-		public weak string get_current_folder_uri ();
+		public unowned string get_current_folder ();
+		public unowned string get_current_folder_uri ();
 		public bool get_do_overwrite_confirmation ();
-		public weak Gtk.Widget get_extra_widget ();
-		public weak string get_filename ();
-		public weak GLib.SList get_filenames ();
-		public weak Gtk.FileFilter get_filter ();
+		public unowned Gtk.Widget get_extra_widget ();
+		public unowned string get_filename ();
+		public unowned GLib.SList get_filenames ();
+		public unowned Gtk.FileFilter get_filter ();
 		public bool get_local_only ();
-		public weak string get_preview_filename ();
-		public weak string get_preview_uri ();
-		public weak Gtk.Widget get_preview_widget ();
+		public unowned string get_preview_filename ();
+		public unowned string get_preview_uri ();
+		public unowned Gtk.Widget get_preview_widget ();
 		public bool get_preview_widget_active ();
 		public bool get_select_multiple ();
 		public bool get_show_hidden ();
-		public weak string get_uri ();
-		public weak GLib.SList get_uris ();
+		public unowned string get_uri ();
+		public unowned GLib.SList get_uris ();
 		public bool get_use_preview_label ();
-		public weak GLib.SList list_filters ();
-		public weak GLib.SList list_shortcut_folder_uris ();
-		public weak GLib.SList list_shortcut_folders ();
+		public unowned GLib.SList list_filters ();
+		public unowned GLib.SList list_shortcut_folder_uris ();
+		public unowned GLib.SList list_shortcut_folders ();
 		public void remove_filter (Gtk.FileFilter filter);
 		public bool remove_shortcut_folder (string folder) throws GLib.Error;
 		public bool remove_shortcut_folder_uri (string uri) throws GLib.Error;
@@ -5407,22 +5407,22 @@
 	public interface RecentChooser : GLib.Object {
 		public abstract void add_filter (Gtk.RecentFilter filter);
 		public static GLib.Quark error_quark ();
-		public weak Gtk.RecentInfo get_current_item ();
-		public abstract weak string get_current_uri ();
-		public weak Gtk.RecentFilter get_filter ();
-		public abstract weak GLib.List get_items ();
+		public unowned Gtk.RecentInfo get_current_item ();
+		public abstract unowned string get_current_uri ();
+		public unowned Gtk.RecentFilter get_filter ();
+		public abstract unowned GLib.List get_items ();
 		public int get_limit ();
 		public bool get_local_only ();
 		[NoWrapper]
-		public abstract weak Gtk.RecentManager get_recent_manager ();
+		public abstract unowned Gtk.RecentManager get_recent_manager ();
 		public bool get_select_multiple ();
 		public bool get_show_icons ();
 		public bool get_show_not_found ();
 		public bool get_show_private ();
 		public bool get_show_tips ();
 		public Gtk.RecentSortType get_sort_type ();
-		public weak string get_uris (size_t length);
-		public abstract weak GLib.SList list_filters ();
+		public unowned string get_uris (size_t length);
+		public abstract unowned GLib.SList list_filters ();
 		public abstract void remove_filter (Gtk.RecentFilter filter);
 		public abstract void select_all ();
 		public abstract bool select_uri (string uri) throws GLib.Error;
@@ -5509,9 +5509,9 @@
 	public interface TreeSortable : Gtk.TreeModel, GLib.Object {
 		public abstract bool get_sort_column_id (out int sort_column_id, out Gtk.SortType order);
 		public abstract bool has_default_sort_func ();
-		public abstract void set_default_sort_func (Gtk.TreeIterCompareFunc# sort_func);
+		public abstract void set_default_sort_func (owned Gtk.TreeIterCompareFunc sort_func);
 		public abstract void set_sort_column_id (int sort_column_id, Gtk.SortType order);
-		public abstract void set_sort_func (int sort_column_id, Gtk.TreeIterCompareFunc# sort_func);
+		public abstract void set_sort_func (int sort_column_id, owned Gtk.TreeIterCompareFunc sort_func);
 		[HasEmitter]
 		public virtual signal void sort_column_changed ();
 	}
@@ -5644,26 +5644,26 @@
 		public bool forward_word_ends (int count);
 		public void free ();
 		public bool get_attributes (Gtk.TextAttributes values);
-		public weak Gtk.TextBuffer get_buffer ();
+		public unowned Gtk.TextBuffer get_buffer ();
 		public int get_bytes_in_line ();
 		public unichar get_char ();
 		public int get_chars_in_line ();
-		public weak Gtk.TextChildAnchor get_child_anchor ();
-		public weak Pango.Language get_language ();
+		public unowned Gtk.TextChildAnchor get_child_anchor ();
+		public unowned Pango.Language get_language ();
 		public int get_line ();
 		public int get_line_index ();
 		public int get_line_offset ();
-		public weak GLib.SList get_marks ();
+		public unowned GLib.SList get_marks ();
 		public int get_offset ();
-		public weak Gdk.Pixbuf get_pixbuf ();
-		public weak string get_slice (Gtk.TextIter end);
-		public weak GLib.SList get_tags ();
-		public weak string get_text (Gtk.TextIter end);
-		public weak GLib.SList get_toggled_tags (bool toggled_on);
+		public unowned Gdk.Pixbuf get_pixbuf ();
+		public unowned string get_slice (Gtk.TextIter end);
+		public unowned GLib.SList get_tags ();
+		public unowned string get_text (Gtk.TextIter end);
+		public unowned GLib.SList get_toggled_tags (bool toggled_on);
 		public int get_visible_line_index ();
 		public int get_visible_line_offset ();
-		public weak string get_visible_slice (Gtk.TextIter end);
-		public weak string get_visible_text (Gtk.TextIter end);
+		public unowned string get_visible_slice (Gtk.TextIter end);
+		public unowned string get_visible_text (Gtk.TextIter end);
 		public bool has_tag (Gtk.TextTag tag);
 		public bool in_range (Gtk.TextIter start, Gtk.TextIter end);
 		public bool inside_sentence ();
@@ -6695,7 +6695,7 @@
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static delegate void ModuleInitFunc (int argc, string argv);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public delegate weak Gtk.Notebook NotebookWindowCreationFunc (Gtk.Notebook source, Gtk.Widget page, int x, int y);
+	public delegate unowned Gtk.Notebook NotebookWindowCreationFunc (Gtk.Notebook source, Gtk.Widget page, int x, int y);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public delegate void PageSetupDoneFunc (Gtk.PageSetup page_setup);
 	[CCode (cheader_filename = "gtk/gtk.h")]
@@ -6719,7 +6719,7 @@
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public delegate void TextTagTableForeach (Gtk.TextTag tag);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static delegate weak string TranslateFunc (string path, void* func_data);
+	public static delegate unowned string TranslateFunc (string path, void* func_data);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public delegate void TreeCellDataFunc (Gtk.TreeViewColumn tree_column, Gtk.CellRenderer cell, Gtk.TreeModel tree_model, Gtk.TreeIter iter);
 	[CCode (cheader_filename = "gtk/gtk.h")]
@@ -7057,13 +7057,13 @@
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static bool accel_groups_activate (GLib.Object object, uint accel_key, Gdk.ModifierType accel_mods);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static weak GLib.SList accel_groups_from_object (GLib.Object object);
+	public static unowned GLib.SList accel_groups_from_object (GLib.Object object);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static uint accelerator_get_default_mod_mask ();
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static weak string accelerator_get_label (uint accelerator_key, Gdk.ModifierType accelerator_mods);
+	public static unowned string accelerator_get_label (uint accelerator_key, Gdk.ModifierType accelerator_mods);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static weak string accelerator_name (uint accelerator_key, Gdk.ModifierType accelerator_mods);
+	public static unowned string accelerator_name (uint accelerator_key, Gdk.ModifierType accelerator_mods);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void accelerator_parse (string accelerator, out uint accelerator_key, out Gdk.ModifierType accelerator_mods);
 	[CCode (cheader_filename = "gtk/gtk.h")]
@@ -7077,11 +7077,11 @@
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static bool bindings_activate_event (Gtk.Object object, Gdk.EventKey event);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static weak string check_version (uint required_major, uint required_minor, uint required_micro);
+	public static unowned string check_version (uint required_major, uint required_minor, uint required_micro);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void disable_setlocale ();
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static weak Gdk.DragContext drag_begin (Gtk.Widget widget, Gtk.TargetList targets, Gdk.DragAction actions, int button, Gdk.Event event);
+	public static unowned Gdk.DragContext drag_begin (Gtk.Widget widget, Gtk.TargetList targets, Gdk.DragAction actions, int button, Gdk.Event event);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static bool drag_check_threshold (Gtk.Widget widget, int start_x, int start_y, int current_x, int current_y);
 	[CCode (cheader_filename = "gtk/gtk.h")]
@@ -7093,7 +7093,7 @@
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static Gdk.Atom drag_dest_find_target (Gtk.Widget widget, Gdk.DragContext context, Gtk.TargetList target_list);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static weak Gtk.TargetList drag_dest_get_target_list (Gtk.Widget widget);
+	public static unowned Gtk.TargetList drag_dest_get_target_list (Gtk.Widget widget);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static bool drag_dest_get_track_motion (Gtk.Widget widget);
 	[CCode (cheader_filename = "gtk/gtk.h")]
@@ -7111,7 +7111,7 @@
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void drag_get_data (Gtk.Widget widget, Gdk.DragContext context, Gdk.Atom target, uint32 time_);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static weak Gtk.Widget drag_get_source_widget (Gdk.DragContext context);
+	public static unowned Gtk.Widget drag_get_source_widget (Gdk.DragContext context);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void drag_highlight (Gtk.Widget widget);
 	[CCode (cheader_filename = "gtk/gtk.h")]
@@ -7133,7 +7133,7 @@
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void drag_source_add_uri_targets (Gtk.Widget widget);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static weak Gtk.TargetList drag_source_get_target_list (Gtk.Widget widget);
+	public static unowned Gtk.TargetList drag_source_get_target_list (Gtk.Widget widget);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void drag_source_set (Gtk.Widget widget, Gdk.ModifierType start_button_mask, Gtk.TargetEntry[] targets, Gdk.DragAction actions);
 	[CCode (cheader_filename = "gtk/gtk.h")]
@@ -7155,7 +7155,7 @@
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static bool events_pending ();
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static weak Gdk.GC gc_get (int depth, Gdk.Colormap colormap, Gdk.GCValues values, Gdk.GCValuesMask values_mask);
+	public static unowned Gdk.GC gc_get (int depth, Gdk.Colormap colormap, Gdk.GCValues values, Gdk.GCValuesMask values_mask);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void gc_release (Gdk.GC gc);
 	[CCode (cheader_filename = "gtk/gtk.h")]
@@ -7165,21 +7165,21 @@
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static uint32 get_current_event_time ();
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static weak Pango.Language get_default_language ();
+	public static unowned Pango.Language get_default_language ();
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static weak Gtk.Widget get_event_widget (Gdk.Event event);
+	public static unowned Gtk.Widget get_event_widget (Gdk.Event event);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static GLib.OptionGroup get_option_group (bool open_default_display);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void grab_add (Gtk.Widget widget);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static weak Gtk.Widget grab_get_current ();
+	public static unowned Gtk.Widget grab_get_current ();
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void grab_remove (Gtk.Widget widget);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static Gtk.IconSize icon_size_from_name (string name);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static weak string icon_size_get_name (Gtk.IconSize size);
+	public static unowned string icon_size_get_name (Gtk.IconSize size);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static bool icon_size_lookup (Gtk.IconSize size, out int width, out int height);
 	[CCode (cheader_filename = "gtk/gtk.h")]
@@ -7191,13 +7191,13 @@
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static GLib.Type identifier_get_type ();
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static void init ([CCode (array_length_pos = 0.9)] ref weak string[] argv);
+	public static void init ([CCode (array_length_pos = 0.9)] ref unowned string[] argv);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void init_add (Gtk.Function function, void* data);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static bool init_check ([CCode (array_length_pos = 0.9)] ref weak string[] argv);
+	public static bool init_check ([CCode (array_length_pos = 0.9)] ref unowned string[] argv);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static bool init_with_args ([CCode (array_length_pos = 0.9)] ref weak string[] argv, string parameter_string, GLib.OptionEntry[] entries, string translation_domain) throws GLib.Error;
+	public static bool init_with_args ([CCode (array_length_pos = 0.9)] ref unowned string[] argv, string parameter_string, GLib.OptionEntry[] entries, string translation_domain) throws GLib.Error;
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static uint key_snooper_install (Gtk.KeySnoopFunc snooper, void* func_data);
 	[CCode (cheader_filename = "gtk/gtk.h")]
@@ -7259,7 +7259,7 @@
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static GLib.Quark print_error_quark ();
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static weak Gtk.PageSetup print_run_page_setup_dialog (Gtk.Window parent, Gtk.PageSetup page_setup, Gtk.PrintSettings settings);
+	public static unowned Gtk.PageSetup print_run_page_setup_dialog (Gtk.Window parent, Gtk.PageSetup page_setup, Gtk.PrintSettings settings);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void print_run_page_setup_dialog_async (Gtk.Window parent, Gtk.PageSetup page_setup, Gtk.PrintSettings settings, Gtk.PageSetupDoneFunc done_cb, void* data);
 	[CCode (cheader_filename = "gtk/gtk.h")]
@@ -7275,23 +7275,23 @@
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void rc_add_default_file (string filename);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static weak string rc_find_module_in_path (string module_file);
+	public static unowned string rc_find_module_in_path (string module_file);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static weak string rc_find_pixmap_in_path (Gtk.Settings settings, GLib.Scanner scanner, string pixmap_file);
+	public static unowned string rc_find_pixmap_in_path (Gtk.Settings settings, GLib.Scanner scanner, string pixmap_file);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static weak string rc_get_default_files ();
+	public static unowned string rc_get_default_files ();
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static weak string rc_get_im_module_file ();
+	public static unowned string rc_get_im_module_file ();
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static weak string rc_get_im_module_path ();
+	public static unowned string rc_get_im_module_path ();
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static weak string rc_get_module_dir ();
+	public static unowned string rc_get_module_dir ();
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static weak Gtk.Style rc_get_style (Gtk.Widget widget);
+	public static unowned Gtk.Style rc_get_style (Gtk.Widget widget);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static weak Gtk.Style rc_get_style_by_paths (Gtk.Settings settings, string widget_path, string class_path, GLib.Type type);
+	public static unowned Gtk.Style rc_get_style_by_paths (Gtk.Settings settings, string widget_path, string class_path, GLib.Type type);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static weak string rc_get_theme_dir ();
+	public static unowned string rc_get_theme_dir ();
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void rc_parse (string filename);
 	[CCode (cheader_filename = "gtk/gtk.h")]
@@ -7311,7 +7311,7 @@
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void rc_reset_styles (Gtk.Settings settings);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static weak GLib.Scanner rc_scanner_new ();
+	public static unowned GLib.Scanner rc_scanner_new ();
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void rc_set_default_files (string filenames);
 	[CCode (cheader_filename = "gtk/gtk.h")]
@@ -7331,7 +7331,7 @@
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void selection_remove_all (Gtk.Widget widget);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static weak string set_locale ();
+	public static unowned string set_locale ();
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void show_about_dialog (Gtk.Window parent, ...);
 	[CCode (cheader_filename = "gtk/gtk.h")]
@@ -7341,7 +7341,7 @@
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void stock_add_static (Gtk.StockItem[] items);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static weak GLib.SList stock_list_ids ();
+	public static unowned GLib.SList stock_list_ids ();
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static bool stock_lookup (string stock_id, Gtk.StockItem item);
 	[CCode (cheader_filename = "gtk/gtk.h")]
@@ -7359,21 +7359,21 @@
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static bool targets_include_uri (Gdk.Atom[] targets);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static weak Gtk.Widget test_create_simple_window (string window_title, string dialog_text);
+	public static unowned Gtk.Widget test_create_simple_window (string window_title, string dialog_text);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static weak Gtk.Widget test_create_widget (GLib.Type widget_type, ...);
+	public static unowned Gtk.Widget test_create_widget (GLib.Type widget_type, ...);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static weak Gtk.Widget test_display_button_window (string window_title, string dialog_text);
+	public static unowned Gtk.Widget test_display_button_window (string window_title, string dialog_text);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static weak Gtk.Widget test_find_label (Gtk.Widget widget, string label_pattern);
+	public static unowned Gtk.Widget test_find_label (Gtk.Widget widget, string label_pattern);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static weak Gtk.Widget test_find_sibling (Gtk.Widget base_widget, GLib.Type widget_type);
+	public static unowned Gtk.Widget test_find_sibling (Gtk.Widget base_widget, GLib.Type widget_type);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static weak Gtk.Widget test_find_widget (Gtk.Widget widget, string label_pattern, GLib.Type widget_type);
+	public static unowned Gtk.Widget test_find_widget (Gtk.Widget widget, string label_pattern, GLib.Type widget_type);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static void test_init (int argcp, out weak string argvp);
+	public static void test_init (int argcp, out unowned string argvp);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static weak GLib.Type[] test_list_all_types (uint n_types);
+	public static unowned GLib.Type[] test_list_all_types (uint n_types);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void test_register_all_types ();
 	[CCode (cheader_filename = "gtk/gtk.h")]
@@ -7383,7 +7383,7 @@
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static bool test_spin_button_click (Gtk.SpinButton spinner, uint button, bool upwards);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static weak string test_text_get (Gtk.Widget widget);
+	public static unowned string test_text_get (Gtk.Widget widget);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void test_text_set (Gtk.Widget widget, string str);
 	[CCode (cheader_filename = "gtk/gtk.h")]
@@ -7391,7 +7391,7 @@
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static bool test_widget_send_key (Gtk.Widget widget, uint keyval, Gdk.ModifierType modifiers);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static bool tree_get_row_drag_data (Gtk.SelectionData selection_data, out weak Gtk.TreeModel tree_model, out weak Gtk.TreePath path);
+	public static bool tree_get_row_drag_data (Gtk.SelectionData selection_data, out unowned Gtk.TreeModel tree_model, out unowned Gtk.TreePath path);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static bool tree_set_row_drag_data (Gtk.SelectionData selection_data, Gtk.TreeModel tree_model, Gtk.TreePath path);
 }

Modified: trunk/vapi/pango.vapi
==============================================================================
--- trunk/vapi/pango.vapi	(original)
+++ trunk/vapi/pango.vapi	Fri Dec 19 21:56:41 2008
@@ -52,10 +52,10 @@
 	[Compact]
 	[CCode (copy_function = "pango_attr_iterator_copy", free_function = "pango_attr_iterator_destroy", cheader_filename = "pango/pango.h")]
 	public class AttrIterator {
-		public weak Pango.AttrIterator copy ();
-		public weak Pango.Attribute get (Pango.AttrType type);
-		public weak GLib.SList get_attrs ();
-		public void get_font (Pango.FontDescription desc, out weak Pango.Language language, GLib.SList extra_attrs);
+		public unowned Pango.AttrIterator copy ();
+		public unowned Pango.Attribute get (Pango.AttrType type);
+		public unowned GLib.SList get_attrs ();
+		public void get_font (Pango.FontDescription desc, out unowned Pango.Language language, GLib.SList extra_attrs);
 		public bool next ();
 		public void range (int start, int end);
 	}
@@ -71,9 +71,9 @@
 	[CCode (ref_function = "pango_attr_list_ref", unref_function = "pango_attr_list_unref", cheader_filename = "pango/pango.h")]
 	public class AttrList {
 		public void change (Pango.Attribute attr);
-		public weak Pango.AttrList copy ();
-		public weak Pango.AttrList filter (Pango.AttrFilterFunc func, void* data);
-		public weak Pango.AttrIterator get_iterator ();
+		public unowned Pango.AttrList copy ();
+		public unowned Pango.AttrList filter (Pango.AttrFilterFunc func, void* data);
+		public unowned Pango.AttrIterator get_iterator ();
 		public void insert (Pango.Attribute attr);
 		public void insert_before (Pango.Attribute attr);
 		[CCode (has_construct_function = false)]
@@ -115,7 +115,7 @@
 		public uint end_index;
 		public weak Pango.AttrClass klass;
 		public uint start_index;
-		public weak Pango.Attribute copy ();
+		public unowned Pango.Attribute copy ();
 		public bool equal (Pango.Attribute attr2);
 		public void init (Pango.AttrClass klass);
 	}
@@ -123,16 +123,16 @@
 	public class Context : GLib.Object {
 		public Pango.Direction get_base_dir ();
 		public Pango.Gravity get_base_gravity ();
-		public weak Pango.FontDescription get_font_description ();
-		public weak Pango.FontMap get_font_map ();
+		public unowned Pango.FontDescription get_font_description ();
+		public unowned Pango.FontMap get_font_map ();
 		public Pango.Gravity get_gravity ();
 		public Pango.GravityHint get_gravity_hint ();
-		public weak Pango.Language get_language ();
+		public unowned Pango.Language get_language ();
 		public Pango.Matrix get_matrix ();
-		public weak Pango.FontMetrics get_metrics (Pango.FontDescription desc, Pango.Language language);
+		public unowned Pango.FontMetrics get_metrics (Pango.FontDescription desc, Pango.Language language);
 		public void list_families (Pango.FontFamily[] families);
-		public weak Pango.Font load_font (Pango.FontDescription desc);
-		public weak Pango.Fontset load_fontset (Pango.FontDescription desc, Pango.Language language);
+		public unowned Pango.Font load_font (Pango.FontDescription desc);
+		public unowned Pango.Fontset load_fontset (Pango.FontDescription desc, Pango.Language language);
 		public void set_base_dir (Pango.Direction direction);
 		public void set_base_gravity (Pango.Gravity gravity);
 		public void set_font_description (Pango.FontDescription desc);
@@ -147,8 +147,8 @@
 	[Compact]
 	[CCode (ref_function = "pango_coverage_ref", unref_function = "pango_coverage_unref", cheader_filename = "pango/pango.h")]
 	public class Coverage {
-		public weak Pango.Coverage copy ();
-		public static weak Pango.Coverage from_bytes (uchar[][] bytes);
+		public unowned Pango.Coverage copy ();
+		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)]
@@ -166,24 +166,24 @@
 	}
 	[CCode (cheader_filename = "pango/pango.h")]
 	public class Font : GLib.Object {
-		public weak Pango.FontDescription describe ();
-		public weak Pango.FontDescription describe_with_absolute_size ();
+		public unowned Pango.FontDescription describe ();
+		public unowned Pango.FontDescription describe_with_absolute_size ();
 		public static void descriptions_free (Pango.FontDescription[] descs);
-		public weak Pango.EngineShape find_shaper (Pango.Language language, uint32 ch);
-		public weak Pango.Coverage get_coverage (Pango.Language language);
-		public weak Pango.FontMap get_font_map ();
+		public unowned Pango.EngineShape find_shaper (Pango.Language language, uint32 ch);
+		public unowned Pango.Coverage get_coverage (Pango.Language language);
+		public unowned Pango.FontMap get_font_map ();
 		public void get_glyph_extents (Pango.Glyph glyph, out Pango.Rectangle ink_rect, out Pango.Rectangle logical_rect);
-		public weak Pango.FontMetrics get_metrics (Pango.Language language);
+		public unowned Pango.FontMetrics get_metrics (Pango.Language language);
 	}
 	[Compact]
 	[CCode (copy_function = "pango_font_description_copy", cheader_filename = "pango/pango.h")]
 	public class FontDescription {
 		public bool better_match (Pango.FontDescription old_match, Pango.FontDescription new_match);
-		public weak Pango.FontDescription copy ();
-		public weak Pango.FontDescription copy_static ();
+		public unowned Pango.FontDescription copy ();
+		public unowned Pango.FontDescription copy_static ();
 		public bool equal (Pango.FontDescription desc2);
-		public static weak Pango.FontDescription from_string (string str);
-		public weak string get_family ();
+		public static unowned Pango.FontDescription from_string (string str);
+		public unowned string get_family ();
 		public Pango.Gravity get_gravity ();
 		public Pango.FontMask get_set_fields ();
 		public int get_size ();
@@ -206,28 +206,28 @@
 		public void set_style (Pango.Style style);
 		public void set_variant (Pango.Variant variant);
 		public void set_weight (Pango.Weight weight);
-		public weak string to_filename ();
-		public weak string to_string ();
+		public unowned string to_filename ();
+		public unowned string to_string ();
 		public void unset_fields (Pango.FontMask to_unset);
 	}
 	[CCode (cheader_filename = "pango/pango.h")]
 	public class FontFace : GLib.Object {
-		public weak Pango.FontDescription describe ();
-		public weak string get_face_name ();
+		public unowned Pango.FontDescription describe ();
+		public unowned string get_face_name ();
 		public bool is_synthesized ();
 		public void list_sizes (int[] sizes);
 	}
 	[CCode (cheader_filename = "pango/pango.h")]
 	public class FontFamily : GLib.Object {
-		public weak string get_name ();
+		public unowned string get_name ();
 		public bool is_monospace ();
 		public void list_faces (Pango.FontFace[] faces);
 	}
 	[CCode (cheader_filename = "pango/pango.h")]
 	public class FontMap : GLib.Object {
 		public void list_families (Pango.FontFamily[] families);
-		public weak Pango.Font load_font (Pango.Context context, Pango.FontDescription desc);
-		public weak Pango.Fontset load_fontset (Pango.Context context, Pango.FontDescription desc, Pango.Language language);
+		public unowned Pango.Font load_font (Pango.Context context, Pango.FontDescription desc);
+		public unowned Pango.Fontset load_fontset (Pango.Context context, Pango.FontDescription desc, Pango.Language language);
 	}
 	[Compact]
 	[CCode (ref_function = "pango_font_metrics_ref", unref_function = "pango_font_metrics_unref", cheader_filename = "pango/pango.h")]
@@ -244,8 +244,8 @@
 	[CCode (cheader_filename = "pango/pango.h")]
 	public class Fontset : GLib.Object {
 		public void @foreach (Pango.FontsetForeachFunc func, void* data);
-		public weak Pango.Font get_font (uint wc);
-		public weak Pango.FontMetrics get_metrics ();
+		public unowned Pango.Font get_font (uint wc);
+		public unowned Pango.FontMetrics get_metrics ();
 	}
 	[Compact]
 	[CCode (cheader_filename = "pango/pango.h")]
@@ -270,10 +270,10 @@
 	public class GlyphItem {
 		public weak Pango.GlyphString glyphs;
 		public weak Pango.Item item;
-		public weak GLib.SList apply_attrs (string text, Pango.AttrList list);
-		public weak Pango.GlyphItem copy ();
+		public unowned GLib.SList apply_attrs (string text, Pango.AttrList list);
+		public unowned Pango.GlyphItem copy ();
 		public void letter_space (string text, Pango.LogAttr[] log_attrs, int letter_spacing);
-		public weak Pango.GlyphItem split (string text, int split_index);
+		public unowned Pango.GlyphItem split (string text, int split_index);
 	}
 	[Compact]
 	[CCode (copy_function = "pango_glyph_string_copy", cheader_filename = "pango/pango.h")]
@@ -282,7 +282,7 @@
 		public int log_clusters;
 		public int num_glyphs;
 		public int space;
-		public weak Pango.GlyphString copy ();
+		public unowned Pango.GlyphString copy ();
 		public void extents (Pango.Font font, out Pango.Rectangle ink_rect, out Pango.Rectangle logical_rect);
 		public void extents_range (int start, int end, Pango.Font font, out Pango.Rectangle ink_rect, out Pango.Rectangle logical_rect);
 		public void get_logical_widths (string text, int length, int embedding_level, int logical_widths);
@@ -309,50 +309,50 @@
 		public int length;
 		public int num_chars;
 		public int offset;
-		public weak Pango.Item copy ();
+		public unowned Pango.Item copy ();
 		[CCode (has_construct_function = false)]
 		public Item ();
-		public weak Pango.Item split (int split_index, int split_offset);
+		public unowned Pango.Item split (int split_index, int split_offset);
 	}
 	[CCode (ref_function = "pango_language_ref", unref_function = "pango_language_unref", cheader_filename = "pango/pango.h")]
 	public class Language {
-		public static weak Pango.Language from_string (string language);
-		public static weak Pango.Language get_default ();
-		public weak string get_sample_string ();
+		public static unowned Pango.Language from_string (string language);
+		public static unowned Pango.Language get_default ();
+		public unowned string get_sample_string ();
 		public bool includes_script (Pango.Script script);
 		public bool matches (string range_list);
-		public weak string to_string ();
+		public unowned string to_string ();
 	}
 	[CCode (cheader_filename = "pango/pango.h")]
 	public class Layout : GLib.Object {
 		public void context_changed ();
-		public weak Pango.Layout copy ();
+		public unowned Pango.Layout copy ();
 		public Pango.Alignment get_alignment ();
-		public weak Pango.AttrList get_attributes ();
+		public unowned Pango.AttrList get_attributes ();
 		public bool get_auto_dir ();
 		public int get_baseline ();
-		public weak Pango.Context get_context ();
+		public unowned Pango.Context get_context ();
 		public void get_cursor_pos (int index_, out Pango.Rectangle strong_pos, out Pango.Rectangle weak_pos);
 		public Pango.EllipsizeMode get_ellipsize ();
 		public void get_extents (out Pango.Rectangle ink_rect, out Pango.Rectangle logical_rect);
-		public weak Pango.FontDescription get_font_description ();
+		public unowned Pango.FontDescription get_font_description ();
 		public int get_height ();
 		public int get_indent ();
-		public weak Pango.LayoutIter get_iter ();
+		public unowned Pango.LayoutIter get_iter ();
 		public bool get_justify ();
-		public weak Pango.LayoutLine get_line (int line);
+		public unowned Pango.LayoutLine get_line (int line);
 		public int get_line_count ();
-		public weak Pango.LayoutLine get_line_readonly (int line);
-		public weak GLib.SList get_lines ();
-		public weak GLib.SList get_lines_readonly ();
+		public unowned Pango.LayoutLine get_line_readonly (int line);
+		public unowned GLib.SList get_lines ();
+		public unowned GLib.SList get_lines_readonly ();
 		public void get_log_attrs (Pango.LogAttr[] attrs);
 		public void get_pixel_extents (out Pango.Rectangle ink_rect, out Pango.Rectangle logical_rect);
 		public void get_pixel_size (out int width, out int height);
 		public bool get_single_paragraph_mode ();
 		public void get_size (out int width, out int height);
 		public int get_spacing ();
-		public weak Pango.TabArray get_tabs ();
-		public weak string get_text ();
+		public unowned Pango.TabArray get_tabs ();
+		public unowned string get_text ();
 		public int get_unknown_glyphs_count ();
 		public int get_width ();
 		public Pango.WrapMode get_wrap ();
@@ -389,20 +389,20 @@
 	[CCode (copy_function = "pango_layout_iter_copy", cheader_filename = "pango/pango.h")]
 	public class LayoutIter {
 		public bool at_last_line ();
-		public weak Pango.LayoutIter copy ();
+		public unowned Pango.LayoutIter copy ();
 		public int get_baseline ();
 		public void get_char_extents (out Pango.Rectangle logical_rect);
 		public void get_cluster_extents (out Pango.Rectangle ink_rect, out Pango.Rectangle logical_rect);
 		public int get_index ();
-		public weak Pango.Layout get_layout ();
+		public unowned Pango.Layout get_layout ();
 		public void get_layout_extents (out Pango.Rectangle ink_rect, out Pango.Rectangle logical_rect);
-		public weak Pango.LayoutLine get_line ();
+		public unowned Pango.LayoutLine get_line ();
 		public void get_line_extents (out Pango.Rectangle ink_rect, out Pango.Rectangle logical_rect);
-		public weak Pango.LayoutLine get_line_readonly ();
+		public unowned Pango.LayoutLine get_line_readonly ();
 		public void get_line_yrange (out int y0_, out int y1_);
-		public weak Pango.LayoutRun get_run ();
+		public unowned Pango.LayoutRun get_run ();
 		public void get_run_extents (out Pango.Rectangle ink_rect, out Pango.Rectangle logical_rect);
-		public weak Pango.LayoutRun get_run_readonly ();
+		public unowned Pango.LayoutRun get_run_readonly ();
 		public bool next_char ();
 		public bool next_cluster ();
 		public bool next_line ();
@@ -449,8 +449,8 @@
 		[NoWrapper]
 		public virtual void end ();
 		public Pango.Color get_color (Pango.RenderPart part);
-		public weak Pango.Layout get_layout ();
-		public weak Pango.LayoutLine get_layout_line ();
+		public unowned Pango.Layout get_layout ();
+		public unowned Pango.LayoutLine get_layout_line ();
 		public Pango.Matrix get_matrix ();
 		public virtual void part_changed (Pango.RenderPart part);
 		[NoWrapper]
@@ -461,7 +461,7 @@
 	[Compact]
 	[CCode (cheader_filename = "pango/pango.h")]
 	public class ScriptIter {
-		public void get_range (out weak string start, out weak string end, Pango.Script script);
+		public void get_range (out unowned string start, out unowned string end, Pango.Script script);
 		[CCode (has_construct_function = false)]
 		public ScriptIter (string text, int length);
 		public bool next ();
@@ -469,7 +469,7 @@
 	[Compact]
 	[CCode (copy_function = "pango_tab_array_copy", cheader_filename = "pango/pango.h")]
 	public class TabArray {
-		public weak Pango.TabArray copy ();
+		public unowned Pango.TabArray copy ();
 		public bool get_positions_in_pixels ();
 		public int get_size ();
 		public void get_tab (int tab_index, Pango.TabAlign alignment, int location);
@@ -489,7 +489,7 @@
 		public Pango.Color copy ();
 		public void free ();
 		public bool parse (string spec);
-		public weak string to_string ();
+		public unowned string to_string ();
 	}
 	[CCode (type_id = "PANGO_TYPE_LOG_ATTR", cheader_filename = "pango/pango.h")]
 	public struct LogAttr {
@@ -816,43 +816,43 @@
 	[CCode (cheader_filename = "pango/pango.h")]
 	public const string VERSION_STRING;
 	[CCode (cheader_filename = "pango/pango.h")]
-	public static weak Pango.Attribute attr_background_new (uint16 red, uint16 green, uint16 blue);
+	public static unowned Pango.Attribute attr_background_new (uint16 red, uint16 green, uint16 blue);
 	[CCode (cheader_filename = "pango/pango.h")]
-	public static weak Pango.Attribute attr_fallback_new (bool enable_fallback);
+	public static unowned Pango.Attribute attr_fallback_new (bool enable_fallback);
 	[CCode (cheader_filename = "pango/pango.h")]
-	public static weak Pango.Attribute attr_family_new (string family);
+	public static unowned Pango.Attribute attr_family_new (string family);
 	[CCode (cheader_filename = "pango/pango.h")]
-	public static weak Pango.Attribute attr_foreground_new (uint16 red, uint16 green, uint16 blue);
+	public static unowned Pango.Attribute attr_foreground_new (uint16 red, uint16 green, uint16 blue);
 	[CCode (cheader_filename = "pango/pango.h")]
-	public static weak Pango.Attribute attr_gravity_hint_new (Pango.GravityHint hint);
+	public static unowned Pango.Attribute attr_gravity_hint_new (Pango.GravityHint hint);
 	[CCode (cheader_filename = "pango/pango.h")]
-	public static weak Pango.Attribute attr_gravity_new (Pango.Gravity gravity);
+	public static unowned Pango.Attribute attr_gravity_new (Pango.Gravity gravity);
 	[CCode (cheader_filename = "pango/pango.h")]
-	public static weak Pango.Attribute attr_letter_spacing_new (int letter_spacing);
+	public static unowned Pango.Attribute attr_letter_spacing_new (int letter_spacing);
 	[CCode (cheader_filename = "pango/pango.h")]
-	public static weak Pango.Attribute attr_rise_new (int rise);
+	public static unowned Pango.Attribute attr_rise_new (int rise);
 	[CCode (cheader_filename = "pango/pango.h")]
-	public static weak Pango.Attribute attr_scale_new (double scale_factor);
+	public static unowned Pango.Attribute attr_scale_new (double scale_factor);
 	[CCode (cheader_filename = "pango/pango.h")]
-	public static weak Pango.Attribute attr_stretch_new (Pango.Stretch stretch);
+	public static unowned Pango.Attribute attr_stretch_new (Pango.Stretch stretch);
 	[CCode (cheader_filename = "pango/pango.h")]
-	public static weak Pango.Attribute attr_strikethrough_color_new (uint16 red, uint16 green, uint16 blue);
+	public static unowned Pango.Attribute attr_strikethrough_color_new (uint16 red, uint16 green, uint16 blue);
 	[CCode (cheader_filename = "pango/pango.h")]
-	public static weak Pango.Attribute attr_strikethrough_new (bool strikethrough);
+	public static unowned Pango.Attribute attr_strikethrough_new (bool strikethrough);
 	[CCode (cheader_filename = "pango/pango.h")]
-	public static weak Pango.Attribute attr_style_new (Pango.Style style);
+	public static unowned Pango.Attribute attr_style_new (Pango.Style style);
 	[CCode (cheader_filename = "pango/pango.h")]
-	public static weak string attr_type_get_name (Pango.AttrType type);
+	public static unowned string attr_type_get_name (Pango.AttrType type);
 	[CCode (cheader_filename = "pango/pango.h")]
 	public static Pango.AttrType attr_type_register (string name);
 	[CCode (cheader_filename = "pango/pango.h")]
-	public static weak Pango.Attribute attr_underline_color_new (uint16 red, uint16 green, uint16 blue);
+	public static unowned Pango.Attribute attr_underline_color_new (uint16 red, uint16 green, uint16 blue);
 	[CCode (cheader_filename = "pango/pango.h")]
-	public static weak Pango.Attribute attr_underline_new (Pango.Underline underline);
+	public static unowned Pango.Attribute attr_underline_new (Pango.Underline underline);
 	[CCode (cheader_filename = "pango/pango.h")]
-	public static weak Pango.Attribute attr_variant_new (Pango.Variant variant);
+	public static unowned Pango.Attribute attr_variant_new (Pango.Variant variant);
 	[CCode (cheader_filename = "pango/pango.h")]
-	public static weak Pango.Attribute attr_weight_new (Pango.Weight weight);
+	public static unowned Pango.Attribute attr_weight_new (Pango.Weight weight);
 	[CCode (cheader_filename = "pango/pango.h")]
 	public static Pango.BidiType bidi_type_for_unichar (unichar ch);
 	[CCode (cheader_filename = "pango/pango.h")]
@@ -874,15 +874,15 @@
 	[CCode (cheader_filename = "pango/pango.h")]
 	public static bool is_zero_width (unichar ch);
 	[CCode (cheader_filename = "pango/pango.h")]
-	public static weak GLib.List itemize (Pango.Context context, string text, int start_index, int length, Pango.AttrList attrs, Pango.AttrIterator cached_iter);
+	public static unowned GLib.List itemize (Pango.Context context, string text, int start_index, int length, Pango.AttrList attrs, Pango.AttrIterator cached_iter);
 	[CCode (cheader_filename = "pango/pango.h")]
-	public static weak GLib.List itemize_with_base_dir (Pango.Context context, Pango.Direction base_dir, string text, int start_index, int length, Pango.AttrList attrs, Pango.AttrIterator cached_iter);
+	public static unowned GLib.List itemize_with_base_dir (Pango.Context context, Pango.Direction base_dir, string text, int start_index, int length, Pango.AttrList attrs, Pango.AttrIterator cached_iter);
 	[CCode (cheader_filename = "pango/pango.h")]
 	public static uchar log2vis_get_embedding_levels (string text, int length, Pango.Direction pbase_dir);
 	[CCode (cheader_filename = "pango/pango.h")]
-	public static bool parse_enum (GLib.Type type, string str, int value, bool warn, out weak string possible_values);
+	public static bool parse_enum (GLib.Type type, string str, int value, bool warn, out unowned string possible_values);
 	[CCode (cheader_filename = "pango/pango.h")]
-	public static bool parse_markup (string markup_text, int length, unichar accel_marker, out weak Pango.AttrList attr_list, out weak string text, unichar accel_char) throws GLib.Error;
+	public static bool parse_markup (string markup_text, int length, unichar accel_marker, out unowned Pango.AttrList attr_list, out unowned string text, unichar accel_char) throws GLib.Error;
 	[CCode (cheader_filename = "pango/pango.h")]
 	public static bool parse_stretch (string str, Pango.Stretch stretch, bool warn);
 	[CCode (cheader_filename = "pango/pango.h")]
@@ -896,25 +896,25 @@
 	[CCode (cheader_filename = "pango/pango.h")]
 	public static int read_line (GLib.FileStream stream, GLib.StringBuilder str);
 	[CCode (cheader_filename = "pango/pango.h")]
-	public static weak GLib.List reorder_items (GLib.List logical_items);
+	public static unowned GLib.List reorder_items (GLib.List logical_items);
 	[CCode (cheader_filename = "pango/pango.h")]
-	public static bool scan_int (out weak string pos, int @out);
+	public static bool scan_int (out unowned string pos, int @out);
 	[CCode (cheader_filename = "pango/pango.h")]
-	public static bool scan_string (out weak string pos, GLib.StringBuilder @out);
+	public static bool scan_string (out unowned string pos, GLib.StringBuilder @out);
 	[CCode (cheader_filename = "pango/pango.h")]
-	public static bool scan_word (out weak string pos, GLib.StringBuilder @out);
+	public static bool scan_word (out unowned string pos, GLib.StringBuilder @out);
 	[CCode (cheader_filename = "pango/pango.h")]
 	public static Pango.Script script_for_unichar (unichar ch);
 	[CCode (cheader_filename = "pango/pango.h")]
-	public static weak Pango.Language script_get_sample_language (Pango.Script script);
+	public static unowned Pango.Language script_get_sample_language (Pango.Script script);
 	[CCode (cheader_filename = "pango/pango.h")]
 	public static void shape (string text, int length, Pango.Analysis analysis, Pango.GlyphString glyphs);
 	[CCode (cheader_filename = "pango/pango.h")]
-	public static bool skip_space (out weak string pos);
+	public static bool skip_space (out unowned string pos);
 	[CCode (cheader_filename = "pango/pango.h")]
-	public static weak string split_file_list (string str);
+	public static unowned string split_file_list (string str);
 	[CCode (cheader_filename = "pango/pango.h")]
-	public static weak string trim_string (string str);
+	public static unowned string trim_string (string str);
 	[CCode (cheader_filename = "pango/pango.h")]
 	public static Pango.Direction unichar_direction (unichar ch);
 	[CCode (cheader_filename = "pango/pango.h")]
@@ -924,7 +924,7 @@
 	[CCode (cheader_filename = "pango/pango.h")]
 	public static int version ();
 	[CCode (cheader_filename = "pango/pango.h")]
-	public static weak string version_check (int required_major, int required_minor, int required_micro);
+	public static unowned string version_check (int required_major, int required_minor, int required_micro);
 	[CCode (cheader_filename = "pango/pango.h")]
-	public static weak string version_string ();
+	public static unowned string version_string ();
 }

Modified: trunk/vapi/pangocairo.vapi
==============================================================================
--- trunk/vapi/pangocairo.vapi	(original)
+++ trunk/vapi/pangocairo.vapi	Fri Dec 19 21:56:41 2008
@@ -4,27 +4,27 @@
 namespace Pango {
 	[CCode (cheader_filename = "pango/pangocairo.h")]
 	public interface CairoFont : Pango.Font {
-		public weak Cairo.ScaledFont get_scaled_font ();
+		public unowned Cairo.ScaledFont get_scaled_font ();
 	}
 	[CCode (cheader_filename = "pango/pangocairo.h")]
 	public interface CairoFontMap : Pango.FontMap {
-		public weak Pango.Context create_context ();
-		public static weak Pango.FontMap get_default ();
+		public unowned Pango.Context create_context ();
+		public static unowned Pango.FontMap get_default ();
 		public Cairo.FontType get_font_type ();
 		public double get_resolution ();
-		public static weak Pango.FontMap @new ();
-		public static weak Pango.FontMap new_for_font_type (Cairo.FontType fonttype);
+		public static unowned Pango.FontMap @new ();
+		public static unowned Pango.FontMap new_for_font_type (Cairo.FontType fonttype);
 		public void set_default ();
 		public void set_resolution (double dpi);
 	}
 	[CCode (cheader_filename = "pango/pangocairo.h")]
 	public delegate void CairoShapeRendererFunc (Cairo.Context cr, Pango.AttrShape attr, bool do_path);
 	[CCode (cheader_filename = "pango/pangocairo.h")]
-	public static weak Cairo.FontOptions cairo_context_get_font_options (Pango.Context context);
+	public static unowned Cairo.FontOptions cairo_context_get_font_options (Pango.Context context);
 	[CCode (cheader_filename = "pango/pangocairo.h")]
 	public static double cairo_context_get_resolution (Pango.Context context);
 	[CCode (cheader_filename = "pango/pangocairo.h")]
-	public static weak Pango.CairoShapeRendererFunc cairo_context_get_shape_renderer (Pango.Context context, void* data);
+	public static unowned Pango.CairoShapeRendererFunc cairo_context_get_shape_renderer (Pango.Context context, void* data);
 	[CCode (cheader_filename = "pango/pangocairo.h")]
 	public static void cairo_context_set_font_options (Pango.Context context, Cairo.FontOptions options);
 	[CCode (cheader_filename = "pango/pangocairo.h")]
@@ -32,9 +32,9 @@
 	[CCode (cheader_filename = "pango/pangocairo.h")]
 	public static void cairo_context_set_shape_renderer (Pango.Context context, Pango.CairoShapeRendererFunc func, void* data, GLib.DestroyNotify dnotify);
 	[CCode (cheader_filename = "pango/pangocairo.h")]
-	public static weak Pango.Context cairo_create_context (Cairo.Context cr);
+	public static unowned Pango.Context cairo_create_context (Cairo.Context cr);
 	[CCode (cheader_filename = "pango/pangocairo.h")]
-	public static weak Pango.Layout cairo_create_layout (Cairo.Context cr);
+	public static unowned Pango.Layout cairo_create_layout (Cairo.Context cr);
 	[CCode (cheader_filename = "pango/pangocairo.h")]
 	public static void cairo_error_underline_path (Cairo.Context cr, double x, double y, double width, double height);
 	[CCode (cheader_filename = "pango/pangocairo.h")]



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