vapi: Remove hildon bindings

It is long dead and not available anywhere anymore.

16 files changed, 0 insertions, 6097 deletions

diff --git a/vapi/Makefile.am b/vapi/Makefile.am
index a50e575e7..9097bc9b1 100644
--- a/vapi/Makefile.am
+++ b/vapi/Makefile.am
@@ -180,10 +180,6 @@ dist_vapi_DATA = \
 	hal.vapi \
 	harfbuzz-gobject.deps \
 	harfbuzz-gobject.vapi \
-	hildon-1.deps \
-	hildon-1.vapi \
-	hildon-fm-2.deps \
-	hildon-fm-2.vapi \
 	javascriptcoregtk-4.0.vapi \
 	javascriptcoregtk-4.1.vapi \
 	javascriptcoregtk-5.0.vapi \
@@ -352,8 +348,6 @@ GIDL_BINDINGS = \
 	gtk+-unix-print-2.0 \
 	gtk+-unix-print-3.0 \
 	gtksourceview-2.0 \
-	hildon-1 \
-	hildon-fm-2 \
 	libepc-1.0 \
 	libglade-2.0 \
 	libgnome-2.0 \
@@ -691,12 +685,6 @@ gudev-1.0:
 harfbuzz-gobject:
 	$(GENVAPI) --library $(srcdir)/harfbuzz-gobject --pkg freetype2 --metadatadir $(METADATADIR) $(GIRDIR)/HarfBuzz-0.0.gir
 
-hildon-1:
-	$(GENVAPI) --library $(srcdir)/hildon-1 $(PACKAGESDIR)/hildon-1/hildon-1-custom.vala $(PACKAGESDIR)/hildon-1/hildon-1.gi
-
-hildon-fm-2:
-	$(GENVAPI) --library $(srcdir)/hildon-fm-2 $(PACKAGESDIR)/hildon-fm-2/hildon-fm-2.gi
-
 javascriptcoregtk-4.0:
 	$(GENVAPI) --library $(srcdir)/javascriptcoregtk-4.0 --metadatadir $(METADATADIR) $(METADATADIR)/JavaScriptCore-4.0-custom.vala $(GIRDIR)/JavaScriptCore-4.0.gir
 
diff --git a/vapi/hildon-1.deps b/vapi/hildon-1.deps
deleted file mode 100644
index 277620623..000000000
--- a/vapi/hildon-1.deps
+++ /dev/null
@@ -1,7 +0,0 @@
-gtk+-2.0
-gio-2.0
-gdk-pixbuf-2.0
-gdk-2.0
-pango
-atk
-cairo
diff --git a/vapi/hildon-1.vapi b/vapi/hildon-1.vapi
deleted file mode 100644
index be7283262..000000000
--- a/vapi/hildon-1.vapi
+++ /dev/null
@@ -1,1215 +0,0 @@
-/* hildon-1.vapi generated by vapigen, do not modify. */
-
-[CCode (cprefix = "Hildon", lower_case_cprefix = "hildon_")]
-namespace Hildon {
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public class AnimationActor : Gtk.Window, Atk.Implementor, Gtk.Buildable {
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public AnimationActor ();
-		public void send_message (uint32 message_type, uint32 l0, uint32 l1, uint32 l2, uint32 l3, uint32 l4);
-		public void set_anchor (int x, int y);
-		public void set_anchor_from_gravity (uint gravity);
-		public void set_depth (int depth);
-		public void set_opacity (int opacity);
-		public void set_parent (Gtk.Window parent);
-		public void set_position (int x, int y);
-		public void set_position_full (int x, int y, int depth);
-		public void set_rotation (int axis, double degrees, int x, int y, int z);
-		public void set_rotationx (int axis, int32 degrees, int x, int y, int z);
-		public void set_scale (double x_scale, double y_scale);
-		public void set_scalex (int32 x_scale, int32 y_scale);
-		public void set_show (int show);
-		public void set_show_full (int show, int opacity);
-	}
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public class AppMenu : Gtk.Window, Atk.Implementor, Gtk.Buildable {
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public AppMenu ();
-		public void add_filter (Gtk.Button filter);
-		public void append (Gtk.Button item);
-		public unowned GLib.List get_filters ();
-		public unowned GLib.List get_items ();
-		public void insert (Gtk.Button item, int position);
-		public void popup (Gtk.Window parent_window);
-		public void prepend (Gtk.Button item);
-		public void reorder_child (Gtk.Button item, int position);
-	}
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public class Banner : Gtk.Window, Atk.Implementor, Gtk.Buildable {
-		[CCode (has_construct_function = false)]
-		protected Banner ();
-		public void set_fraction (double fraction);
-		public void set_icon (string icon_name);
-		public void set_icon_from_file (string icon_file);
-		public void set_markup (string markup);
-		public void set_text (string text);
-		public void set_timeout (uint timeout);
-		public static unowned Gtk.Widget show_animation (Gtk.Widget widget, string animation_name, string text);
-		public static unowned Gtk.Widget show_information (Gtk.Widget widget, string? icon_name, string text);
-		public static unowned Gtk.Widget show_information_override_dnd (Gtk.Widget widget, string text);
-		public static unowned Gtk.Widget show_information_with_markup (Gtk.Widget widget, string? icon_name, string markup);
-		public static unowned Gtk.Widget show_informationf (Gtk.Widget widget, string icon_name, string format);
-		public static unowned Gtk.Widget show_progress (Gtk.Widget widget, Gtk.ProgressBar bar, string text);
-		[NoAccessorMethod]
-		public bool is_timed { get; construct; }
-		[NoAccessorMethod]
-		public Gtk.Window parent_window { owned get; construct; }
-		[NoAccessorMethod]
-		public uint timeout { get; construct; }
-	}
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public class BreadCrumbTrail : Gtk.Container, Atk.Implementor, Gtk.Buildable {
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public BreadCrumbTrail ();
-		public void clear ();
-		public void pop ();
-		public void push (Hildon.BreadCrumb item, void* id, GLib.DestroyNotify destroy);
-		public void push_icon (string text, Gtk.Widget icon, void* id, GLib.DestroyNotify destroy);
-		public void push_text (string text, void* id, GLib.DestroyNotify destroy);
-		public virtual signal bool crumb_clicked (void* id);
-		public virtual signal void move_parent ();
-	}
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public class Button : Gtk.Button, Atk.Implementor, Gtk.Buildable {
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public Button (Hildon.SizeType size, Hildon.ButtonArrangement arrangement);
-		public void add_image_size_group (Gtk.SizeGroup size_group);
-		public void add_size_groups (Gtk.SizeGroup title_size_group, Gtk.SizeGroup value_size_group, Gtk.SizeGroup image_size_group);
-		public void add_title_size_group (Gtk.SizeGroup size_group);
-		public void add_value_size_group (Gtk.SizeGroup size_group);
-		public unowned Gtk.Widget get_image ();
-		public Hildon.ButtonStyle get_style ();
-		public unowned string get_title ();
-		public unowned string get_value ();
-		public void set_alignment (float xalign, float yalign, float xscale, float yscale);
-		public void set_image (Gtk.Widget image);
-		public void set_image_alignment (float xalign, float yalign);
-		public void set_image_position (Gtk.PositionType position);
-		public void set_style (Hildon.ButtonStyle style);
-		public void set_text (string title, string value);
-		public void set_title (string title);
-		public void set_title_alignment (float xalign, float yalign);
-		public void set_value (string value);
-		public void set_value_alignment (float xalign, float yalign);
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public Button.with_text (Hildon.SizeType size, Hildon.ButtonArrangement arrangement, string title, string value);
-		public Hildon.ButtonArrangement arrangement { construct; }
-		public Hildon.SizeType size { construct; }
-		public Hildon.ButtonStyle style { get; set; }
-		public string title { get; set; }
-		public string value { get; set; }
-	}
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public class Calendar : Gtk.Widget, Atk.Implementor, Gtk.Buildable {
-		[CCode (array_length = false)]
-		public weak int[] day_month;
-		public Hildon.CalendarDisplayOptions display_flags;
-		public int focus_col;
-		public int focus_row;
-		public weak Gdk.GC gc;
-		[CCode (array_length = false)]
-		public weak char[] grow_space;
-		public weak Gtk.Style header_style;
-		public int highlight_col;
-		public int highlight_row;
-		public weak Gtk.Style label_style;
-		[CCode (array_length = false)]
-		public weak int[] marked_date;
-		[CCode (array_length = false)]
-		public weak Gdk.Color[] marked_date_color;
-		public int num_marked_dates;
-		public int selected_day;
-		public weak Gdk.GC xor_gc;
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public Calendar ();
-		public void clear_marks ();
-		public void freeze ();
-		public void get_date (uint year, uint month, uint day);
-		public Hildon.CalendarDisplayOptions get_display_options ();
-		public bool mark_day (uint day);
-		public void select_day (uint day);
-		public bool select_month (uint month, uint year);
-		public void set_display_options (Hildon.CalendarDisplayOptions flags);
-		public void thaw ();
-		public bool unmark_day (uint day);
-		[NoAccessorMethod]
-		public int day { get; set; }
-		[NoAccessorMethod]
-		public int max_year { get; set; }
-		[NoAccessorMethod]
-		public int min_year { get; set; }
-		[NoAccessorMethod]
-		public int month { get; set; }
-		[NoAccessorMethod]
-		public bool no_month_change { get; set; }
-		[NoAccessorMethod]
-		public bool show_day_names { get; set; }
-		[NoAccessorMethod]
-		public bool show_heading { get; set; }
-		[NoAccessorMethod]
-		public bool show_week_numbers { get; set; }
-		[NoAccessorMethod]
-		public int week_start { get; set; }
-		[NoAccessorMethod]
-		public int year { get; set; }
-		public virtual signal void day_selected ();
-		public virtual signal void day_selected_double_click ();
-		public virtual signal void erroneous_date ();
-		public virtual signal void month_changed ();
-		public virtual signal void next_month ();
-		public virtual signal void next_year ();
-		public virtual signal void prev_month ();
-		public virtual signal void prev_year ();
-		public virtual signal void selected_date ();
-	}
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public class CalendarPopup : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public CalendarPopup (Gtk.Window parent, uint year, uint month, uint day);
-		public void get_date (uint year, uint month, uint day);
-		public void set_date (uint year, uint month, uint day);
-		[NoAccessorMethod]
-		public int day { get; set; }
-		[NoAccessorMethod]
-		public uint max_year { set; }
-		[NoAccessorMethod]
-		public uint min_year { set; }
-		[NoAccessorMethod]
-		public int month { get; set; }
-		[NoAccessorMethod]
-		public int year { get; set; }
-	}
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public class Caption : Gtk.EventBox, Atk.Implementor, Gtk.Buildable {
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public Caption (Gtk.SizeGroup group, string value, Gtk.Widget control, Gtk.Widget icon, Hildon.CaptionStatus flag);
-		public bool get_child_expand ();
-		public unowned Gtk.Widget get_icon_image ();
-		public Hildon.CaptionIconPosition get_icon_position ();
-		public unowned string get_label ();
-		public float get_label_alignment ();
-		public unowned string get_separator ();
-		public unowned Gtk.SizeGroup get_size_group ();
-		public Hildon.CaptionStatus get_status ();
-		public bool is_mandatory ();
-		public void set_child_expand (bool expand);
-		public void set_icon_image (Gtk.Widget icon);
-		public void set_icon_position (Hildon.CaptionIconPosition pos);
-		public void set_label (string label);
-		public void set_label_alignment (float alignment);
-		public void set_label_markup (string markup);
-		public void set_separator (string separator);
-		public void set_size_group (Gtk.SizeGroup new_group);
-		public void set_status (Hildon.CaptionStatus flag);
-		[NoAccessorMethod]
-		public Gtk.Widget icon { owned get; set; }
-		public Hildon.CaptionIconPosition icon_position { get; set; }
-		public string label { get; set; }
-		[NoAccessorMethod]
-		public string markup { set; }
-		public string separator { get; set; }
-		public Gtk.SizeGroup size_group { get; set; }
-		public Hildon.CaptionStatus status { get; set; }
-		public virtual signal void activate ();
-	}
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public class CheckButton : Gtk.Button, Atk.Implementor, Gtk.Buildable {
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public CheckButton (Hildon.SizeType size);
-		public bool get_active ();
-		public void set_active (bool is_active);
-		[NoAccessorMethod]
-		public Hildon.SizeType size { set; }
-		public virtual signal void toggled ();
-	}
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public class CodeDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public CodeDialog ();
-		public void clear_code ();
-		public unowned string get_code ();
-		public void set_help_text (string text);
-		public void set_input_sensitive (bool sensitive);
-		public virtual signal void input ();
-	}
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public class ColorButton : Gtk.Button, Atk.Implementor, Gtk.Buildable {
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public ColorButton ();
-		public void get_color (out Gdk.Color color);
-		public bool get_popup_shown ();
-		public void popdown ();
-		public void set_color (Gdk.Color color);
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public ColorButton.with_color (Gdk.Color color);
-		public Gdk.Color color { get; set; }
-		public bool popup_shown { get; }
-		public virtual signal void setup_dialog (Hildon.ColorChooserDialog p0);
-	}
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public class ColorChooser : Gtk.Widget, Atk.Implementor, Gtk.Buildable {
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public ColorChooser ();
-		public void get_color (out Gdk.Color color);
-		public virtual void set_color (Gdk.Color color);
-		public Gdk.Color color { get; set; }
-		public virtual signal void color_changed ();
-	}
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public class ColorChooserDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public ColorChooserDialog ();
-		public void get_color (out Gdk.Color color);
-		public void set_color (Gdk.Color color);
-	}
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public class Controlbar : Gtk.Scale, Atk.Implementor, Gtk.Buildable {
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public Controlbar ();
-		public int get_max ();
-		public int get_min ();
-		public int get_value ();
-		public void set_max (int max);
-		public void set_min (int min);
-		public void set_range (int min, int max);
-		public void set_value (int value);
-		public int max { get; set; }
-		public int min { get; set; }
-		public int value { get; set; }
-		public virtual signal void end_reached (bool end);
-	}
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public class DateButton : Hildon.PickerButton, Atk.Implementor, Gtk.Buildable {
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public DateButton (Hildon.SizeType size, Hildon.ButtonArrangement arrangement);
-		public void get_date (uint year, uint month, uint day);
-		public void set_date (uint year, uint month, uint day);
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public DateButton.with_year_range (Hildon.SizeType size, Hildon.ButtonArrangement arrangement, int min_year, int max_year);
-	}
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public class DateEditor : Gtk.Container, Atk.Implementor, Gtk.Buildable {
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public DateEditor ();
-		public void get_date (uint year, uint month, uint day);
-		public uint get_day ();
-		public uint get_month ();
-		public uint get_year ();
-		public void set_date (uint year, uint month, uint day);
-		public bool set_day (uint day);
-		public bool set_month (uint month);
-		public bool set_year (uint year);
-		public uint day { get; set; }
-		[NoAccessorMethod]
-		public uint max_year { get; set; }
-		[NoAccessorMethod]
-		public uint min_year { get; set; }
-		public uint month { get; set; }
-		public uint year { get; set; }
-		public virtual signal bool date_error (Hildon.DateTimeError type);
-	}
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public class DateSelector : Hildon.TouchSelector, Atk.Implementor, Gtk.Buildable {
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public DateSelector ();
-		public void get_date (uint year, uint month, uint day);
-		public bool select_current_date (uint year, uint month, uint day);
-		public void select_day (uint day);
-		public bool select_month (uint month, uint year);
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public DateSelector.with_year_range (int min_year, int max_year);
-		[NoAccessorMethod]
-		public int max_year { get; construct; }
-		[NoAccessorMethod]
-		public int min_year { get; construct; }
-	}
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public class Dialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public Dialog ();
-		public unowned Gtk.Widget add_button (string button_text, int response_id);
-		public void add_buttons (...);
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public Dialog.with_buttons (string title, Gtk.Window parent, Gtk.DialogFlags flags, ...);
-	}
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public class EditToolbar : Gtk.HBox, Atk.Implementor, Gtk.Buildable {
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public EditToolbar ();
-		public void set_button_label (string label);
-		public void set_label (string label);
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public EditToolbar.with_text (string label, string button);
-		public virtual signal void arrow_clicked ();
-		public virtual signal void button_clicked ();
-	}
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public class Entry : Gtk.Entry, Atk.Implementor, Gtk.Buildable, Gtk.Editable, Gtk.CellEditable {
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public Entry (Hildon.SizeType size);
-		public unowned string get_text ();
-		public void set_placeholder (string text);
-		public void set_text (string text);
-		[NoAccessorMethod]
-		public Hildon.SizeType size { set construct; }
-	}
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public class FindToolbar : Gtk.Toolbar, Atk.Implementor, Gtk.Buildable, Gtk.ToolShell {
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public FindToolbar (string label);
-		public int get_active ();
-		public bool get_active_iter (out Gtk.TreeIter iter);
-		public int32 get_last_index ();
-		public void highlight_entry (bool get_focus);
-		public void set_active (int index);
-		public void set_active_iter (Gtk.TreeIter iter);
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public FindToolbar.with_model (string label, Gtk.ListStore model, int column);
-		[NoAccessorMethod]
-		public int column { get; set; }
-		[NoAccessorMethod]
-		public int history_limit { get; set construct; }
-		[NoAccessorMethod]
-		public string label { owned get; set construct; }
-		[NoAccessorMethod]
-		public Gtk.ListStore list { owned get; set; }
-		[NoAccessorMethod]
-		public int max_characters { get; set construct; }
-		[NoAccessorMethod]
-		public string prefix { owned get; set; }
-		public virtual signal void close ();
-		public virtual signal bool history_append ();
-		public virtual signal void invalid_input ();
-		public virtual signal void search ();
-	}
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public class FontSelectionDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public FontSelectionDialog (Gtk.Window parent, string title);
-		public unowned string get_preview_text ();
-		public void set_preview_text (string text);
-		[NoAccessorMethod]
-		public bool bold { get; set; }
-		[NoAccessorMethod]
-		public bool bold_set { get; set construct; }
-		[NoAccessorMethod]
-		public Gdk.Color color { owned get; set; }
-		[NoAccessorMethod]
-		public bool color_set { get; set construct; }
-		[NoAccessorMethod]
-		public string family { owned get; set; }
-		[NoAccessorMethod]
-		public bool family_set { get; set construct; }
-		[NoAccessorMethod]
-		public double font_scaling { get; set; }
-		[NoAccessorMethod]
-		public bool italic { get; set; }
-		[NoAccessorMethod]
-		public bool italic_set { get; set construct; }
-		[NoAccessorMethod]
-		public int position { get; set; }
-		[NoAccessorMethod]
-		public bool position_set { get; set construct; }
-		public string preview_text { get; set; }
-		[NoAccessorMethod]
-		public int size { get; set; }
-		[NoAccessorMethod]
-		public bool size_set { get; set construct; }
-		[NoAccessorMethod]
-		public bool strikethrough { get; set; }
-		[NoAccessorMethod]
-		public bool strikethrough_set { get; set construct; }
-		[NoAccessorMethod]
-		public bool underline { get; set; }
-		[NoAccessorMethod]
-		public bool underline_set { get; set construct; }
-	}
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public class GetPasswordDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public GetPasswordDialog (Gtk.Window parent, bool get_old);
-		public unowned string get_password ();
-		public void set_caption (string new_caption);
-		public void set_max_characters (int max_characters);
-		public void set_message (string message);
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public GetPasswordDialog.with_default (Gtk.Window parent, string password, bool get_old);
-		[NoAccessorMethod]
-		public string caption_label { owned get; set; }
-		[NoAccessorMethod]
-		public bool get_old { get; construct; }
-		[NoAccessorMethod]
-		public int max_characters { get; set; }
-		[NoAccessorMethod]
-		public string message { owned get; set; }
-		[NoAccessorMethod]
-		public bool numbers_only { get; set; }
-		[NoAccessorMethod]
-		public string password { owned get; set; }
-	}
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public class HVolumebar : Hildon.Volumebar, Atk.Implementor, Gtk.Buildable {
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public HVolumebar ();
-	}
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public class LoginDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public LoginDialog (Gtk.Window parent);
-		public unowned string get_password ();
-		public unowned string get_username ();
-		public void set_message (string msg);
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public LoginDialog.with_default (Gtk.Window parent, string name, string password);
-		[NoAccessorMethod]
-		public string message { owned get; set; }
-		[NoAccessorMethod]
-		public string password { owned get; set; }
-		[NoAccessorMethod]
-		public string username { owned get; set; }
-	}
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public class Note : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
-		[CCode (has_construct_function = false)]
-		protected Note ();
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public Note.cancel_with_progress_bar (Gtk.Window parent, string description, Gtk.ProgressBar progressbar);
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public Note.confirmation (Gtk.Window parent, string description);
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public Note.confirmation_add_buttons (Gtk.Window parent, string description);
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public Note.confirmation_with_icon_name (Gtk.Window parent, string description, string icon_name);
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public Note.information (Gtk.Window parent, string description);
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public Note.information_with_icon_name (Gtk.Window parent, string description, string icon_name);
-		public void set_button_text (string text);
-		public void set_button_texts (string text_ok, string text_cancel);
-		[NoAccessorMethod]
-		public string description { owned get; set; }
-		[NoAccessorMethod]
-		public string icon { owned get; set; }
-		[NoAccessorMethod]
-		public Hildon.NoteType note_type { get; set construct; }
-		[NoAccessorMethod]
-		public Gtk.ProgressBar progressbar { owned get; set; }
-		[NoAccessorMethod]
-		public string stock_icon { owned get; set; }
-	}
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public class NumberEditor : Gtk.Container, Atk.Implementor, Gtk.Buildable {
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public NumberEditor (int min, int max);
-		public int get_value ();
-		public void set_range (int min, int max);
-		public void set_value (int value);
-		public int value { get; set; }
-		public virtual signal bool range_error (Hildon.NumberEditorErrorType type);
-	}
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public class PannableArea : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public PannableArea ();
-		public void add_with_viewport (Gtk.Widget child);
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public PannableArea.full (int mode, bool enabled, double vel_min, double vel_max, double decel, uint sps);
-		public unowned Gtk.Adjustment get_hadjustment ();
-		public Hildon.SizeRequestPolicy get_size_request_policy ();
-		public unowned Gtk.Adjustment get_vadjustment ();
-		public void jump_to (int x, int y);
-		public void jump_to_child (Gtk.Widget child);
-		public void scroll_to (int x, int y);
-		public void scroll_to_child (Gtk.Widget child);
-		public void set_size_request_policy (Hildon.SizeRequestPolicy size_request_policy);
-		[NoAccessorMethod]
-		public uint bounce_steps { get; set construct; }
-		[NoAccessorMethod]
-		public double deceleration { get; set construct; }
-		[NoAccessorMethod]
-		public uint direction_error_margin { get; set construct; }
-		[NoAccessorMethod]
-		public double drag_inertia { get; set construct; }
-		[NoAccessorMethod]
-		public bool enabled { get; set construct; }
-		[NoAccessorMethod]
-		public uint force { get; set construct; }
-		public Gtk.Adjustment hadjustment { get; }
-		[NoAccessorMethod]
-		public int hovershoot_max { get; set construct; }
-		[NoAccessorMethod]
-		public Gtk.PolicyType hscrollbar_policy { get; set construct; }
-		[NoAccessorMethod]
-		public bool initial_hint { get; set construct; }
-		[NoAccessorMethod]
-		public bool low_friction_mode { get; set construct; }
-		[NoAccessorMethod]
-		public Hildon.PannableAreaMode mode { get; set construct; }
-		[NoAccessorMethod]
-		public Hildon.MovementMode mov_mode { get; set construct; }
-		[NoAccessorMethod]
-		public uint panning_threshold { get; set construct; }
-		[NoAccessorMethod]
-		public double scroll_time { get; set construct; }
-		[NoAccessorMethod]
-		public uint scrollbar_fade_delay { get; set construct; }
-		public Hildon.SizeRequestPolicy size_request_policy { get; set construct; }
-		[NoAccessorMethod]
-		public uint sps { get; set construct; }
-		public Gtk.Adjustment vadjustment { get; }
-		[NoAccessorMethod]
-		public double velocity_fast_factor { get; set construct; }
-		[NoAccessorMethod]
-		public double velocity_max { get; set construct; }
-		[NoAccessorMethod]
-		public double velocity_min { get; set construct; }
-		[NoAccessorMethod]
-		public double velocity_overshooting_max { get; set construct; }
-		[NoAccessorMethod]
-		public int vovershoot_max { get; set construct; }
-		[NoAccessorMethod]
-		public Gtk.PolicyType vscrollbar_policy { get; set construct; }
-		public virtual signal void horizontal_movement (int direction, double x, double y);
-		public virtual signal void panning_finished ();
-		public virtual signal bool panning_started ();
-		public virtual signal void vertical_movement (int direction, double x, double y);
-	}
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public class PickerButton : Hildon.Button, Atk.Implementor, Gtk.Buildable {
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public PickerButton (Hildon.SizeType size, Hildon.ButtonArrangement arrangement);
-		public int get_active ();
-		public unowned string get_done_button_text ();
-		public unowned Hildon.TouchSelector get_selector ();
-		public void set_active (int index);
-		public void set_done_button_text (string done_button_text);
-		public void set_selector (Hildon.TouchSelector selector);
-		public string done_button_text { get; set; }
-		[NoAccessorMethod]
-		public Hildon.TouchSelector touch_selector { owned get; set; }
-		public virtual signal void value_changed ();
-	}
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public class PickerDialog : Hildon.Dialog, Atk.Implementor, Gtk.Buildable {
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public PickerDialog (Gtk.Window parent);
-		public unowned string get_done_label ();
-		public unowned Hildon.TouchSelector get_selector ();
-		public void set_done_label (string label);
-		public virtual bool set_selector (Hildon.TouchSelector selector);
-		[NoAccessorMethod]
-		public bool center_on_show { get; set construct; }
-		[NoAccessorMethod]
-		public string done_button_text { owned get; set construct; }
-	}
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public class Program : GLib.Object {
-		[CCode (has_construct_function = false)]
-		protected Program ();
-		public void add_window (Hildon.Window window);
-		public bool get_can_hibernate ();
-		public unowned Hildon.AppMenu get_common_app_menu ();
-		public unowned Gtk.Menu get_common_menu ();
-		public unowned Gtk.Toolbar get_common_toolbar ();
-		public static unowned Hildon.Program get_instance ();
-		public bool get_is_topmost ();
-		public void go_to_root_window ();
-		public unowned Hildon.StackableWindow peek_window_stack ();
-		public unowned Hildon.StackableWindow pop_window_stack ();
-		public void remove_window (Hildon.Window window);
-		public void set_can_hibernate (bool can_hibernate);
-		public void set_common_app_menu (Hildon.AppMenu menu);
-		public void set_common_menu (Gtk.Menu menu);
-		public void set_common_toolbar (Gtk.Toolbar toolbar);
-		public bool can_hibernate { get; set; }
-		public bool is_topmost { get; }
-	}
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public class RangeEditor : Gtk.Container, Atk.Implementor, Gtk.Buildable {
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public RangeEditor ();
-		public int get_higher ();
-		public int get_lower ();
-		public int get_max ();
-		public int get_min ();
-		public void get_range (int start, int end);
-		public unowned string get_separator ();
-		public void set_higher (int value);
-		public void set_limits (int start, int end);
-		public void set_lower (int value);
-		public void set_max (int value);
-		public void set_min (int value);
-		public void set_range (int start, int end);
-		public void set_separator (string separator);
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public RangeEditor.with_separator (string separator);
-		public int higher { get; set construct; }
-		public int lower { get; set construct; }
-		public int max { get; set construct; }
-		public int min { get; set construct; }
-		public string separator { get; set construct; }
-	}
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public class RemoteTexture : Gtk.Window, Atk.Implementor, Gtk.Buildable {
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public RemoteTexture ();
-		public void send_message (uint32 message_type, uint32 l0, uint32 l1, uint32 l2, uint32 l3, uint32 l4);
-		public void set_image (uint32 key, uint width, uint height, uint bpp);
-		public void set_offset (double x, double y);
-		public void set_opacity (int opacity);
-		public void set_parent (Gtk.Window parent);
-		public void set_position (int x, int y, int width, int height);
-		public void set_scale (double x_scale, double y_scale);
-		public void set_show (int show);
-		public void set_show_full (int show, int opacity);
-		public void update_area (int x, int y, int width, int height);
-	}
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public class Seekbar : Gtk.Scale, Atk.Implementor, Gtk.Buildable {
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public Seekbar ();
-		public uint get_fraction ();
-		public int get_position ();
-		public int get_total_time ();
-		public void set_fraction (uint fraction);
-		public void set_position (int time);
-		public void set_total_time (int time);
-		public double fraction { get; set; }
-		public double position { get; set; }
-		public double total_time { get; set; }
-	}
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public class SetPasswordDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public SetPasswordDialog (Gtk.Window parent, bool modify_protection);
-		public unowned string get_password ();
-		public bool get_protected ();
-		public void set_message (string message);
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public SetPasswordDialog.with_default (Gtk.Window parent, string password, bool modify_protection);
-		[NoAccessorMethod]
-		public string message { owned get; set; }
-		[NoAccessorMethod]
-		public bool modify_protection { get; construct; }
-		[NoAccessorMethod]
-		public string password { owned get; set; }
-	}
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public class SortDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public SortDialog (Gtk.Window parent);
-		public int add_sort_key (string sort_key);
-		public int add_sort_key_reversed (string sort_key);
-		public int get_sort_key ();
-		public Gtk.SortType get_sort_order ();
-		public void set_sort_key (int key);
-		public void set_sort_order (Gtk.SortType order);
-		public int sort_key { get; set; }
-		public Gtk.SortType sort_order { get; set; }
-	}
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public class StackableWindow : Hildon.Window, Atk.Implementor, Gtk.Buildable {
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public StackableWindow ();
-		public unowned Hildon.WindowStack get_stack ();
-		public void set_main_menu (Hildon.AppMenu menu);
-	}
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public class TextView : Gtk.TextView, Atk.Implementor, Gtk.Buildable {
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public TextView ();
-		public unowned Gtk.TextBuffer get_buffer ();
-		public void set_buffer (Gtk.TextBuffer buffer);
-		public void set_placeholder (string text);
-	}
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public class TimeButton : Hildon.PickerButton, Atk.Implementor, Gtk.Buildable {
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public TimeButton (Hildon.SizeType size, Hildon.ButtonArrangement arrangement);
-		public void get_time (uint hours, uint minutes);
-		public void set_time (uint hours, uint minutes);
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public TimeButton.step (Hildon.SizeType size, Hildon.ButtonArrangement arrangement, uint minutes_step);
-	}
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public class TimeEditor : Gtk.Container, Atk.Implementor, Gtk.Buildable {
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public TimeEditor ();
-		public uint get_duration_max ();
-		public uint get_duration_min ();
-		public bool get_duration_mode ();
-		public void get_duration_range (uint min_seconds, uint max_seconds);
-		public bool get_show_hours ();
-		public bool get_show_seconds ();
-		public uint get_ticks ();
-		public void get_time (uint hours, uint minutes, uint seconds);
-		public static void get_time_separators (Gtk.Label hm_sep_label, Gtk.Label ms_sep_label);
-		public void set_duration_max (uint duration_max);
-		public void set_duration_min (uint duration_min);
-		public void set_duration_mode (bool duration_mode);
-		public void set_duration_range (uint min_seconds, uint max_seconds);
-		public void set_show_hours (bool show_hours);
-		public void set_show_seconds (bool show_seconds);
-		public void set_ticks (uint ticks);
-		public void set_time (uint hours, uint minutes, uint seconds);
-		public uint duration_max { get; set; }
-		public uint duration_min { get; set; }
-		public bool duration_mode { get; set; }
-		public bool show_hours { get; set; }
-		public bool show_seconds { get; set; }
-		public uint ticks { get; set; }
-		public virtual signal bool time_error (Hildon.DateTimeError type);
-	}
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public class TimePicker : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public TimePicker (Gtk.Window parent);
-		public void get_time (uint hours, uint minutes);
-		public void set_time (uint hours, uint minutes);
-		[NoAccessorMethod]
-		public uint minutes { get; set; }
-	}
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public class TimeSelector : Hildon.TouchSelector, Atk.Implementor, Gtk.Buildable {
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public TimeSelector ();
-		public void get_time (uint hours, uint minutes);
-		public bool set_time (uint hours, uint minutes);
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public TimeSelector.step (uint minutes_step);
-		[NoAccessorMethod]
-		public uint minutes_step { get; construct; }
-		[NoAccessorMethod]
-		public Hildon.TimeSelectorFormatPolicy time_format_policy { get; set construct; }
-	}
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public class TouchSelector : Gtk.VBox, Atk.Implementor, Gtk.Buildable {
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public TouchSelector ();
-		public unowned Hildon.TouchSelectorColumn append_column (Gtk.TreeModel model, Gtk.CellRenderer cell_renderer);
-		public void append_text (string text);
-		public unowned Hildon.TouchSelectorColumn append_text_column (Gtk.TreeModel model, bool center);
-		public void center_on_selected ();
-		public int get_active (int column);
-		public unowned Hildon.TouchSelectorColumn get_column (int column);
-		public Hildon.TouchSelectorSelectionMode get_column_selection_mode ();
-		public unowned string get_current_text ();
-		public Hildon.UIMode get_hildon_ui_mode ();
-		public unowned Gtk.TreePath get_last_activated_row (int column);
-		public unowned Gtk.TreeModel get_model (int column);
-		public int get_num_columns ();
-		public unowned Hildon.TouchSelectorPrintFunc get_print_func ();
-		public bool get_selected (int column, Gtk.TreeIter iter);
-		public unowned GLib.List get_selected_rows (int column);
-		public void insert_text (int position, string text);
-		public void optimal_size_request (Gtk.Requisition requisition);
-		public void prepend_text (string text);
-		public bool remove_column (int column);
-		public void select_iter (int column, Gtk.TreeIter iter, bool scroll_to);
-		public void set_active (int column, int index);
-		public void set_column_attributes (int num_column, Gtk.CellRenderer cell_renderer);
-		public void set_column_selection_mode (Hildon.TouchSelectorSelectionMode mode);
-		public bool set_hildon_ui_mode (Hildon.UIMode mode);
-		public virtual void set_model (int column, Gtk.TreeModel model);
-		public void set_print_func (Hildon.TouchSelectorPrintFunc func);
-		public void set_print_func_full (owned Hildon.TouchSelectorPrintFunc func);
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public TouchSelector.text ();
-		public void unselect_all (int column);
-		public void unselect_iter (int column, Gtk.TreeIter iter);
-		[NoAccessorMethod]
-		public bool has_multiple_selection { get; }
-		public Hildon.UIMode hildon_ui_mode { get; set; }
-		[NoAccessorMethod]
-		public bool initial_scroll { get; set construct; }
-		public virtual signal void changed (int column);
-		public virtual signal void columns_changed ();
-	}
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public class TouchSelectorColumn : GLib.Object, Gtk.CellLayout {
-		[CCode (has_construct_function = false)]
-		protected TouchSelectorColumn ();
-		public int get_text_column ();
-		public void set_text_column (int text_column);
-		public int text_column { get; set; }
-	}
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public class TouchSelectorEntry : Hildon.TouchSelector, Atk.Implementor, Gtk.Buildable {
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public TouchSelectorEntry ();
-		public unowned Hildon.Entry get_entry ();
-		public Hildon.GtkInputMode get_input_mode ();
-		public int get_text_column ();
-		public void set_input_mode (Hildon.GtkInputMode input_mode);
-		public void set_text_column (int text_column);
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public TouchSelectorEntry.text ();
-		public int text_column { get; set; }
-	}
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public class VVolumebar : Hildon.Volumebar, Atk.Implementor, Gtk.Buildable {
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public VVolumebar ();
-	}
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public class Volumebar : Gtk.Container, Atk.Implementor, Gtk.Buildable {
-		[CCode (has_construct_function = false)]
-		protected Volumebar ();
-		public unowned Gtk.Adjustment get_adjustment ();
-		public double get_level ();
-		public bool get_mute ();
-		public void set_level (double level);
-		public void set_mute (bool mute);
-		public void set_range_insensitive_message (string message);
-		public void set_range_insensitive_messagef (string format);
-		[NoAccessorMethod]
-		public bool has_mute { get; set construct; }
-		public double level { get; set; }
-		public bool mute { get; set; }
-		public virtual signal void level_changed ();
-		public virtual signal void mute_toggled ();
-	}
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public class VolumebarRange : Gtk.Scale, Atk.Implementor, Gtk.Buildable {
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public VolumebarRange (Gtk.Orientation orientation);
-		public double get_level ();
-		public void set_level (double level);
-		public double level { get; set; }
-	}
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public class WeekdayPicker : Gtk.Container, Atk.Implementor, Gtk.Buildable {
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public WeekdayPicker ();
-		public bool isset_day (GLib.DateWeekday day);
-		public void set_all ();
-		public void set_day (GLib.DateWeekday day);
-		public void toggle_day (GLib.DateWeekday day);
-		public void unset_all ();
-		public void unset_day (GLib.DateWeekday day);
-		public virtual signal void selection_changed (int p0);
-	}
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public class Window : Gtk.Window, Atk.Implementor, Gtk.Buildable {
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public Window ();
-		public void add_toolbar (Gtk.Toolbar toolbar);
-		public void add_with_scrollbar (Gtk.Widget child);
-		public unowned Hildon.AppMenu get_app_menu ();
-		public bool get_is_topmost ();
-		public unowned Gtk.Menu get_main_menu ();
-		public unowned string get_markup ();
-		public unowned Gtk.Menu get_menu ();
-		public void remove_toolbar (Gtk.Toolbar toolbar);
-		public void set_app_menu (Hildon.AppMenu menu);
-		public void set_edit_toolbar (Hildon.EditToolbar toolbar);
-		public void set_main_menu (Gtk.Menu menu);
-		public void set_markup (string markup);
-		public void set_menu (Gtk.Menu menu);
-		[NoWrapper]
-		public virtual bool toggle_menu (uint button, uint32 time);
-		public bool is_topmost { get; }
-		public string markup { get; set; }
-		public virtual signal void clipboard_operation (int operation);
-	}
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public class WindowStack : GLib.Object {
-		[CCode (has_construct_function = false)]
-		public WindowStack ();
-		public static unowned Hildon.WindowStack get_default ();
-		public unowned GLib.List get_windows ();
-		public unowned Gtk.Widget peek ();
-		public void pop (int nwindows, GLib.List popped_windows);
-		public unowned Gtk.Widget pop_1 ();
-		public void pop_and_push (int nwindows, GLib.List popped_windows, Hildon.StackableWindow win1);
-		public void pop_and_push_list (int nwindows, GLib.List popped_windows, GLib.List list);
-		public void push (Hildon.StackableWindow win1);
-		public void push_1 (Hildon.StackableWindow win);
-		public void push_list (GLib.List list);
-		public int size ();
-		[NoAccessorMethod]
-		public Gtk.WindowGroup window_group { owned get; construct; }
-	}
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public class WizardDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public WizardDialog (Gtk.Window parent, string wizard_name, Gtk.Notebook notebook);
-		public void set_forward_page_func (owned Hildon.WizardDialogPageFunc page_func);
-		[NoAccessorMethod]
-		public bool autotitle { get; set; }
-		[NoAccessorMethod]
-		public string wizard_name { owned get; set; }
-		[NoAccessorMethod]
-		public Gtk.Notebook wizard_notebook { owned get; set; }
-	}
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public interface BreadCrumb : Gtk.Widget {
-		public void activated ();
-		public abstract void get_natural_size (int width, int height);
-		public signal void crumb_activated ();
-	}
-	[CCode (cheader_filename = "hildon/hildon.h", cprefix = "HILDON_BUTTON_ARRANGEMENT_")]
-	public enum ButtonArrangement {
-		HORIZONTAL,
-		VERTICAL
-	}
-	[CCode (cheader_filename = "hildon/hildon.h", cprefix = "HILDON_BUTTON_STYLE_")]
-	public enum ButtonStyle {
-		NORMAL,
-		PICKER
-	}
-	[CCode (cheader_filename = "hildon/hildon.h", cprefix = "HILDON_CALENDAR_")]
-	[Flags]
-	public enum CalendarDisplayOptions {
-		SHOW_HEADING,
-		SHOW_DAY_NAMES,
-		NO_MONTH_CHANGE,
-		SHOW_WEEK_NUMBERS,
-		WEEK_START_MONDAY
-	}
-	[CCode (cheader_filename = "hildon/hildon.h", cprefix = "HILDON_CAPTION_POSITION_")]
-	public enum CaptionIconPosition {
-		LEFT,
-		RIGHT
-	}
-	[CCode (cheader_filename = "hildon/hildon.h", cprefix = "HILDON_CAPTION_")]
-	public enum CaptionStatus {
-		OPTIONAL,
-		MANDATORY
-	}
-	[CCode (cheader_filename = "hildon/hildon.h", cprefix = "HILDON_DATE_TIME_ERROR_")]
-	public enum DateTimeError {
-		NO_ERROR,
-		MAX_HOURS,
-		MAX_MINS,
-		MAX_SECS,
-		MAX_DAY,
-		MAX_MONTH,
-		MAX_YEAR,
-		MIN_HOURS,
-		MIN_MINS,
-		MIN_SECS,
-		MIN_DAY,
-		MIN_MONTH,
-		MIN_YEAR,
-		EMPTY_HOURS,
-		EMPTY_MINS,
-		EMPTY_SECS,
-		EMPTY_DAY,
-		EMPTY_MONTH,
-		EMPTY_YEAR,
-		MIN_DURATION,
-		MAX_DURATION,
-		INVALID_CHAR,
-		INVALID_DATE,
-		INVALID_TIME
-	}
-	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "HILDON_GTK_INPUT_MODE_", has_type_id = false)]
-	public enum GtkInputMode {
-		ALPHA,
-		NUMERIC,
-		SPECIAL,
-		HEXA,
-		TELE,
-		FULL,
-		MULTILINE,
-		INVISIBLE,
-		AUTOCAP,
-		DICTIONARY
-	}
-	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "HILDON_", has_type_id = false)]
-	public enum Mode {
-		DIABLO,
-		FREMANTLE
-	}
-	[CCode (cheader_filename = "hildon/hildon.h", cprefix = "HILDON_MOVEMENT_")]
-	public enum MovementDirection {
-		UP,
-		DOWN,
-		LEFT,
-		RIGHT
-	}
-	[CCode (cheader_filename = "hildon/hildon.h", cprefix = "HILDON_MOVEMENT_MODE_")]
-	[Flags]
-	public enum MovementMode {
-		HORIZ,
-		VERT,
-		BOTH
-	}
-	[CCode (cheader_filename = "hildon/hildon.h", cprefix = "HILDON_NOTE_TYPE_")]
-	public enum NoteType {
-		CONFIRMATION,
-		CONFIRMATION_BUTTON,
-		INFORMATION,
-		INFORMATION_THEME,
-		PROGRESSBAR
-	}
-	[CCode (cheader_filename = "hildon/hildon.h", cprefix = "HILDON_NUMBER_EDITOR_ERROR_")]
-	public enum NumberEditorErrorType {
-		MAXIMUM_VALUE_EXCEED,
-		MINIMUM_VALUE_EXCEED,
-		ERRONEOUS_VALUE
-	}
-	[CCode (cheader_filename = "hildon/hildon.h", cprefix = "HILDON_PANNABLE_AREA_MODE_")]
-	public enum PannableAreaMode {
-		PUSH,
-		ACCEL,
-		AUTO
-	}
-	[CCode (cheader_filename = "hildon/hildon.h", cprefix = "HILDON_PORTRAIT_MODE_")]
-	[Flags]
-	public enum PortraitFlags {
-		REQUEST,
-		SUPPORT
-	}
-	[CCode (cheader_filename = "hildon/hildon.h", cprefix = "HILDON_SIZE_REQUEST_")]
-	public enum SizeRequestPolicy {
-		MINIMUM,
-		CHILDREN
-	}
-	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "HILDON_SIZE_", has_type_id = false)]
-	public enum SizeType {
-		AUTO_WIDTH,
-		HALFSCREEN_WIDTH,
-		FULLSCREEN_WIDTH,
-		AUTO_HEIGHT,
-		FINGER_HEIGHT,
-		THUMB_HEIGHT,
-		AUTO
-	}
-	[CCode (cheader_filename = "hildon/hildon.h", cprefix = "HILDON_TIME_SELECTOR_FORMAT_POLICY_")]
-	public enum TimeSelectorFormatPolicy {
-		AMPM,
-		@24H,
-		AUTOMATIC
-	}
-	[CCode (cheader_filename = "hildon/hildon.h", cprefix = "HILDON_TOUCH_SELECTOR_SELECTION_MODE_")]
-	public enum TouchSelectorSelectionMode {
-		SINGLE,
-		MULTIPLE
-	}
-	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "HILDON_UI_MODE_", has_type_id = false)]
-	public enum UIMode {
-		NORMAL,
-		EDIT
-	}
-	[CCode (cheader_filename = "hildon/hildon.h", cprefix = "HILDON_WINDOW_CO_")]
-	public enum WindowClipboardOperation {
-		COPY,
-		CUT,
-		PASTE
-	}
-	[CCode (cheader_filename = "hildon/hildon.h", cprefix = "HILDON_WIZARD_DIALOG_")]
-	public enum WizardDialogResponse {
-		CANCEL,
-		PREVIOUS,
-		NEXT,
-		FINISH
-	}
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public delegate unowned string TouchSelectorPrintFunc (Hildon.TouchSelector selector);
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public delegate bool WizardDialogPageFunc (Gtk.Notebook notebook, int current_page);
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public const int AA_CENTER_GRAVITY;
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public const int AA_E_GRAVITY;
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public const int AA_NE_GRAVITY;
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public const int AA_NW_GRAVITY;
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public const int AA_N_GRAVITY;
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public const int AA_SE_GRAVITY;
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public const int AA_SW_GRAVITY;
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public const int AA_S_GRAVITY;
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public const int AA_W_GRAVITY;
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public const int AA_X_AXIS;
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public const int AA_Y_AXIS;
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public const int AA_Z_AXIS;
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public const int MAJOR_VERSION;
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public const int MARGIN_DEFAULT;
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public const int MARGIN_DOUBLE;
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public const int MARGIN_HALF;
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public const int MARGIN_TRIPLE;
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public const int MICRO_VERSION;
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public const int MINOR_VERSION;
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public const int WINDOW_LONG_PRESS_TIME;
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public const int WINDOW_TITLEBAR_HEIGHT;
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public static unowned string format_file_size_for_display (int64 size);
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public static int get_icon_pixel_size (Gtk.IconSize size);
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public static unowned Gtk.Widget gtk_button_new (Hildon.SizeType size);
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public static unowned Gtk.Widget gtk_hscale_new ();
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public static unowned Gtk.Widget gtk_icon_view_new (Hildon.UIMode mode);
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public static unowned Gtk.Widget gtk_icon_view_new_with_model (Hildon.UIMode mode, Gtk.TreeModel model);
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public static void gtk_icon_view_set_ui_mode (Gtk.IconView iconview, Hildon.UIMode mode);
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public static void gtk_init ([CCode (array_length_pos = 0.9)] ref unowned string[] argv);
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public static unowned Gtk.Widget gtk_menu_new ();
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public static unowned Gtk.Widget gtk_radio_button_new (Hildon.SizeType size, GLib.SList group);
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public static unowned Gtk.Widget gtk_radio_button_new_from_widget (Hildon.SizeType size, Gtk.RadioButton radio_group_member);
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public static unowned Gtk.Widget gtk_toggle_button_new (Hildon.SizeType size);
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public static unowned Gtk.Widget gtk_tree_view_new (Hildon.UIMode mode);
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public static unowned Gtk.Widget gtk_tree_view_new_with_model (Hildon.UIMode mode, Gtk.TreeModel model);
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public static void gtk_tree_view_set_ui_mode (Gtk.TreeView treeview, Hildon.UIMode mode);
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public static unowned Gtk.Widget gtk_vscale_new ();
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static void gtk_widget_set_theme_size (Gtk.Widget widget, Hildon.SizeType size);
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public static void gtk_window_set_do_not_disturb (Gtk.Window window, bool dndflag);
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public static void gtk_window_set_portrait_flags (Gtk.Window window, Hildon.PortraitFlags portrait_flags);
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public static void gtk_window_set_progress_indicator (Gtk.Window window, uint state);
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public static void gtk_window_take_screenshot (Gtk.Window window, bool take);
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public static bool helper_event_button_is_finger (Gdk.EventButton event);
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public static void helper_set_insensitive_message (Gtk.Widget widget, string message);
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public static void helper_set_insensitive_messagef (Gtk.Widget widget, string format);
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public static ulong helper_set_logical_color (Gtk.Widget widget, Gtk.RcFlags rcflags, Gtk.StateType state, string logicalcolorname);
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public static ulong helper_set_logical_font (Gtk.Widget widget, string logicalfontname);
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public static void helper_set_thumb_scrollbar (Gtk.ScrolledWindow win, bool thumb);
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public static void init ();
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public static unowned Gtk.Widget pannable_get_child_widget_at (Hildon.PannableArea area, double x, double y);
-	[CCode (cheader_filename = "hildon/hildon.h")]
-	public static void play_system_sound (string sample);
-}
diff --git a/vapi/hildon-fm-2.deps b/vapi/hildon-fm-2.deps
deleted file mode 100644
index 1bc6b0778..000000000
--- a/vapi/hildon-fm-2.deps
+++ /dev/null
@@ -1,8 +0,0 @@
-atk
-gio-2.0
-gdk-2.0
-gdk-pixbuf-2.0
-gtk+-2.0
-pango
-cairo
-glib-2.0
diff --git a/vapi/hildon-fm-2.vapi b/vapi/hildon-fm-2.vapi
deleted file mode 100644
index 8b6f59339..000000000
--- a/vapi/hildon-fm-2.vapi
+++ /dev/null
@@ -1,248 +0,0 @@
-/* hildon-fm-2.vapi generated by vapigen, do not modify. */
-
-namespace Hildon {
-	[CCode (cheader_filename = "hildon/hildon-file-chooser-dialog.h")]
-	public class FileChooserDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable, Gtk.FileChooser {
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public FileChooserDialog (Gtk.Window parent, Gtk.FileChooserAction action);
-		public unowned Gtk.Widget add_extensions_combo (out unowned string extensions, out unowned string ext_names);
-		public void add_extra (Gtk.Widget widget);
-		public void focus_to_input ();
-		public unowned string get_extension ();
-		public unowned string get_safe_folder ();
-		public unowned string get_safe_folder_uri ();
-		public bool get_show_upnp ();
-		public void set_extension (string extension);
-		public void set_safe_folder (string local_path);
-		public void set_safe_folder_uri (string uri);
-		public void set_show_upnp (bool value);
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public FileChooserDialog.with_properties (Gtk.Window parent, ...);
-		[NoAccessorMethod]
-		public bool autonaming { get; set; }
-		[NoAccessorMethod]
-		public string empty_text { owned get; set; }
-		[NoAccessorMethod]
-		public Hildon.FileSystemModel file_system_model { owned get; construct; }
-		[NoAccessorMethod]
-		public int max_full_path_length { get; set construct; }
-		[NoAccessorMethod]
-		public int max_name_length { get; set construct; }
-		[NoAccessorMethod]
-		public string open_button_text { owned get; set; }
-		[NoAccessorMethod]
-		public string save_multiple { owned get; set; }
-		[NoAccessorMethod]
-		public int selection_mode { get; set; }
-		[NoAccessorMethod]
-		public bool show_folder_button { get; set; }
-		[NoAccessorMethod]
-		public bool show_location { get; set; }
-	}
-	[CCode (cheader_filename = "hildon/hildon-file-details-dialog.h")]
-	public class FileDetailsDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public FileDetailsDialog (Gtk.Window parent, string filename);
-		public bool get_file_iter (out Gtk.TreeIter iter);
-		public void set_file_iter (Gtk.TreeIter iter);
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public FileDetailsDialog.with_model (Gtk.Window parent, Hildon.FileSystemModel model);
-		[NoAccessorMethod]
-		public Gtk.Widget additional_tab { owned get; set construct; }
-		[NoAccessorMethod]
-		public string additional_tab_label { owned get; set; }
-		[NoAccessorMethod]
-		public bool enable_read_only_checkbox { get; set construct; }
-		[NoAccessorMethod]
-		public Hildon.FileSystemModel model { owned get; set; }
-		[NoAccessorMethod]
-		public bool show_tabs { get; set construct; }
-		[NoAccessorMethod]
-		public bool show_type_icon { get; set construct; }
-	}
-	[CCode (cheader_filename = "hildon/hildon-file-selection.h")]
-	public class FileSelection : Gtk.Container, Atk.Implementor, Gtk.Buildable {
-		[CCode (has_construct_function = false)]
-		protected FileSelection ();
-		public void clear_multi_selection ();
-		public bool content_iter_is_selected (Gtk.TreeIter iter);
-		public void dim_current_selection ();
-		public bool get_active_content_iter (Gtk.TreeIter iter);
-		public Hildon.FileSelectionPane get_active_pane ();
-		public bool get_column_headers_visible ();
-		public bool get_current_content_iter (Gtk.TreeIter iter);
-		public bool get_current_folder_iter (Gtk.TreeIter iter);
-		public unowned string get_current_folder_uri ();
-		public unowned Gtk.FileFilter get_filter ();
-		public Hildon.FileSelectionMode get_mode ();
-		public bool get_select_multiple ();
-		public unowned GLib.SList get_selected_paths ();
-		public unowned GLib.SList get_selected_uris ();
-		public void get_sort_key (Hildon.FileSelectionSortKey key, Gtk.SortType order);
-		public void hide_content_pane ();
-		public void move_cursor_to_uri (string uri);
-		public void select_all ();
-		public bool select_uri (string uri) throws GLib.Error;
-		public void set_column_headers_visible (bool visible);
-		public bool set_current_folder_uri (string folder) throws GLib.Error;
-		public void set_filter (Gtk.FileFilter filter);
-		public void set_mode (Hildon.FileSelectionMode mode);
-		public void set_select_multiple (bool select_multiple);
-		public void set_sort_key (Hildon.FileSelectionSortKey key, Gtk.SortType order);
-		public void show_content_pane ();
-		public void undim_all ();
-		public void unselect_all ();
-		public void unselect_uri (string uri);
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public FileSelection.with_model (Hildon.FileSystemModel model);
-		[NoAccessorMethod]
-		public int active_pane { get; set; }
-		[NoAccessorMethod]
-		public bool drag_enabled { get; construct; }
-		[NoAccessorMethod]
-		public string empty_text { owned get; set; }
-		[NoAccessorMethod]
-		public bool local_only { get; set; }
-		[NoAccessorMethod]
-		public Hildon.FileSystemModel model { owned get; construct; }
-		[NoAccessorMethod]
-		public int pane_position { get; set construct; }
-		[NoAccessorMethod]
-		public void* safe_folder { get; set; }
-		[NoAccessorMethod]
-		public bool show_hidden { get; set; }
-		[NoAccessorMethod]
-		public bool show_upnp { get; set construct; }
-		[NoAccessorMethod]
-		public int visible_columns { get; construct; }
-		public virtual signal void content_pane_context_menu ();
-		public virtual signal void current_folder_changed ();
-		public virtual signal void file_activated ();
-		public virtual signal void location_insensitive (Gtk.TreeIter iter);
-		public virtual signal void navigation_pane_context_menu ();
-		public virtual signal void selection_changed ();
-		public virtual signal void uris_dropped (string destination, void* sources);
-	}
-	[CCode (cheader_filename = "hildon/hildon-file-system-info.h")]
-	[Compact]
-	public class FileSystemInfo {
-		[CCode (has_construct_function = false)]
-		public FileSystemInfo (string uri) throws GLib.Error;
-		public static void async_cancel (Hildon.FileSystemInfoHandle handle);
-		public static unowned Hildon.FileSystemInfoHandle async_new (string uri, Hildon.FileSystemInfoCallback callback);
-		public unowned string get_display_name ();
-		public unowned Gdk.Pixbuf get_icon (Gtk.Widget ref_widget);
-		public unowned Gdk.Pixbuf get_icon_at_size (Gtk.Widget ref_widget, int size);
-	}
-	[CCode (cheader_filename = "hildon/hildon-file-system-info.h")]
-	[Compact]
-	public class FileSystemInfoHandle {
-	}
-	[CCode (cheader_filename = "hildon/hildon-file-system-model.h")]
-	public class FileSystemModel : GLib.Object, Gtk.TreeModel, Gtk.TreeDragSource {
-		[CCode (has_construct_function = false)]
-		protected FileSystemModel ();
-		public unowned string autoname_uri (string uri) throws GLib.Error;
-		[CCode (has_construct_function = false, type = "gchar*")]
-		public FileSystemModel.item (Hildon.FileSystemModel model, Gtk.TreeIter parent, string stub_name, string extension);
-		public void iter_available (Gtk.TreeIter iter, bool available);
-		public bool load_local_path (string path, Gtk.TreeIter iter);
-		public bool load_uri (string uri, Gtk.TreeIter iter);
-		public void reset_available ();
-		public bool search_local_path (string path, Gtk.TreeIter iter, Gtk.TreeIter start_iter, bool recursive);
-		public bool search_uri (string uri, Gtk.TreeIter iter, Gtk.TreeIter start_iter, bool recursive);
-		[NoAccessorMethod]
-		public string backend { owned get; construct; }
-		[NoAccessorMethod]
-		public void* backend_object { get; construct; }
-		[NoAccessorMethod]
-		public bool multi_root { get; construct; }
-		[NoAccessorMethod]
-		public Gtk.Widget ref_widget { owned get; set; }
-		[NoAccessorMethod]
-		public string root_dir { owned get; construct; }
-		[NoAccessorMethod]
-		public void* thumbnail_callback { get; set; }
-		public virtual signal void device_disconnected (Gtk.TreeIter iter);
-		public virtual signal void finished_loading (Gtk.TreeIter iter);
-	}
-	[CCode (cheader_filename = "hildon/hildon-file-system-storage-dialog.h")]
-	public class FileSystemStorageDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public FileSystemStorageDialog (Gtk.Window parent, string uri_str);
-		public static void set_uri (Gtk.Widget widget, string uri_str);
-	}
-	[CCode (cheader_filename = "hildon/hildon-file-selection.h", cprefix = "HILDON_FILE_SELECTION_MODE_", has_type_id = false)]
-	public enum FileSelectionMode {
-		LIST,
-		THUMBNAILS
-	}
-	[CCode (cheader_filename = "hildon/hildon-file-selection.h", cprefix = "HILDON_FILE_SELECTION_PANE_", has_type_id = false)]
-	public enum FileSelectionPane {
-		NAVIGATION,
-		CONTENT
-	}
-	[CCode (cheader_filename = "hildon/hildon-file-selection.h", cprefix = "HILDON_FILE_SELECTION_SORT_", has_type_id = false)]
-	public enum FileSelectionSortKey {
-		NAME,
-		TYPE,
-		MODIFIED,
-		SIZE
-	}
-	[CCode (cheader_filename = "hildon/hildon-file-selection.h", cprefix = "HILDON_FILE_SELECTION_SHOW_", has_type_id = false)]
-	public enum FileSelectionVisibleColumns {
-		NAME,
-		MODIFIED,
-		SIZE,
-		ALL
-	}
-	[CCode (cheader_filename = "hildon/hildon-file-system-model.h", cprefix = "HILDON_FILE_SYSTEM_MODEL_", has_type_id = false)]
-	public enum FileSystemModelColumns {
-		COLUMN_GTK_PATH_INTERNAL,
-		COLUMN_LOCAL_PATH,
-		COLUMN_URI,
-		COLUMN_FILE_NAME,
-		COLUMN_DISPLAY_NAME,
-		COLUMN_SORT_KEY,
-		COLUMN_MIME_TYPE,
-		COLUMN_FILE_SIZE,
-		COLUMN_FILE_TIME,
-		COLUMN_IS_FOLDER,
-		COLUMN_IS_AVAILABLE,
-		COLUMN_HAS_LOCAL_PATH,
-		COLUMN_TYPE,
-		COLUMN_ICON,
-		COLUMN_ICON_EXPANDED,
-		COLUMN_ICON_COLLAPSED,
-		COLUMN_THUMBNAIL,
-		COLUMN_LOAD_READY,
-		COLUMN_FREE_SPACE,
-		COLUMN_TITLE,
-		COLUMN_AUTHOR,
-		COLUMN_IS_HIDDEN,
-		COLUMN_UNAVAILABLE_REASON,
-		COLUMN_FAILED_ACCESS_MESSAGE,
-		COLUMN_SORT_WEIGHT,
-		COLUMN_EXTRA_INFO,
-		COLUMN_IS_DRIVE,
-		NUM_COLUMNS
-	}
-	[CCode (cheader_filename = "hildon/hildon-file-system-model.h", cprefix = "HILDON_FILE_SYSTEM_MODEL_", has_type_id = false)]
-	public enum FileSystemModelItemType {
-		UNKNOWN,
-		FILE,
-		FOLDER,
-		SAFE_FOLDER_IMAGES,
-		SAFE_FOLDER_VIDEOS,
-		SAFE_FOLDER_SOUNDS,
-		SAFE_FOLDER_DOCUMENTS,
-		SAFE_FOLDER_GAMES,
-		MMC,
-		GATEWAY,
-		LOCAL_DEVICE
-	}
-	[CCode (cheader_filename = "hildon/hildon-file-system-info.h")]
-	public delegate void FileSystemInfoCallback (Hildon.FileSystemInfoHandle handle, Hildon.FileSystemInfo info, GLib.Error error);
-	[CCode (cheader_filename = "hildon/hildon-file-system-model.h", has_target = false)]
-	public delegate bool FileSystemModelThumbnailCallback (string uri, string path, string thumbnail_file);
-}
diff --git a/vapi/packages/hildon-1/hildon-1-custom.vala b/vapi/packages/hildon-1/hildon-1-custom.vala
deleted file mode 100644
index d791cae02..000000000
--- a/vapi/packages/hildon-1/hildon-1-custom.vala
+++ /dev/null
@@ -1,59 +0,0 @@
-/* hildon.vala
- *
- * Copyright (C) 2009  Philipp Zabel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
-
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
-
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
- *
- * Author:
- * 	Philipp Zabel <philipp.zabel@gmail.com>
- */
-
-namespace Hildon {
-	[CCode (cprefix = "HILDON_GTK_INPUT_MODE_", has_type_id = false, cheader_filename = "gtk/gtk.h")]
-	public enum GtkInputMode {
-		ALPHA,
-		NUMERIC,
-		SPECIAL,
-		HEXA,
-		TELE,
-		FULL,
-		MULTILINE,
-		INVISIBLE,
-		AUTOCAP,
-		DICTIONARY
-	}
-	[CCode (cprefix = "HILDON_", has_type_id = false, cheader_filename = "gtk/gtk.h")]
-	public enum Mode {
-		DIABLO,
-		FREMANTLE
-	}
-	[CCode (cprefix = "HILDON_SIZE_", has_type_id = false, cheader_filename = "gtk/gtk.h")]
-	public enum SizeType {
-		AUTO_WIDTH,
-		HALFSCREEN_WIDTH,
-		FULLSCREEN_WIDTH,
-		AUTO_HEIGHT,
-		FINGER_HEIGHT,
-		THUMB_HEIGHT,
-		AUTO
-	}
-	[CCode (cprefix = "HILDON_UI_MODE_", has_type_id = false, cheader_filename = "gtk/gtk.h")]
-	public enum UIMode {
-		NORMAL,
-		EDIT
-	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static void gtk_widget_set_theme_size (Gtk.Widget widget, Hildon.SizeType size);
-}
diff --git a/vapi/packages/hildon-1/hildon-1.deps b/vapi/packages/hildon-1/hildon-1.deps
deleted file mode 100644
index 277620623..000000000
--- a/vapi/packages/hildon-1/hildon-1.deps
+++ /dev/null
@@ -1,7 +0,0 @@
-gtk+-2.0
-gio-2.0
-gdk-pixbuf-2.0
-gdk-2.0
-pango
-atk
-cairo
diff --git a/vapi/packages/hildon-1/hildon-1.files b/vapi/packages/hildon-1/hildon-1.files
deleted file mode 100644
index 3bd350004..000000000
--- a/vapi/packages/hildon-1/hildon-1.files
+++ /dev/null
@@ -1,2 +0,0 @@
-include/hildon-1/hildon
-lib/libhildon-1.so
diff --git a/vapi/packages/hildon-1/hildon-1.gi b/vapi/packages/hildon-1/hildon-1.gi
deleted file mode 100644
index 38f80b059..000000000
--- a/vapi/packages/hildon-1/hildon-1.gi
+++ /dev/null
@@ -1,3766 +0,0 @@
-<?xml version="1.0"?>
-<api version="1.0">
-	<namespace name="Hildon">
-		<function name="format_file_size_for_display" symbol="hildon_format_file_size_for_display">
-			<return-type type="gchar*"/>
-			<parameters>
-				<parameter name="size" type="goffset"/>
-			</parameters>
-		</function>
-		<function name="get_icon_pixel_size" symbol="hildon_get_icon_pixel_size">
-			<return-type type="gint"/>
-			<parameters>
-				<parameter name="size" type="GtkIconSize"/>
-			</parameters>
-		</function>
-		<function name="gtk_button_new" symbol="hildon_gtk_button_new">
-			<return-type type="GtkWidget*"/>
-			<parameters>
-				<parameter name="size" type="HildonSizeType"/>
-			</parameters>
-		</function>
-		<function name="gtk_hscale_new" symbol="hildon_gtk_hscale_new">
-			<return-type type="GtkWidget*"/>
-		</function>
-		<function name="gtk_icon_view_new" symbol="hildon_gtk_icon_view_new">
-			<return-type type="GtkWidget*"/>
-			<parameters>
-				<parameter name="mode" type="HildonUIMode"/>
-			</parameters>
-		</function>
-		<function name="gtk_icon_view_new_with_model" symbol="hildon_gtk_icon_view_new_with_model">
-			<return-type type="GtkWidget*"/>
-			<parameters>
-				<parameter name="mode" type="HildonUIMode"/>
-				<parameter name="model" type="GtkTreeModel*"/>
-			</parameters>
-		</function>
-		<function name="gtk_icon_view_set_ui_mode" symbol="hildon_gtk_icon_view_set_ui_mode">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="iconview" type="GtkIconView*"/>
-				<parameter name="mode" type="HildonUIMode"/>
-			</parameters>
-		</function>
-		<function name="gtk_init" symbol="hildon_gtk_init">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="argc" type="int*"/>
-				<parameter name="argv" type="char***"/>
-			</parameters>
-		</function>
-		<function name="gtk_menu_new" symbol="hildon_gtk_menu_new">
-			<return-type type="GtkWidget*"/>
-		</function>
-		<function name="gtk_radio_button_new" symbol="hildon_gtk_radio_button_new">
-			<return-type type="GtkWidget*"/>
-			<parameters>
-				<parameter name="size" type="HildonSizeType"/>
-				<parameter name="group" type="GSList*"/>
-			</parameters>
-		</function>
-		<function name="gtk_radio_button_new_from_widget" symbol="hildon_gtk_radio_button_new_from_widget">
-			<return-type type="GtkWidget*"/>
-			<parameters>
-				<parameter name="size" type="HildonSizeType"/>
-				<parameter name="radio_group_member" type="GtkRadioButton*"/>
-			</parameters>
-		</function>
-		<function name="gtk_toggle_button_new" symbol="hildon_gtk_toggle_button_new">
-			<return-type type="GtkWidget*"/>
-			<parameters>
-				<parameter name="size" type="HildonSizeType"/>
-			</parameters>
-		</function>
-		<function name="gtk_tree_view_new" symbol="hildon_gtk_tree_view_new">
-			<return-type type="GtkWidget*"/>
-			<parameters>
-				<parameter name="mode" type="HildonUIMode"/>
-			</parameters>
-		</function>
-		<function name="gtk_tree_view_new_with_model" symbol="hildon_gtk_tree_view_new_with_model">
-			<return-type type="GtkWidget*"/>
-			<parameters>
-				<parameter name="mode" type="HildonUIMode"/>
-				<parameter name="model" type="GtkTreeModel*"/>
-			</parameters>
-		</function>
-		<function name="gtk_tree_view_set_ui_mode" symbol="hildon_gtk_tree_view_set_ui_mode">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="treeview" type="GtkTreeView*"/>
-				<parameter name="mode" type="HildonUIMode"/>
-			</parameters>
-		</function>
-		<function name="gtk_vscale_new" symbol="hildon_gtk_vscale_new">
-			<return-type type="GtkWidget*"/>
-		</function>
-		<function name="gtk_window_set_do_not_disturb" symbol="hildon_gtk_window_set_do_not_disturb">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="window" type="GtkWindow*"/>
-				<parameter name="dndflag" type="gboolean"/>
-			</parameters>
-		</function>
-		<function name="gtk_window_set_portrait_flags" symbol="hildon_gtk_window_set_portrait_flags">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="window" type="GtkWindow*"/>
-				<parameter name="portrait_flags" type="HildonPortraitFlags"/>
-			</parameters>
-		</function>
-		<function name="gtk_window_set_progress_indicator" symbol="hildon_gtk_window_set_progress_indicator">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="window" type="GtkWindow*"/>
-				<parameter name="state" type="guint"/>
-			</parameters>
-		</function>
-		<function name="gtk_window_take_screenshot" symbol="hildon_gtk_window_take_screenshot">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="window" type="GtkWindow*"/>
-				<parameter name="take" type="gboolean"/>
-			</parameters>
-		</function>
-		<function name="helper_event_button_is_finger" symbol="hildon_helper_event_button_is_finger">
-			<return-type type="gboolean"/>
-			<parameters>
-				<parameter name="event" type="GdkEventButton*"/>
-			</parameters>
-		</function>
-		<function name="helper_set_insensitive_message" symbol="hildon_helper_set_insensitive_message">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="widget" type="GtkWidget*"/>
-				<parameter name="message" type="gchar*"/>
-			</parameters>
-		</function>
-		<function name="helper_set_insensitive_messagef" symbol="hildon_helper_set_insensitive_messagef">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="widget" type="GtkWidget*"/>
-				<parameter name="format" type="gchar*"/>
-			</parameters>
-		</function>
-		<function name="helper_set_logical_color" symbol="hildon_helper_set_logical_color">
-			<return-type type="gulong"/>
-			<parameters>
-				<parameter name="widget" type="GtkWidget*"/>
-				<parameter name="rcflags" type="GtkRcFlags"/>
-				<parameter name="state" type="GtkStateType"/>
-				<parameter name="logicalcolorname" type="gchar*"/>
-			</parameters>
-		</function>
-		<function name="helper_set_logical_font" symbol="hildon_helper_set_logical_font">
-			<return-type type="gulong"/>
-			<parameters>
-				<parameter name="widget" type="GtkWidget*"/>
-				<parameter name="logicalfontname" type="gchar*"/>
-			</parameters>
-		</function>
-		<function name="helper_set_thumb_scrollbar" symbol="hildon_helper_set_thumb_scrollbar">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="win" type="GtkScrolledWindow*"/>
-				<parameter name="thumb" type="gboolean"/>
-			</parameters>
-		</function>
-		<function name="init" symbol="hildon_init">
-			<return-type type="void"/>
-		</function>
-		<function name="pannable_get_child_widget_at" symbol="hildon_pannable_get_child_widget_at">
-			<return-type type="GtkWidget*"/>
-			<parameters>
-				<parameter name="area" type="HildonPannableArea*"/>
-				<parameter name="x" type="gdouble"/>
-				<parameter name="y" type="gdouble"/>
-			</parameters>
-		</function>
-		<function name="play_system_sound" symbol="hildon_play_system_sound">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="sample" type="gchar*"/>
-			</parameters>
-		</function>
-		<callback name="HildonTouchSelectorPrintFunc">
-			<return-type type="gchar*"/>
-			<parameters>
-				<parameter name="selector" type="HildonTouchSelector*"/>
-				<parameter name="user_data" type="gpointer"/>
-			</parameters>
-		</callback>
-		<callback name="HildonWizardDialogPageFunc">
-			<return-type type="gboolean"/>
-			<parameters>
-				<parameter name="notebook" type="GtkNotebook*"/>
-				<parameter name="current_page" type="gint"/>
-				<parameter name="data" type="gpointer"/>
-			</parameters>
-		</callback>
-		<enum name="HildonButtonArrangement" type-name="HildonButtonArrangement" get-type="hildon_button_arrangement_get_type">
-			<member name="HILDON_BUTTON_ARRANGEMENT_HORIZONTAL" value="0"/>
-			<member name="HILDON_BUTTON_ARRANGEMENT_VERTICAL" value="1"/>
-		</enum>
-		<enum name="HildonButtonStyle" type-name="HildonButtonStyle" get-type="hildon_button_style_get_type">
-			<member name="HILDON_BUTTON_STYLE_NORMAL" value="0"/>
-			<member name="HILDON_BUTTON_STYLE_PICKER" value="1"/>
-		</enum>
-		<enum name="HildonCaptionIconPosition" type-name="HildonCaptionIconPosition" get-type="hildon_caption_icon_position_get_type">
-			<member name="HILDON_CAPTION_POSITION_LEFT" value="0"/>
-			<member name="HILDON_CAPTION_POSITION_RIGHT" value="1"/>
-		</enum>
-		<enum name="HildonCaptionStatus" type-name="HildonCaptionStatus" get-type="hildon_caption_status_get_type">
-			<member name="HILDON_CAPTION_OPTIONAL" value="0"/>
-			<member name="HILDON_CAPTION_MANDATORY" value="1"/>
-		</enum>
-		<enum name="HildonDateTimeError" type-name="HildonDateTimeError" get-type="hildon_date_time_error_get_type">
-			<member name="HILDON_DATE_TIME_ERROR_NO_ERROR" value="-1"/>
-			<member name="HILDON_DATE_TIME_ERROR_MAX_HOURS" value="0"/>
-			<member name="HILDON_DATE_TIME_ERROR_MAX_MINS" value="1"/>
-			<member name="HILDON_DATE_TIME_ERROR_MAX_SECS" value="2"/>
-			<member name="HILDON_DATE_TIME_ERROR_MAX_DAY" value="3"/>
-			<member name="HILDON_DATE_TIME_ERROR_MAX_MONTH" value="4"/>
-			<member name="HILDON_DATE_TIME_ERROR_MAX_YEAR" value="5"/>
-			<member name="HILDON_DATE_TIME_ERROR_MIN_HOURS" value="6"/>
-			<member name="HILDON_DATE_TIME_ERROR_MIN_MINS" value="7"/>
-			<member name="HILDON_DATE_TIME_ERROR_MIN_SECS" value="8"/>
-			<member name="HILDON_DATE_TIME_ERROR_MIN_DAY" value="9"/>
-			<member name="HILDON_DATE_TIME_ERROR_MIN_MONTH" value="10"/>
-			<member name="HILDON_DATE_TIME_ERROR_MIN_YEAR" value="11"/>
-			<member name="HILDON_DATE_TIME_ERROR_EMPTY_HOURS" value="12"/>
-			<member name="HILDON_DATE_TIME_ERROR_EMPTY_MINS" value="13"/>
-			<member name="HILDON_DATE_TIME_ERROR_EMPTY_SECS" value="14"/>
-			<member name="HILDON_DATE_TIME_ERROR_EMPTY_DAY" value="15"/>
-			<member name="HILDON_DATE_TIME_ERROR_EMPTY_MONTH" value="16"/>
-			<member name="HILDON_DATE_TIME_ERROR_EMPTY_YEAR" value="17"/>
-			<member name="HILDON_DATE_TIME_ERROR_MIN_DURATION" value="18"/>
-			<member name="HILDON_DATE_TIME_ERROR_MAX_DURATION" value="19"/>
-			<member name="HILDON_DATE_TIME_ERROR_INVALID_CHAR" value="20"/>
-			<member name="HILDON_DATE_TIME_ERROR_INVALID_DATE" value="21"/>
-			<member name="HILDON_DATE_TIME_ERROR_INVALID_TIME" value="22"/>
-		</enum>
-		<enum name="HildonMovementDirection" type-name="HildonMovementDirection" get-type="hildon_movement_direction_get_type">
-			<member name="HILDON_MOVEMENT_UP" value="0"/>
-			<member name="HILDON_MOVEMENT_DOWN" value="1"/>
-			<member name="HILDON_MOVEMENT_LEFT" value="2"/>
-			<member name="HILDON_MOVEMENT_RIGHT" value="3"/>
-		</enum>
-		<enum name="HildonNoteType" type-name="HildonNoteType" get-type="hildon_note_type_get_type">
-			<member name="HILDON_NOTE_TYPE_CONFIRMATION" value="0"/>
-			<member name="HILDON_NOTE_TYPE_CONFIRMATION_BUTTON" value="1"/>
-			<member name="HILDON_NOTE_TYPE_INFORMATION" value="2"/>
-			<member name="HILDON_NOTE_TYPE_INFORMATION_THEME" value="3"/>
-			<member name="HILDON_NOTE_TYPE_PROGRESSBAR" value="4"/>
-		</enum>
-		<enum name="HildonNumberEditorErrorType" type-name="HildonNumberEditorErrorType" get-type="hildon_number_editor_error_type_get_type">
-			<member name="HILDON_NUMBER_EDITOR_ERROR_MAXIMUM_VALUE_EXCEED" value="0"/>
-			<member name="HILDON_NUMBER_EDITOR_ERROR_MINIMUM_VALUE_EXCEED" value="1"/>
-			<member name="HILDON_NUMBER_EDITOR_ERROR_ERRONEOUS_VALUE" value="2"/>
-		</enum>
-		<enum name="HildonPannableAreaMode" type-name="HildonPannableAreaMode" get-type="hildon_pannable_area_mode_get_type">
-			<member name="HILDON_PANNABLE_AREA_MODE_PUSH" value="0"/>
-			<member name="HILDON_PANNABLE_AREA_MODE_ACCEL" value="1"/>
-			<member name="HILDON_PANNABLE_AREA_MODE_AUTO" value="2"/>
-		</enum>
-		<enum name="HildonSizeRequestPolicy" type-name="HildonSizeRequestPolicy" get-type="hildon_size_request_policy_get_type">
-			<member name="HILDON_SIZE_REQUEST_MINIMUM" value="0"/>
-			<member name="HILDON_SIZE_REQUEST_CHILDREN" value="1"/>
-		</enum>
-		<enum name="HildonTimeSelectorFormatPolicy" type-name="HildonTimeSelectorFormatPolicy" get-type="hildon_time_selector_format_policy_get_type">
-			<member name="HILDON_TIME_SELECTOR_FORMAT_POLICY_AMPM" value="0"/>
-			<member name="HILDON_TIME_SELECTOR_FORMAT_POLICY_24H" value="1"/>
-			<member name="HILDON_TIME_SELECTOR_FORMAT_POLICY_AUTOMATIC" value="2"/>
-		</enum>
-		<enum name="HildonTouchSelectorSelectionMode" type-name="HildonTouchSelectorSelectionMode" get-type="hildon_touch_selector_selection_mode_get_type">
-			<member name="HILDON_TOUCH_SELECTOR_SELECTION_MODE_SINGLE" value="0"/>
-			<member name="HILDON_TOUCH_SELECTOR_SELECTION_MODE_MULTIPLE" value="1"/>
-		</enum>
-		<enum name="HildonWindowClipboardOperation" type-name="HildonWindowClipboardOperation" get-type="hildon_window_clipboard_operation_get_type">
-			<member name="HILDON_WINDOW_CO_COPY" value="0"/>
-			<member name="HILDON_WINDOW_CO_CUT" value="1"/>
-			<member name="HILDON_WINDOW_CO_PASTE" value="2"/>
-		</enum>
-		<enum name="HildonWizardDialogResponse" type-name="HildonWizardDialogResponse" get-type="hildon_wizard_dialog_response_get_type">
-			<member name="HILDON_WIZARD_DIALOG_CANCEL" value="-6"/>
-			<member name="HILDON_WIZARD_DIALOG_PREVIOUS" value="0"/>
-			<member name="HILDON_WIZARD_DIALOG_NEXT" value="1"/>
-			<member name="HILDON_WIZARD_DIALOG_FINISH" value="2"/>
-		</enum>
-		<flags name="HildonCalendarDisplayOptions" type-name="HildonCalendarDisplayOptions" get-type="hildon_calendar_display_options_get_type">
-			<member name="HILDON_CALENDAR_SHOW_HEADING" value="1"/>
-			<member name="HILDON_CALENDAR_SHOW_DAY_NAMES" value="2"/>
-			<member name="HILDON_CALENDAR_NO_MONTH_CHANGE" value="4"/>
-			<member name="HILDON_CALENDAR_SHOW_WEEK_NUMBERS" value="8"/>
-			<member name="HILDON_CALENDAR_WEEK_START_MONDAY" value="16"/>
-		</flags>
-		<flags name="HildonMovementMode" type-name="HildonMovementMode" get-type="hildon_movement_mode_get_type">
-			<member name="HILDON_MOVEMENT_MODE_HORIZ" value="2"/>
-			<member name="HILDON_MOVEMENT_MODE_VERT" value="4"/>
-			<member name="HILDON_MOVEMENT_MODE_BOTH" value="6"/>
-		</flags>
-		<flags name="HildonPortraitFlags" type-name="HildonPortraitFlags" get-type="hildon_portrait_flags_get_type">
-			<member name="HILDON_PORTRAIT_MODE_REQUEST" value="1"/>
-			<member name="HILDON_PORTRAIT_MODE_SUPPORT" value="2"/>
-		</flags>
-		<object name="HildonAnimationActor" parent="GtkWindow" type-name="HildonAnimationActor" get-type="hildon_animation_actor_get_type">
-			<implements>
-				<interface name="AtkImplementor"/>
-				<interface name="GtkBuildable"/>
-			</implements>
-			<constructor name="new" symbol="hildon_animation_actor_new">
-				<return-type type="GtkWidget*"/>
-			</constructor>
-			<method name="send_message" symbol="hildon_animation_actor_send_message">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonAnimationActor*"/>
-					<parameter name="message_type" type="guint32"/>
-					<parameter name="l0" type="guint32"/>
-					<parameter name="l1" type="guint32"/>
-					<parameter name="l2" type="guint32"/>
-					<parameter name="l3" type="guint32"/>
-					<parameter name="l4" type="guint32"/>
-				</parameters>
-			</method>
-			<method name="set_anchor" symbol="hildon_animation_actor_set_anchor">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonAnimationActor*"/>
-					<parameter name="x" type="gint"/>
-					<parameter name="y" type="gint"/>
-				</parameters>
-			</method>
-			<method name="set_anchor_from_gravity" symbol="hildon_animation_actor_set_anchor_from_gravity">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonAnimationActor*"/>
-					<parameter name="gravity" type="guint"/>
-				</parameters>
-			</method>
-			<method name="set_depth" symbol="hildon_animation_actor_set_depth">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonAnimationActor*"/>
-					<parameter name="depth" type="gint"/>
-				</parameters>
-			</method>
-			<method name="set_opacity" symbol="hildon_animation_actor_set_opacity">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonAnimationActor*"/>
-					<parameter name="opacity" type="gint"/>
-				</parameters>
-			</method>
-			<method name="set_parent" symbol="hildon_animation_actor_set_parent">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonAnimationActor*"/>
-					<parameter name="parent" type="GtkWindow*"/>
-				</parameters>
-			</method>
-			<method name="set_position" symbol="hildon_animation_actor_set_position">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonAnimationActor*"/>
-					<parameter name="x" type="gint"/>
-					<parameter name="y" type="gint"/>
-				</parameters>
-			</method>
-			<method name="set_position_full" symbol="hildon_animation_actor_set_position_full">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonAnimationActor*"/>
-					<parameter name="x" type="gint"/>
-					<parameter name="y" type="gint"/>
-					<parameter name="depth" type="gint"/>
-				</parameters>
-			</method>
-			<method name="set_rotation" symbol="hildon_animation_actor_set_rotation">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonAnimationActor*"/>
-					<parameter name="axis" type="gint"/>
-					<parameter name="degrees" type="double"/>
-					<parameter name="x" type="gint"/>
-					<parameter name="y" type="gint"/>
-					<parameter name="z" type="gint"/>
-				</parameters>
-			</method>
-			<method name="set_rotationx" symbol="hildon_animation_actor_set_rotationx">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonAnimationActor*"/>
-					<parameter name="axis" type="gint"/>
-					<parameter name="degrees" type="gint32"/>
-					<parameter name="x" type="gint"/>
-					<parameter name="y" type="gint"/>
-					<parameter name="z" type="gint"/>
-				</parameters>
-			</method>
-			<method name="set_scale" symbol="hildon_animation_actor_set_scale">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonAnimationActor*"/>
-					<parameter name="x_scale" type="double"/>
-					<parameter name="y_scale" type="double"/>
-				</parameters>
-			</method>
-			<method name="set_scalex" symbol="hildon_animation_actor_set_scalex">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonAnimationActor*"/>
-					<parameter name="x_scale" type="gint32"/>
-					<parameter name="y_scale" type="gint32"/>
-				</parameters>
-			</method>
-			<method name="set_show" symbol="hildon_animation_actor_set_show">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonAnimationActor*"/>
-					<parameter name="show" type="gint"/>
-				</parameters>
-			</method>
-			<method name="set_show_full" symbol="hildon_animation_actor_set_show_full">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonAnimationActor*"/>
-					<parameter name="show" type="gint"/>
-					<parameter name="opacity" type="gint"/>
-				</parameters>
-			</method>
-		</object>
-		<object name="HildonAppMenu" parent="GtkWindow" type-name="HildonAppMenu" get-type="hildon_app_menu_get_type">
-			<implements>
-				<interface name="AtkImplementor"/>
-				<interface name="GtkBuildable"/>
-			</implements>
-			<method name="add_filter" symbol="hildon_app_menu_add_filter">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="menu" type="HildonAppMenu*"/>
-					<parameter name="filter" type="GtkButton*"/>
-				</parameters>
-			</method>
-			<method name="append" symbol="hildon_app_menu_append">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="menu" type="HildonAppMenu*"/>
-					<parameter name="item" type="GtkButton*"/>
-				</parameters>
-			</method>
-			<method name="get_filters" symbol="hildon_app_menu_get_filters">
-				<return-type type="GList*"/>
-				<parameters>
-					<parameter name="menu" type="HildonAppMenu*"/>
-				</parameters>
-			</method>
-			<method name="get_items" symbol="hildon_app_menu_get_items">
-				<return-type type="GList*"/>
-				<parameters>
-					<parameter name="menu" type="HildonAppMenu*"/>
-				</parameters>
-			</method>
-			<method name="insert" symbol="hildon_app_menu_insert">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="menu" type="HildonAppMenu*"/>
-					<parameter name="item" type="GtkButton*"/>
-					<parameter name="position" type="gint"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="hildon_app_menu_new">
-				<return-type type="GtkWidget*"/>
-			</constructor>
-			<method name="popup" symbol="hildon_app_menu_popup">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="menu" type="HildonAppMenu*"/>
-					<parameter name="parent_window" type="GtkWindow*"/>
-				</parameters>
-			</method>
-			<method name="prepend" symbol="hildon_app_menu_prepend">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="menu" type="HildonAppMenu*"/>
-					<parameter name="item" type="GtkButton*"/>
-				</parameters>
-			</method>
-			<method name="reorder_child" symbol="hildon_app_menu_reorder_child">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="menu" type="HildonAppMenu*"/>
-					<parameter name="item" type="GtkButton*"/>
-					<parameter name="position" type="gint"/>
-				</parameters>
-			</method>
-		</object>
-		<object name="HildonBanner" parent="GtkWindow" type-name="HildonBanner" get-type="hildon_banner_get_type">
-			<implements>
-				<interface name="AtkImplementor"/>
-				<interface name="GtkBuildable"/>
-			</implements>
-			<method name="set_fraction" symbol="hildon_banner_set_fraction">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonBanner*"/>
-					<parameter name="fraction" type="gdouble"/>
-				</parameters>
-			</method>
-			<method name="set_icon" symbol="hildon_banner_set_icon">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonBanner*"/>
-					<parameter name="icon_name" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="set_icon_from_file" symbol="hildon_banner_set_icon_from_file">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonBanner*"/>
-					<parameter name="icon_file" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="set_markup" symbol="hildon_banner_set_markup">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonBanner*"/>
-					<parameter name="markup" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="set_text" symbol="hildon_banner_set_text">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonBanner*"/>
-					<parameter name="text" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="set_timeout" symbol="hildon_banner_set_timeout">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonBanner*"/>
-					<parameter name="timeout" type="guint"/>
-				</parameters>
-			</method>
-			<method name="show_animation" symbol="hildon_banner_show_animation">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="widget" type="GtkWidget*"/>
-					<parameter name="animation_name" type="gchar*"/>
-					<parameter name="text" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="show_information" symbol="hildon_banner_show_information">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="widget" type="GtkWidget*"/>
-					<parameter name="icon_name" type="gchar*"/>
-					<parameter name="text" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="show_information_override_dnd" symbol="hildon_banner_show_information_override_dnd">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="widget" type="GtkWidget*"/>
-					<parameter name="text" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="show_information_with_markup" symbol="hildon_banner_show_information_with_markup">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="widget" type="GtkWidget*"/>
-					<parameter name="icon_name" type="gchar*"/>
-					<parameter name="markup" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="show_informationf" symbol="hildon_banner_show_informationf">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="widget" type="GtkWidget*"/>
-					<parameter name="icon_name" type="gchar*"/>
-					<parameter name="format" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="show_progress" symbol="hildon_banner_show_progress">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="widget" type="GtkWidget*"/>
-					<parameter name="bar" type="GtkProgressBar*"/>
-					<parameter name="text" type="gchar*"/>
-				</parameters>
-			</method>
-			<property name="is-timed" type="gboolean" readable="1" writable="1" construct="0" construct-only="1"/>
-			<property name="parent-window" type="GtkWindow*" readable="1" writable="1" construct="0" construct-only="1"/>
-			<property name="timeout" type="guint" readable="1" writable="1" construct="0" construct-only="1"/>
-		</object>
-		<object name="HildonBreadCrumbTrail" parent="GtkContainer" type-name="HildonBreadCrumbTrail" get-type="hildon_bread_crumb_trail_get_type">
-			<implements>
-				<interface name="AtkImplementor"/>
-				<interface name="GtkBuildable"/>
-			</implements>
-			<method name="clear" symbol="hildon_bread_crumb_trail_clear">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="bct" type="HildonBreadCrumbTrail*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="hildon_bread_crumb_trail_new">
-				<return-type type="GtkWidget*"/>
-			</constructor>
-			<method name="pop" symbol="hildon_bread_crumb_trail_pop">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="bct" type="HildonBreadCrumbTrail*"/>
-				</parameters>
-			</method>
-			<method name="push" symbol="hildon_bread_crumb_trail_push">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="bct" type="HildonBreadCrumbTrail*"/>
-					<parameter name="item" type="HildonBreadCrumb*"/>
-					<parameter name="id" type="gpointer"/>
-					<parameter name="destroy" type="GDestroyNotify"/>
-				</parameters>
-			</method>
-			<method name="push_icon" symbol="hildon_bread_crumb_trail_push_icon">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="bct" type="HildonBreadCrumbTrail*"/>
-					<parameter name="text" type="gchar*"/>
-					<parameter name="icon" type="GtkWidget*"/>
-					<parameter name="id" type="gpointer"/>
-					<parameter name="destroy" type="GDestroyNotify"/>
-				</parameters>
-			</method>
-			<method name="push_text" symbol="hildon_bread_crumb_trail_push_text">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="bct" type="HildonBreadCrumbTrail*"/>
-					<parameter name="text" type="gchar*"/>
-					<parameter name="id" type="gpointer"/>
-					<parameter name="destroy" type="GDestroyNotify"/>
-				</parameters>
-			</method>
-			<signal name="crumb-clicked" when="LAST">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="bct" type="HildonBreadCrumbTrail*"/>
-					<parameter name="id" type="gpointer"/>
-				</parameters>
-			</signal>
-			<signal name="move-parent" when="LAST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="bct" type="HildonBreadCrumbTrail*"/>
-				</parameters>
-			</signal>
-		</object>
-		<object name="HildonButton" parent="GtkButton" type-name="HildonButton" get-type="hildon_button_get_type">
-			<implements>
-				<interface name="AtkImplementor"/>
-				<interface name="GtkBuildable"/>
-			</implements>
-			<method name="add_image_size_group" symbol="hildon_button_add_image_size_group">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="button" type="HildonButton*"/>
-					<parameter name="size_group" type="GtkSizeGroup*"/>
-				</parameters>
-			</method>
-			<method name="add_size_groups" symbol="hildon_button_add_size_groups">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="button" type="HildonButton*"/>
-					<parameter name="title_size_group" type="GtkSizeGroup*"/>
-					<parameter name="value_size_group" type="GtkSizeGroup*"/>
-					<parameter name="image_size_group" type="GtkSizeGroup*"/>
-				</parameters>
-			</method>
-			<method name="add_title_size_group" symbol="hildon_button_add_title_size_group">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="button" type="HildonButton*"/>
-					<parameter name="size_group" type="GtkSizeGroup*"/>
-				</parameters>
-			</method>
-			<method name="add_value_size_group" symbol="hildon_button_add_value_size_group">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="button" type="HildonButton*"/>
-					<parameter name="size_group" type="GtkSizeGroup*"/>
-				</parameters>
-			</method>
-			<method name="get_image" symbol="hildon_button_get_image">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="button" type="HildonButton*"/>
-				</parameters>
-			</method>
-			<method name="get_style" symbol="hildon_button_get_style">
-				<return-type type="HildonButtonStyle"/>
-				<parameters>
-					<parameter name="button" type="HildonButton*"/>
-				</parameters>
-			</method>
-			<method name="get_title" symbol="hildon_button_get_title">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="button" type="HildonButton*"/>
-				</parameters>
-			</method>
-			<method name="get_value" symbol="hildon_button_get_value">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="button" type="HildonButton*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="hildon_button_new">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="size" type="HildonSizeType"/>
-					<parameter name="arrangement" type="HildonButtonArrangement"/>
-				</parameters>
-			</constructor>
-			<constructor name="new_with_text" symbol="hildon_button_new_with_text">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="size" type="HildonSizeType"/>
-					<parameter name="arrangement" type="HildonButtonArrangement"/>
-					<parameter name="title" type="gchar*"/>
-					<parameter name="value" type="gchar*"/>
-				</parameters>
-			</constructor>
-			<method name="set_alignment" symbol="hildon_button_set_alignment">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="button" type="HildonButton*"/>
-					<parameter name="xalign" type="gfloat"/>
-					<parameter name="yalign" type="gfloat"/>
-					<parameter name="xscale" type="gfloat"/>
-					<parameter name="yscale" type="gfloat"/>
-				</parameters>
-			</method>
-			<method name="set_image" symbol="hildon_button_set_image">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="button" type="HildonButton*"/>
-					<parameter name="image" type="GtkWidget*"/>
-				</parameters>
-			</method>
-			<method name="set_image_alignment" symbol="hildon_button_set_image_alignment">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="button" type="HildonButton*"/>
-					<parameter name="xalign" type="gfloat"/>
-					<parameter name="yalign" type="gfloat"/>
-				</parameters>
-			</method>
-			<method name="set_image_position" symbol="hildon_button_set_image_position">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="button" type="HildonButton*"/>
-					<parameter name="position" type="GtkPositionType"/>
-				</parameters>
-			</method>
-			<method name="set_style" symbol="hildon_button_set_style">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="button" type="HildonButton*"/>
-					<parameter name="style" type="HildonButtonStyle"/>
-				</parameters>
-			</method>
-			<method name="set_text" symbol="hildon_button_set_text">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="button" type="HildonButton*"/>
-					<parameter name="title" type="gchar*"/>
-					<parameter name="value" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="set_title" symbol="hildon_button_set_title">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="button" type="HildonButton*"/>
-					<parameter name="title" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="set_title_alignment" symbol="hildon_button_set_title_alignment">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="button" type="HildonButton*"/>
-					<parameter name="xalign" type="gfloat"/>
-					<parameter name="yalign" type="gfloat"/>
-				</parameters>
-			</method>
-			<method name="set_value" symbol="hildon_button_set_value">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="button" type="HildonButton*"/>
-					<parameter name="value" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="set_value_alignment" symbol="hildon_button_set_value_alignment">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="button" type="HildonButton*"/>
-					<parameter name="xalign" type="gfloat"/>
-					<parameter name="yalign" type="gfloat"/>
-				</parameters>
-			</method>
-			<property name="arrangement" type="HildonButtonArrangement" readable="0" writable="1" construct="0" construct-only="1"/>
-			<property name="size" type="HildonSizeType" readable="0" writable="1" construct="0" construct-only="1"/>
-			<property name="style" type="HildonButtonStyle" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="title" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="value" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-		</object>
-		<object name="HildonCalendar" parent="GtkWidget" type-name="HildonCalendar" get-type="hildon_calendar_get_type">
-			<implements>
-				<interface name="AtkImplementor"/>
-				<interface name="GtkBuildable"/>
-			</implements>
-			<method name="clear_marks" symbol="hildon_calendar_clear_marks">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="calendar" type="HildonCalendar*"/>
-				</parameters>
-			</method>
-			<method name="freeze" symbol="hildon_calendar_freeze">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="calendar" type="HildonCalendar*"/>
-				</parameters>
-			</method>
-			<method name="get_date" symbol="hildon_calendar_get_date">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="calendar" type="HildonCalendar*"/>
-					<parameter name="year" type="guint*"/>
-					<parameter name="month" type="guint*"/>
-					<parameter name="day" type="guint*"/>
-				</parameters>
-			</method>
-			<method name="get_display_options" symbol="hildon_calendar_get_display_options">
-				<return-type type="HildonCalendarDisplayOptions"/>
-				<parameters>
-					<parameter name="calendar" type="HildonCalendar*"/>
-				</parameters>
-			</method>
-			<method name="mark_day" symbol="hildon_calendar_mark_day">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="calendar" type="HildonCalendar*"/>
-					<parameter name="day" type="guint"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="hildon_calendar_new">
-				<return-type type="GtkWidget*"/>
-			</constructor>
-			<method name="select_day" symbol="hildon_calendar_select_day">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="calendar" type="HildonCalendar*"/>
-					<parameter name="day" type="guint"/>
-				</parameters>
-			</method>
-			<method name="select_month" symbol="hildon_calendar_select_month">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="calendar" type="HildonCalendar*"/>
-					<parameter name="month" type="guint"/>
-					<parameter name="year" type="guint"/>
-				</parameters>
-			</method>
-			<method name="set_display_options" symbol="hildon_calendar_set_display_options">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="calendar" type="HildonCalendar*"/>
-					<parameter name="flags" type="HildonCalendarDisplayOptions"/>
-				</parameters>
-			</method>
-			<method name="thaw" symbol="hildon_calendar_thaw">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="calendar" type="HildonCalendar*"/>
-				</parameters>
-			</method>
-			<method name="unmark_day" symbol="hildon_calendar_unmark_day">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="calendar" type="HildonCalendar*"/>
-					<parameter name="day" type="guint"/>
-				</parameters>
-			</method>
-			<property name="day" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="max-year" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="min-year" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="month" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="no-month-change" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="show-day-names" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="show-heading" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="show-week-numbers" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="week-start" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="year" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-			<signal name="day-selected" when="FIRST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="calendar" type="HildonCalendar*"/>
-				</parameters>
-			</signal>
-			<signal name="day-selected-double-click" when="FIRST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="calendar" type="HildonCalendar*"/>
-				</parameters>
-			</signal>
-			<signal name="erroneous-date" when="FIRST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="object" type="HildonCalendar*"/>
-				</parameters>
-			</signal>
-			<signal name="month-changed" when="FIRST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="calendar" type="HildonCalendar*"/>
-				</parameters>
-			</signal>
-			<signal name="next-month" when="FIRST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="calendar" type="HildonCalendar*"/>
-				</parameters>
-			</signal>
-			<signal name="next-year" when="FIRST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="calendar" type="HildonCalendar*"/>
-				</parameters>
-			</signal>
-			<signal name="prev-month" when="FIRST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="calendar" type="HildonCalendar*"/>
-				</parameters>
-			</signal>
-			<signal name="prev-year" when="FIRST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="calendar" type="HildonCalendar*"/>
-				</parameters>
-			</signal>
-			<signal name="selected-date" when="FIRST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="object" type="HildonCalendar*"/>
-				</parameters>
-			</signal>
-			<field name="header_style" type="GtkStyle*"/>
-			<field name="label_style" type="GtkStyle*"/>
-			<field name="month" type="gint"/>
-			<field name="year" type="gint"/>
-			<field name="selected_day" type="gint"/>
-			<field name="day_month" type="gint[][]"/>
-			<field name="day" type="gint[][]"/>
-			<field name="num_marked_dates" type="gint"/>
-			<field name="marked_date" type="gint[]"/>
-			<field name="display_flags" type="HildonCalendarDisplayOptions"/>
-			<field name="marked_date_color" type="GdkColor[]"/>
-			<field name="gc" type="GdkGC*"/>
-			<field name="xor_gc" type="GdkGC*"/>
-			<field name="focus_row" type="gint"/>
-			<field name="focus_col" type="gint"/>
-			<field name="highlight_row" type="gint"/>
-			<field name="highlight_col" type="gint"/>
-			<field name="grow_space" type="gchar[]"/>
-		</object>
-		<object name="HildonCalendarPopup" parent="GtkDialog" type-name="HildonCalendarPopup" get-type="hildon_calendar_popup_get_type">
-			<implements>
-				<interface name="AtkImplementor"/>
-				<interface name="GtkBuildable"/>
-			</implements>
-			<method name="get_date" symbol="hildon_calendar_popup_get_date">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="cal" type="HildonCalendarPopup*"/>
-					<parameter name="year" type="guint*"/>
-					<parameter name="month" type="guint*"/>
-					<parameter name="day" type="guint*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="hildon_calendar_popup_new">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="parent" type="GtkWindow*"/>
-					<parameter name="year" type="guint"/>
-					<parameter name="month" type="guint"/>
-					<parameter name="day" type="guint"/>
-				</parameters>
-			</constructor>
-			<method name="set_date" symbol="hildon_calendar_popup_set_date">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="cal" type="HildonCalendarPopup*"/>
-					<parameter name="year" type="guint"/>
-					<parameter name="month" type="guint"/>
-					<parameter name="day" type="guint"/>
-				</parameters>
-			</method>
-			<property name="day" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="max-year" type="guint" readable="0" writable="1" construct="0" construct-only="0"/>
-			<property name="min-year" type="guint" readable="0" writable="1" construct="0" construct-only="0"/>
-			<property name="month" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="year" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-		</object>
-		<object name="HildonCaption" parent="GtkEventBox" type-name="HildonCaption" get-type="hildon_caption_get_type">
-			<implements>
-				<interface name="AtkImplementor"/>
-				<interface name="GtkBuildable"/>
-			</implements>
-			<method name="get_child_expand" symbol="hildon_caption_get_child_expand">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="caption" type="HildonCaption*"/>
-				</parameters>
-			</method>
-			<method name="get_icon_image" symbol="hildon_caption_get_icon_image">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="caption" type="HildonCaption*"/>
-				</parameters>
-			</method>
-			<method name="get_icon_position" symbol="hildon_caption_get_icon_position">
-				<return-type type="HildonCaptionIconPosition"/>
-				<parameters>
-					<parameter name="caption" type="HildonCaption*"/>
-				</parameters>
-			</method>
-			<method name="get_label" symbol="hildon_caption_get_label">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="caption" type="HildonCaption*"/>
-				</parameters>
-			</method>
-			<method name="get_label_alignment" symbol="hildon_caption_get_label_alignment">
-				<return-type type="gfloat"/>
-				<parameters>
-					<parameter name="caption" type="HildonCaption*"/>
-				</parameters>
-			</method>
-			<method name="get_separator" symbol="hildon_caption_get_separator">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="caption" type="HildonCaption*"/>
-				</parameters>
-			</method>
-			<method name="get_size_group" symbol="hildon_caption_get_size_group">
-				<return-type type="GtkSizeGroup*"/>
-				<parameters>
-					<parameter name="caption" type="HildonCaption*"/>
-				</parameters>
-			</method>
-			<method name="get_status" symbol="hildon_caption_get_status">
-				<return-type type="HildonCaptionStatus"/>
-				<parameters>
-					<parameter name="caption" type="HildonCaption*"/>
-				</parameters>
-			</method>
-			<method name="is_mandatory" symbol="hildon_caption_is_mandatory">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="caption" type="HildonCaption*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="hildon_caption_new">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="group" type="GtkSizeGroup*"/>
-					<parameter name="value" type="gchar*"/>
-					<parameter name="control" type="GtkWidget*"/>
-					<parameter name="icon" type="GtkWidget*"/>
-					<parameter name="flag" type="HildonCaptionStatus"/>
-				</parameters>
-			</constructor>
-			<method name="set_child_expand" symbol="hildon_caption_set_child_expand">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="caption" type="HildonCaption*"/>
-					<parameter name="expand" type="gboolean"/>
-				</parameters>
-			</method>
-			<method name="set_icon_image" symbol="hildon_caption_set_icon_image">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="caption" type="HildonCaption*"/>
-					<parameter name="icon" type="GtkWidget*"/>
-				</parameters>
-			</method>
-			<method name="set_icon_position" symbol="hildon_caption_set_icon_position">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="caption" type="HildonCaption*"/>
-					<parameter name="pos" type="HildonCaptionIconPosition"/>
-				</parameters>
-			</method>
-			<method name="set_label" symbol="hildon_caption_set_label">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="caption" type="HildonCaption*"/>
-					<parameter name="label" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="set_label_alignment" symbol="hildon_caption_set_label_alignment">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="caption" type="HildonCaption*"/>
-					<parameter name="alignment" type="gfloat"/>
-				</parameters>
-			</method>
-			<method name="set_label_markup" symbol="hildon_caption_set_label_markup">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="caption" type="HildonCaption*"/>
-					<parameter name="markup" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="set_separator" symbol="hildon_caption_set_separator">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="caption" type="HildonCaption*"/>
-					<parameter name="separator" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="set_size_group" symbol="hildon_caption_set_size_group">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="caption" type="HildonCaption*"/>
-					<parameter name="new_group" type="GtkSizeGroup*"/>
-				</parameters>
-			</method>
-			<method name="set_status" symbol="hildon_caption_set_status">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="caption" type="HildonCaption*"/>
-					<parameter name="flag" type="HildonCaptionStatus"/>
-				</parameters>
-			</method>
-			<property name="icon" type="GtkWidget*" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="icon-position" type="HildonCaptionIconPosition" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="label" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="markup" type="char*" readable="0" writable="1" construct="0" construct-only="0"/>
-			<property name="separator" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="size-group" type="GtkSizeGroup*" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="status" type="HildonCaptionStatus" readable="1" writable="1" construct="0" construct-only="0"/>
-			<signal name="activate" when="FIRST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="widget" type="HildonCaption*"/>
-				</parameters>
-			</signal>
-		</object>
-		<object name="HildonCheckButton" parent="GtkButton" type-name="HildonCheckButton" get-type="hildon_check_button_get_type">
-			<implements>
-				<interface name="AtkImplementor"/>
-				<interface name="GtkBuildable"/>
-			</implements>
-			<method name="get_active" symbol="hildon_check_button_get_active">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="button" type="HildonCheckButton*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="hildon_check_button_new">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="size" type="HildonSizeType"/>
-				</parameters>
-			</constructor>
-			<method name="set_active" symbol="hildon_check_button_set_active">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="button" type="HildonCheckButton*"/>
-					<parameter name="is_active" type="gboolean"/>
-				</parameters>
-			</method>
-			<property name="size" type="HildonSizeType" readable="0" writable="1" construct="0" construct-only="0"/>
-			<signal name="toggled" when="FIRST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="button" type="HildonCheckButton*"/>
-				</parameters>
-			</signal>
-		</object>
-		<object name="HildonCodeDialog" parent="GtkDialog" type-name="HildonCodeDialog" get-type="hildon_code_dialog_get_type">
-			<implements>
-				<interface name="AtkImplementor"/>
-				<interface name="GtkBuildable"/>
-			</implements>
-			<method name="clear_code" symbol="hildon_code_dialog_clear_code">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="dialog" type="HildonCodeDialog*"/>
-				</parameters>
-			</method>
-			<method name="get_code" symbol="hildon_code_dialog_get_code">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="dialog" type="HildonCodeDialog*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="hildon_code_dialog_new">
-				<return-type type="GtkWidget*"/>
-			</constructor>
-			<method name="set_help_text" symbol="hildon_code_dialog_set_help_text">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="dialog" type="HildonCodeDialog*"/>
-					<parameter name="text" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="set_input_sensitive" symbol="hildon_code_dialog_set_input_sensitive">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="dialog" type="HildonCodeDialog*"/>
-					<parameter name="sensitive" type="gboolean"/>
-				</parameters>
-			</method>
-			<signal name="input" when="LAST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="dialog" type="HildonCodeDialog*"/>
-				</parameters>
-			</signal>
-		</object>
-		<object name="HildonColorButton" parent="GtkButton" type-name="HildonColorButton" get-type="hildon_color_button_get_type">
-			<implements>
-				<interface name="AtkImplementor"/>
-				<interface name="GtkBuildable"/>
-			</implements>
-			<method name="get_color" symbol="hildon_color_button_get_color">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="button" type="HildonColorButton*"/>
-					<parameter name="color" type="GdkColor*"/>
-				</parameters>
-			</method>
-			<method name="get_popup_shown" symbol="hildon_color_button_get_popup_shown">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="button" type="HildonColorButton*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="hildon_color_button_new">
-				<return-type type="GtkWidget*"/>
-			</constructor>
-			<constructor name="new_with_color" symbol="hildon_color_button_new_with_color">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="color" type="GdkColor*"/>
-				</parameters>
-			</constructor>
-			<method name="popdown" symbol="hildon_color_button_popdown">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="button" type="HildonColorButton*"/>
-				</parameters>
-			</method>
-			<method name="set_color" symbol="hildon_color_button_set_color">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="button" type="HildonColorButton*"/>
-					<parameter name="color" type="GdkColor*"/>
-				</parameters>
-			</method>
-			<property name="color" type="GdkColor*" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="popup-shown" type="gboolean" readable="1" writable="0" construct="0" construct-only="0"/>
-			<signal name="setup-dialog" when="LAST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="object" type="HildonColorButton*"/>
-					<parameter name="p0" type="HildonColorChooserDialog*"/>
-				</parameters>
-			</signal>
-		</object>
-		<object name="HildonColorChooser" parent="GtkWidget" type-name="HildonColorChooser" get-type="hildon_color_chooser_get_type">
-			<implements>
-				<interface name="AtkImplementor"/>
-				<interface name="GtkBuildable"/>
-			</implements>
-			<method name="get_color" symbol="hildon_color_chooser_get_color">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="chooser" type="HildonColorChooser*"/>
-					<parameter name="color" type="GdkColor*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="hildon_color_chooser_new">
-				<return-type type="GtkWidget*"/>
-			</constructor>
-			<method name="set_color" symbol="hildon_color_chooser_set_color">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="chooser" type="HildonColorChooser*"/>
-					<parameter name="color" type="GdkColor*"/>
-				</parameters>
-			</method>
-			<property name="color" type="GdkColor*" readable="1" writable="1" construct="0" construct-only="0"/>
-			<signal name="color-changed" when="FIRST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="selection" type="HildonColorChooser*"/>
-				</parameters>
-			</signal>
-			<vfunc name="set_color">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="p1" type="HildonColorChooser*"/>
-					<parameter name="p2" type="GdkColor*"/>
-				</parameters>
-			</vfunc>
-		</object>
-		<object name="HildonColorChooserDialog" parent="GtkDialog" type-name="HildonColorChooserDialog" get-type="hildon_color_chooser_dialog_get_type">
-			<implements>
-				<interface name="AtkImplementor"/>
-				<interface name="GtkBuildable"/>
-			</implements>
-			<method name="get_color" symbol="hildon_color_chooser_dialog_get_color">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="dialog" type="HildonColorChooserDialog*"/>
-					<parameter name="color" type="GdkColor*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="hildon_color_chooser_dialog_new">
-				<return-type type="GtkWidget*"/>
-			</constructor>
-			<method name="set_color" symbol="hildon_color_chooser_dialog_set_color">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="dialog" type="HildonColorChooserDialog*"/>
-					<parameter name="color" type="GdkColor*"/>
-				</parameters>
-			</method>
-		</object>
-		<object name="HildonControlbar" parent="GtkScale" type-name="HildonControlbar" get-type="hildon_controlbar_get_type">
-			<implements>
-				<interface name="AtkImplementor"/>
-				<interface name="GtkBuildable"/>
-			</implements>
-			<method name="get_max" symbol="hildon_controlbar_get_max">
-				<return-type type="gint"/>
-				<parameters>
-					<parameter name="self" type="HildonControlbar*"/>
-				</parameters>
-			</method>
-			<method name="get_min" symbol="hildon_controlbar_get_min">
-				<return-type type="gint"/>
-				<parameters>
-					<parameter name="self" type="HildonControlbar*"/>
-				</parameters>
-			</method>
-			<method name="get_value" symbol="hildon_controlbar_get_value">
-				<return-type type="gint"/>
-				<parameters>
-					<parameter name="self" type="HildonControlbar*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="hildon_controlbar_new">
-				<return-type type="GtkWidget*"/>
-			</constructor>
-			<method name="set_max" symbol="hildon_controlbar_set_max">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonControlbar*"/>
-					<parameter name="max" type="gint"/>
-				</parameters>
-			</method>
-			<method name="set_min" symbol="hildon_controlbar_set_min">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonControlbar*"/>
-					<parameter name="min" type="gint"/>
-				</parameters>
-			</method>
-			<method name="set_range" symbol="hildon_controlbar_set_range">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonControlbar*"/>
-					<parameter name="min" type="gint"/>
-					<parameter name="max" type="gint"/>
-				</parameters>
-			</method>
-			<method name="set_value" symbol="hildon_controlbar_set_value">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonControlbar*"/>
-					<parameter name="value" type="gint"/>
-				</parameters>
-			</method>
-			<property name="max" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="min" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="value" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-			<signal name="end-reached" when="FIRST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="controlbar" type="HildonControlbar*"/>
-					<parameter name="end" type="gboolean"/>
-				</parameters>
-			</signal>
-		</object>
-		<object name="HildonDateButton" parent="HildonPickerButton" type-name="HildonDateButton" get-type="hildon_date_button_get_type">
-			<implements>
-				<interface name="AtkImplementor"/>
-				<interface name="GtkBuildable"/>
-			</implements>
-			<method name="get_date" symbol="hildon_date_button_get_date">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="button" type="HildonDateButton*"/>
-					<parameter name="year" type="guint*"/>
-					<parameter name="month" type="guint*"/>
-					<parameter name="day" type="guint*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="hildon_date_button_new">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="size" type="HildonSizeType"/>
-					<parameter name="arrangement" type="HildonButtonArrangement"/>
-				</parameters>
-			</constructor>
-			<constructor name="new_with_year_range" symbol="hildon_date_button_new_with_year_range">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="size" type="HildonSizeType"/>
-					<parameter name="arrangement" type="HildonButtonArrangement"/>
-					<parameter name="min_year" type="gint"/>
-					<parameter name="max_year" type="gint"/>
-				</parameters>
-			</constructor>
-			<method name="set_date" symbol="hildon_date_button_set_date">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="button" type="HildonDateButton*"/>
-					<parameter name="year" type="guint"/>
-					<parameter name="month" type="guint"/>
-					<parameter name="day" type="guint"/>
-				</parameters>
-			</method>
-		</object>
-		<object name="HildonDateEditor" parent="GtkContainer" type-name="HildonDateEditor" get-type="hildon_date_editor_get_type">
-			<implements>
-				<interface name="AtkImplementor"/>
-				<interface name="GtkBuildable"/>
-			</implements>
-			<method name="get_date" symbol="hildon_date_editor_get_date">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="date" type="HildonDateEditor*"/>
-					<parameter name="year" type="guint*"/>
-					<parameter name="month" type="guint*"/>
-					<parameter name="day" type="guint*"/>
-				</parameters>
-			</method>
-			<method name="get_day" symbol="hildon_date_editor_get_day">
-				<return-type type="guint"/>
-				<parameters>
-					<parameter name="editor" type="HildonDateEditor*"/>
-				</parameters>
-			</method>
-			<method name="get_month" symbol="hildon_date_editor_get_month">
-				<return-type type="guint"/>
-				<parameters>
-					<parameter name="editor" type="HildonDateEditor*"/>
-				</parameters>
-			</method>
-			<method name="get_year" symbol="hildon_date_editor_get_year">
-				<return-type type="guint"/>
-				<parameters>
-					<parameter name="editor" type="HildonDateEditor*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="hildon_date_editor_new">
-				<return-type type="GtkWidget*"/>
-			</constructor>
-			<method name="set_date" symbol="hildon_date_editor_set_date">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="date" type="HildonDateEditor*"/>
-					<parameter name="year" type="guint"/>
-					<parameter name="month" type="guint"/>
-					<parameter name="day" type="guint"/>
-				</parameters>
-			</method>
-			<method name="set_day" symbol="hildon_date_editor_set_day">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="editor" type="HildonDateEditor*"/>
-					<parameter name="day" type="guint"/>
-				</parameters>
-			</method>
-			<method name="set_month" symbol="hildon_date_editor_set_month">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="editor" type="HildonDateEditor*"/>
-					<parameter name="month" type="guint"/>
-				</parameters>
-			</method>
-			<method name="set_year" symbol="hildon_date_editor_set_year">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="editor" type="HildonDateEditor*"/>
-					<parameter name="year" type="guint"/>
-				</parameters>
-			</method>
-			<property name="day" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="max-year" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="min-year" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="month" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="year" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
-			<signal name="date-error" when="LAST">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="editor" type="HildonDateEditor*"/>
-					<parameter name="type" type="HildonDateTimeError"/>
-				</parameters>
-			</signal>
-		</object>
-		<object name="HildonDateSelector" parent="HildonTouchSelector" type-name="HildonDateSelector" get-type="hildon_date_selector_get_type">
-			<implements>
-				<interface name="AtkImplementor"/>
-				<interface name="GtkBuildable"/>
-			</implements>
-			<method name="get_date" symbol="hildon_date_selector_get_date">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="selector" type="HildonDateSelector*"/>
-					<parameter name="year" type="guint*"/>
-					<parameter name="month" type="guint*"/>
-					<parameter name="day" type="guint*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="hildon_date_selector_new">
-				<return-type type="GtkWidget*"/>
-			</constructor>
-			<constructor name="new_with_year_range" symbol="hildon_date_selector_new_with_year_range">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="min_year" type="gint"/>
-					<parameter name="max_year" type="gint"/>
-				</parameters>
-			</constructor>
-			<method name="select_current_date" symbol="hildon_date_selector_select_current_date">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="selector" type="HildonDateSelector*"/>
-					<parameter name="year" type="guint"/>
-					<parameter name="month" type="guint"/>
-					<parameter name="day" type="guint"/>
-				</parameters>
-			</method>
-			<method name="select_day" symbol="hildon_date_selector_select_day">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="selector" type="HildonDateSelector*"/>
-					<parameter name="day" type="guint"/>
-				</parameters>
-			</method>
-			<method name="select_month" symbol="hildon_date_selector_select_month">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="selector" type="HildonDateSelector*"/>
-					<parameter name="month" type="guint"/>
-					<parameter name="year" type="guint"/>
-				</parameters>
-			</method>
-			<property name="max-year" type="gint" readable="1" writable="1" construct="0" construct-only="1"/>
-			<property name="min-year" type="gint" readable="1" writable="1" construct="0" construct-only="1"/>
-		</object>
-		<object name="HildonDialog" parent="GtkDialog" type-name="HildonDialog" get-type="hildon_dialog_get_type">
-			<implements>
-				<interface name="AtkImplementor"/>
-				<interface name="GtkBuildable"/>
-			</implements>
-			<method name="add_button" symbol="hildon_dialog_add_button">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="dialog" type="HildonDialog*"/>
-					<parameter name="button_text" type="gchar*"/>
-					<parameter name="response_id" type="gint"/>
-				</parameters>
-			</method>
-			<method name="add_buttons" symbol="hildon_dialog_add_buttons">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="dialog" type="HildonDialog*"/>
-					<parameter name="first_button_text" type="gchar*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="hildon_dialog_new">
-				<return-type type="GtkWidget*"/>
-			</constructor>
-			<constructor name="new_with_buttons" symbol="hildon_dialog_new_with_buttons">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="title" type="gchar*"/>
-					<parameter name="parent" type="GtkWindow*"/>
-					<parameter name="flags" type="GtkDialogFlags"/>
-					<parameter name="first_button_text" type="gchar*"/>
-				</parameters>
-			</constructor>
-		</object>
-		<object name="HildonEditToolbar" parent="GtkHBox" type-name="HildonEditToolbar" get-type="hildon_edit_toolbar_get_type">
-			<implements>
-				<interface name="AtkImplementor"/>
-				<interface name="GtkBuildable"/>
-			</implements>
-			<constructor name="new" symbol="hildon_edit_toolbar_new">
-				<return-type type="GtkWidget*"/>
-			</constructor>
-			<constructor name="new_with_text" symbol="hildon_edit_toolbar_new_with_text">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="label" type="gchar*"/>
-					<parameter name="button" type="gchar*"/>
-				</parameters>
-			</constructor>
-			<method name="set_button_label" symbol="hildon_edit_toolbar_set_button_label">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="toolbar" type="HildonEditToolbar*"/>
-					<parameter name="label" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="set_label" symbol="hildon_edit_toolbar_set_label">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="toolbar" type="HildonEditToolbar*"/>
-					<parameter name="label" type="gchar*"/>
-				</parameters>
-			</method>
-			<signal name="arrow-clicked" when="FIRST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="object" type="HildonEditToolbar*"/>
-				</parameters>
-			</signal>
-			<signal name="button-clicked" when="FIRST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="object" type="HildonEditToolbar*"/>
-				</parameters>
-			</signal>
-		</object>
-		<object name="HildonEntry" parent="GtkEntry" type-name="HildonEntry" get-type="hildon_entry_get_type">
-			<implements>
-				<interface name="AtkImplementor"/>
-				<interface name="GtkBuildable"/>
-				<interface name="GtkEditable"/>
-				<interface name="GtkCellEditable"/>
-			</implements>
-			<method name="get_text" symbol="hildon_entry_get_text">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="entry" type="HildonEntry*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="hildon_entry_new">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="size" type="HildonSizeType"/>
-				</parameters>
-			</constructor>
-			<method name="set_placeholder" symbol="hildon_entry_set_placeholder">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="entry" type="HildonEntry*"/>
-					<parameter name="text" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="set_text" symbol="hildon_entry_set_text">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="entry" type="HildonEntry*"/>
-					<parameter name="text" type="gchar*"/>
-				</parameters>
-			</method>
-			<property name="size" type="HildonSizeType" readable="0" writable="1" construct="1" construct-only="0"/>
-		</object>
-		<object name="HildonFindToolbar" parent="GtkToolbar" type-name="HildonFindToolbar" get-type="hildon_find_toolbar_get_type">
-			<implements>
-				<interface name="AtkImplementor"/>
-				<interface name="GtkBuildable"/>
-				<interface name="GtkToolShell"/>
-			</implements>
-			<method name="get_active" symbol="hildon_find_toolbar_get_active">
-				<return-type type="gint"/>
-				<parameters>
-					<parameter name="toolbar" type="HildonFindToolbar*"/>
-				</parameters>
-			</method>
-			<method name="get_active_iter" symbol="hildon_find_toolbar_get_active_iter">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="toolbar" type="HildonFindToolbar*"/>
-					<parameter name="iter" type="GtkTreeIter*"/>
-				</parameters>
-			</method>
-			<method name="get_last_index" symbol="hildon_find_toolbar_get_last_index">
-				<return-type type="gint32"/>
-				<parameters>
-					<parameter name="toolbar" type="HildonFindToolbar*"/>
-				</parameters>
-			</method>
-			<method name="highlight_entry" symbol="hildon_find_toolbar_highlight_entry">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="ftb" type="HildonFindToolbar*"/>
-					<parameter name="get_focus" type="gboolean"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="hildon_find_toolbar_new">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="label" type="gchar*"/>
-				</parameters>
-			</constructor>
-			<constructor name="new_with_model" symbol="hildon_find_toolbar_new_with_model">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="label" type="gchar*"/>
-					<parameter name="model" type="GtkListStore*"/>
-					<parameter name="column" type="gint"/>
-				</parameters>
-			</constructor>
-			<method name="set_active" symbol="hildon_find_toolbar_set_active">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="toolbar" type="HildonFindToolbar*"/>
-					<parameter name="index" type="gint"/>
-				</parameters>
-			</method>
-			<method name="set_active_iter" symbol="hildon_find_toolbar_set_active_iter">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="toolbar" type="HildonFindToolbar*"/>
-					<parameter name="iter" type="GtkTreeIter*"/>
-				</parameters>
-			</method>
-			<property name="column" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="history-limit" type="gint" readable="1" writable="1" construct="1" construct-only="0"/>
-			<property name="label" type="char*" readable="1" writable="1" construct="1" construct-only="0"/>
-			<property name="list" type="GtkListStore*" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="max-characters" type="gint" readable="1" writable="1" construct="1" construct-only="0"/>
-			<property name="prefix" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-			<signal name="close" when="LAST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="toolbar" type="HildonFindToolbar*"/>
-				</parameters>
-			</signal>
-			<signal name="history-append" when="LAST">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="tooblar" type="HildonFindToolbar*"/>
-				</parameters>
-			</signal>
-			<signal name="invalid-input" when="LAST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="toolbar" type="HildonFindToolbar*"/>
-				</parameters>
-			</signal>
-			<signal name="search" when="LAST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="toolbar" type="HildonFindToolbar*"/>
-				</parameters>
-			</signal>
-		</object>
-		<object name="HildonFontSelectionDialog" parent="GtkDialog" type-name="HildonFontSelectionDialog" get-type="hildon_font_selection_dialog_get_type">
-			<implements>
-				<interface name="AtkImplementor"/>
-				<interface name="GtkBuildable"/>
-			</implements>
-			<method name="get_preview_text" symbol="hildon_font_selection_dialog_get_preview_text">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="fsd" type="HildonFontSelectionDialog*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="hildon_font_selection_dialog_new">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="parent" type="GtkWindow*"/>
-					<parameter name="title" type="gchar*"/>
-				</parameters>
-			</constructor>
-			<method name="set_preview_text" symbol="hildon_font_selection_dialog_set_preview_text">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="fsd" type="HildonFontSelectionDialog*"/>
-					<parameter name="text" type="gchar*"/>
-				</parameters>
-			</method>
-			<property name="bold" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="bold-set" type="gboolean" readable="1" writable="1" construct="1" construct-only="0"/>
-			<property name="color" type="GdkColor*" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="color-set" type="gboolean" readable="1" writable="1" construct="1" construct-only="0"/>
-			<property name="family" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="family-set" type="gboolean" readable="1" writable="1" construct="1" construct-only="0"/>
-			<property name="font-scaling" type="gdouble" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="italic" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="italic-set" type="gboolean" readable="1" writable="1" construct="1" construct-only="0"/>
-			<property name="position" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="position-set" type="gboolean" readable="1" writable="1" construct="1" construct-only="0"/>
-			<property name="preview-text" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="size" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="size-set" type="gboolean" readable="1" writable="1" construct="1" construct-only="0"/>
-			<property name="strikethrough" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="strikethrough-set" type="gboolean" readable="1" writable="1" construct="1" construct-only="0"/>
-			<property name="underline" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="underline-set" type="gboolean" readable="1" writable="1" construct="1" construct-only="0"/>
-		</object>
-		<object name="HildonGetPasswordDialog" parent="GtkDialog" type-name="HildonGetPasswordDialog" get-type="hildon_get_password_dialog_get_type">
-			<implements>
-				<interface name="AtkImplementor"/>
-				<interface name="GtkBuildable"/>
-			</implements>
-			<method name="get_password" symbol="hildon_get_password_dialog_get_password">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="dialog" type="HildonGetPasswordDialog*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="hildon_get_password_dialog_new">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="parent" type="GtkWindow*"/>
-					<parameter name="get_old" type="gboolean"/>
-				</parameters>
-			</constructor>
-			<constructor name="new_with_default" symbol="hildon_get_password_dialog_new_with_default">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="parent" type="GtkWindow*"/>
-					<parameter name="password" type="gchar*"/>
-					<parameter name="get_old" type="gboolean"/>
-				</parameters>
-			</constructor>
-			<method name="set_caption" symbol="hildon_get_password_dialog_set_caption">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="dialog" type="HildonGetPasswordDialog*"/>
-					<parameter name="new_caption" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="set_max_characters" symbol="hildon_get_password_dialog_set_max_characters">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="dialog" type="HildonGetPasswordDialog*"/>
-					<parameter name="max_characters" type="gint"/>
-				</parameters>
-			</method>
-			<method name="set_message" symbol="hildon_get_password_dialog_set_message">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="dialog" type="HildonGetPasswordDialog*"/>
-					<parameter name="message" type="gchar*"/>
-				</parameters>
-			</method>
-			<property name="caption-label" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="get-old" type="gboolean" readable="1" writable="1" construct="0" construct-only="1"/>
-			<property name="max-characters" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="message" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="numbers-only" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="password" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-		</object>
-		<object name="HildonHVolumebar" parent="HildonVolumebar" type-name="HildonHVolumebar" get-type="hildon_hvolumebar_get_type">
-			<implements>
-				<interface name="AtkImplementor"/>
-				<interface name="GtkBuildable"/>
-			</implements>
-			<constructor name="new" symbol="hildon_hvolumebar_new">
-				<return-type type="GtkWidget*"/>
-			</constructor>
-		</object>
-		<object name="HildonLoginDialog" parent="GtkDialog" type-name="HildonLoginDialog" get-type="hildon_login_dialog_get_type">
-			<implements>
-				<interface name="AtkImplementor"/>
-				<interface name="GtkBuildable"/>
-			</implements>
-			<method name="get_password" symbol="hildon_login_dialog_get_password">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="dialog" type="HildonLoginDialog*"/>
-				</parameters>
-			</method>
-			<method name="get_username" symbol="hildon_login_dialog_get_username">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="dialog" type="HildonLoginDialog*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="hildon_login_dialog_new">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="parent" type="GtkWindow*"/>
-				</parameters>
-			</constructor>
-			<constructor name="new_with_default" symbol="hildon_login_dialog_new_with_default">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="parent" type="GtkWindow*"/>
-					<parameter name="name" type="gchar*"/>
-					<parameter name="password" type="gchar*"/>
-				</parameters>
-			</constructor>
-			<method name="set_message" symbol="hildon_login_dialog_set_message">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="dialog" type="HildonLoginDialog*"/>
-					<parameter name="msg" type="gchar*"/>
-				</parameters>
-			</method>
-			<property name="message" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="password" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="username" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-		</object>
-		<object name="HildonNote" parent="GtkDialog" type-name="HildonNote" get-type="hildon_note_get_type">
-			<implements>
-				<interface name="AtkImplementor"/>
-				<interface name="GtkBuildable"/>
-			</implements>
-			<constructor name="new_cancel_with_progress_bar" symbol="hildon_note_new_cancel_with_progress_bar">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="parent" type="GtkWindow*"/>
-					<parameter name="description" type="gchar*"/>
-					<parameter name="progressbar" type="GtkProgressBar*"/>
-				</parameters>
-			</constructor>
-			<constructor name="new_confirmation" symbol="hildon_note_new_confirmation">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="parent" type="GtkWindow*"/>
-					<parameter name="description" type="gchar*"/>
-				</parameters>
-			</constructor>
-			<constructor name="new_confirmation_add_buttons" symbol="hildon_note_new_confirmation_add_buttons">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="parent" type="GtkWindow*"/>
-					<parameter name="description" type="gchar*"/>
-				</parameters>
-			</constructor>
-			<constructor name="new_confirmation_with_icon_name" symbol="hildon_note_new_confirmation_with_icon_name">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="parent" type="GtkWindow*"/>
-					<parameter name="description" type="gchar*"/>
-					<parameter name="icon_name" type="gchar*"/>
-				</parameters>
-			</constructor>
-			<constructor name="new_information" symbol="hildon_note_new_information">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="parent" type="GtkWindow*"/>
-					<parameter name="description" type="gchar*"/>
-				</parameters>
-			</constructor>
-			<constructor name="new_information_with_icon_name" symbol="hildon_note_new_information_with_icon_name">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="parent" type="GtkWindow*"/>
-					<parameter name="description" type="gchar*"/>
-					<parameter name="icon_name" type="gchar*"/>
-				</parameters>
-			</constructor>
-			<method name="set_button_text" symbol="hildon_note_set_button_text">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="note" type="HildonNote*"/>
-					<parameter name="text" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="set_button_texts" symbol="hildon_note_set_button_texts">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="note" type="HildonNote*"/>
-					<parameter name="text_ok" type="gchar*"/>
-					<parameter name="text_cancel" type="gchar*"/>
-				</parameters>
-			</method>
-			<property name="description" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="icon" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="note-type" type="HildonNoteType" readable="1" writable="1" construct="1" construct-only="0"/>
-			<property name="progressbar" type="GtkProgressBar*" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="stock-icon" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-		</object>
-		<object name="HildonNumberEditor" parent="GtkContainer" type-name="HildonNumberEditor" get-type="hildon_number_editor_get_type">
-			<implements>
-				<interface name="AtkImplementor"/>
-				<interface name="GtkBuildable"/>
-			</implements>
-			<method name="get_value" symbol="hildon_number_editor_get_value">
-				<return-type type="gint"/>
-				<parameters>
-					<parameter name="editor" type="HildonNumberEditor*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="hildon_number_editor_new">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="min" type="gint"/>
-					<parameter name="max" type="gint"/>
-				</parameters>
-			</constructor>
-			<method name="set_range" symbol="hildon_number_editor_set_range">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="editor" type="HildonNumberEditor*"/>
-					<parameter name="min" type="gint"/>
-					<parameter name="max" type="gint"/>
-				</parameters>
-			</method>
-			<method name="set_value" symbol="hildon_number_editor_set_value">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="editor" type="HildonNumberEditor*"/>
-					<parameter name="value" type="gint"/>
-				</parameters>
-			</method>
-			<property name="value" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-			<signal name="range-error" when="LAST">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="editor" type="HildonNumberEditor*"/>
-					<parameter name="type" type="HildonNumberEditorErrorType"/>
-				</parameters>
-			</signal>
-		</object>
-		<object name="HildonPannableArea" parent="GtkBin" type-name="HildonPannableArea" get-type="hildon_pannable_area_get_type">
-			<implements>
-				<interface name="AtkImplementor"/>
-				<interface name="GtkBuildable"/>
-			</implements>
-			<method name="add_with_viewport" symbol="hildon_pannable_area_add_with_viewport">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="area" type="HildonPannableArea*"/>
-					<parameter name="child" type="GtkWidget*"/>
-				</parameters>
-			</method>
-			<method name="get_hadjustment" symbol="hildon_pannable_area_get_hadjustment">
-				<return-type type="GtkAdjustment*"/>
-				<parameters>
-					<parameter name="area" type="HildonPannableArea*"/>
-				</parameters>
-			</method>
-			<method name="get_size_request_policy" symbol="hildon_pannable_area_get_size_request_policy">
-				<return-type type="HildonSizeRequestPolicy"/>
-				<parameters>
-					<parameter name="area" type="HildonPannableArea*"/>
-				</parameters>
-			</method>
-			<method name="get_vadjustment" symbol="hildon_pannable_area_get_vadjustment">
-				<return-type type="GtkAdjustment*"/>
-				<parameters>
-					<parameter name="area" type="HildonPannableArea*"/>
-				</parameters>
-			</method>
-			<method name="jump_to" symbol="hildon_pannable_area_jump_to">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="area" type="HildonPannableArea*"/>
-					<parameter name="x" type="gint"/>
-					<parameter name="y" type="gint"/>
-				</parameters>
-			</method>
-			<method name="jump_to_child" symbol="hildon_pannable_area_jump_to_child">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="area" type="HildonPannableArea*"/>
-					<parameter name="child" type="GtkWidget*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="hildon_pannable_area_new">
-				<return-type type="GtkWidget*"/>
-			</constructor>
-			<constructor name="new_full" symbol="hildon_pannable_area_new_full">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="mode" type="gint"/>
-					<parameter name="enabled" type="gboolean"/>
-					<parameter name="vel_min" type="gdouble"/>
-					<parameter name="vel_max" type="gdouble"/>
-					<parameter name="decel" type="gdouble"/>
-					<parameter name="sps" type="guint"/>
-				</parameters>
-			</constructor>
-			<method name="scroll_to" symbol="hildon_pannable_area_scroll_to">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="area" type="HildonPannableArea*"/>
-					<parameter name="x" type="gint"/>
-					<parameter name="y" type="gint"/>
-				</parameters>
-			</method>
-			<method name="scroll_to_child" symbol="hildon_pannable_area_scroll_to_child">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="area" type="HildonPannableArea*"/>
-					<parameter name="child" type="GtkWidget*"/>
-				</parameters>
-			</method>
-			<method name="set_size_request_policy" symbol="hildon_pannable_area_set_size_request_policy">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="area" type="HildonPannableArea*"/>
-					<parameter name="size_request_policy" type="HildonSizeRequestPolicy"/>
-				</parameters>
-			</method>
-			<property name="bounce-steps" type="guint" readable="1" writable="1" construct="1" construct-only="0"/>
-			<property name="deceleration" type="gdouble" readable="1" writable="1" construct="1" construct-only="0"/>
-			<property name="direction-error-margin" type="guint" readable="1" writable="1" construct="1" construct-only="0"/>
-			<property name="drag-inertia" type="gdouble" readable="1" writable="1" construct="1" construct-only="0"/>
-			<property name="enabled" type="gboolean" readable="1" writable="1" construct="1" construct-only="0"/>
-			<property name="force" type="guint" readable="1" writable="1" construct="1" construct-only="0"/>
-			<property name="hadjustment" type="GtkAdjustment*" readable="1" writable="0" construct="0" construct-only="0"/>
-			<property name="hovershoot-max" type="gint" readable="1" writable="1" construct="1" construct-only="0"/>
-			<property name="hscrollbar-policy" type="GtkPolicyType" readable="1" writable="1" construct="1" construct-only="0"/>
-			<property name="initial-hint" type="gboolean" readable="1" writable="1" construct="1" construct-only="0"/>
-			<property name="low-friction-mode" type="gboolean" readable="1" writable="1" construct="1" construct-only="0"/>
-			<property name="mode" type="HildonPannableAreaMode" readable="1" writable="1" construct="1" construct-only="0"/>
-			<property name="mov-mode" type="HildonMovementMode" readable="1" writable="1" construct="1" construct-only="0"/>
-			<property name="panning-threshold" type="guint" readable="1" writable="1" construct="1" construct-only="0"/>
-			<property name="scroll-time" type="gdouble" readable="1" writable="1" construct="1" construct-only="0"/>
-			<property name="scrollbar-fade-delay" type="guint" readable="1" writable="1" construct="1" construct-only="0"/>
-			<property name="size-request-policy" type="HildonSizeRequestPolicy" readable="1" writable="1" construct="1" construct-only="0"/>
-			<property name="sps" type="guint" readable="1" writable="1" construct="1" construct-only="0"/>
-			<property name="vadjustment" type="GtkAdjustment*" readable="1" writable="0" construct="0" construct-only="0"/>
-			<property name="velocity-fast-factor" type="gdouble" readable="1" writable="1" construct="1" construct-only="0"/>
-			<property name="velocity-max" type="gdouble" readable="1" writable="1" construct="1" construct-only="0"/>
-			<property name="velocity-min" type="gdouble" readable="1" writable="1" construct="1" construct-only="0"/>
-			<property name="velocity-overshooting-max" type="gdouble" readable="1" writable="1" construct="1" construct-only="0"/>
-			<property name="vovershoot-max" type="gint" readable="1" writable="1" construct="1" construct-only="0"/>
-			<property name="vscrollbar-policy" type="GtkPolicyType" readable="1" writable="1" construct="1" construct-only="0"/>
-			<signal name="horizontal-movement" when="LAST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="area" type="HildonPannableArea*"/>
-					<parameter name="direction" type="gint"/>
-					<parameter name="x" type="gdouble"/>
-					<parameter name="y" type="gdouble"/>
-				</parameters>
-			</signal>
-			<signal name="panning-finished" when="LAST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="object" type="HildonPannableArea*"/>
-				</parameters>
-			</signal>
-			<signal name="panning-started" when="LAST">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="object" type="HildonPannableArea*"/>
-				</parameters>
-			</signal>
-			<signal name="vertical-movement" when="LAST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="area" type="HildonPannableArea*"/>
-					<parameter name="direction" type="gint"/>
-					<parameter name="x" type="gdouble"/>
-					<parameter name="y" type="gdouble"/>
-				</parameters>
-			</signal>
-		</object>
-		<object name="HildonPickerButton" parent="HildonButton" type-name="HildonPickerButton" get-type="hildon_picker_button_get_type">
-			<implements>
-				<interface name="AtkImplementor"/>
-				<interface name="GtkBuildable"/>
-			</implements>
-			<method name="get_active" symbol="hildon_picker_button_get_active">
-				<return-type type="gint"/>
-				<parameters>
-					<parameter name="button" type="HildonPickerButton*"/>
-				</parameters>
-			</method>
-			<method name="get_done_button_text" symbol="hildon_picker_button_get_done_button_text">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="button" type="HildonPickerButton*"/>
-				</parameters>
-			</method>
-			<method name="get_selector" symbol="hildon_picker_button_get_selector">
-				<return-type type="HildonTouchSelector*"/>
-				<parameters>
-					<parameter name="button" type="HildonPickerButton*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="hildon_picker_button_new">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="size" type="HildonSizeType"/>
-					<parameter name="arrangement" type="HildonButtonArrangement"/>
-				</parameters>
-			</constructor>
-			<method name="set_active" symbol="hildon_picker_button_set_active">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="button" type="HildonPickerButton*"/>
-					<parameter name="index" type="gint"/>
-				</parameters>
-			</method>
-			<method name="set_done_button_text" symbol="hildon_picker_button_set_done_button_text">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="button" type="HildonPickerButton*"/>
-					<parameter name="done_button_text" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="set_selector" symbol="hildon_picker_button_set_selector">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="button" type="HildonPickerButton*"/>
-					<parameter name="selector" type="HildonTouchSelector*"/>
-				</parameters>
-			</method>
-			<property name="done-button-text" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="touch-selector" type="HildonTouchSelector*" readable="1" writable="1" construct="0" construct-only="0"/>
-			<signal name="value-changed" when="LAST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="object" type="HildonPickerButton*"/>
-				</parameters>
-			</signal>
-		</object>
-		<object name="HildonPickerDialog" parent="HildonDialog" type-name="HildonPickerDialog" get-type="hildon_picker_dialog_get_type">
-			<implements>
-				<interface name="AtkImplementor"/>
-				<interface name="GtkBuildable"/>
-			</implements>
-			<method name="get_done_label" symbol="hildon_picker_dialog_get_done_label">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="dialog" type="HildonPickerDialog*"/>
-				</parameters>
-			</method>
-			<method name="get_selector" symbol="hildon_picker_dialog_get_selector">
-				<return-type type="HildonTouchSelector*"/>
-				<parameters>
-					<parameter name="dialog" type="HildonPickerDialog*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="hildon_picker_dialog_new">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="parent" type="GtkWindow*"/>
-				</parameters>
-			</constructor>
-			<method name="set_done_label" symbol="hildon_picker_dialog_set_done_label">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="dialog" type="HildonPickerDialog*"/>
-					<parameter name="label" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="set_selector" symbol="hildon_picker_dialog_set_selector">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="dialog" type="HildonPickerDialog*"/>
-					<parameter name="selector" type="HildonTouchSelector*"/>
-				</parameters>
-			</method>
-			<property name="center-on-show" type="gboolean" readable="1" writable="1" construct="1" construct-only="0"/>
-			<property name="done-button-text" type="char*" readable="1" writable="1" construct="1" construct-only="0"/>
-			<vfunc name="set_selector">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="dialog" type="HildonPickerDialog*"/>
-					<parameter name="selector" type="HildonTouchSelector*"/>
-				</parameters>
-			</vfunc>
-		</object>
-		<object name="HildonProgram" parent="GObject" type-name="HildonProgram" get-type="hildon_program_get_type">
-			<method name="add_window" symbol="hildon_program_add_window">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonProgram*"/>
-					<parameter name="window" type="HildonWindow*"/>
-				</parameters>
-			</method>
-			<method name="get_can_hibernate" symbol="hildon_program_get_can_hibernate">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="self" type="HildonProgram*"/>
-				</parameters>
-			</method>
-			<method name="get_common_app_menu" symbol="hildon_program_get_common_app_menu">
-				<return-type type="HildonAppMenu*"/>
-				<parameters>
-					<parameter name="self" type="HildonProgram*"/>
-				</parameters>
-			</method>
-			<method name="get_common_menu" symbol="hildon_program_get_common_menu">
-				<return-type type="GtkMenu*"/>
-				<parameters>
-					<parameter name="self" type="HildonProgram*"/>
-				</parameters>
-			</method>
-			<method name="get_common_toolbar" symbol="hildon_program_get_common_toolbar">
-				<return-type type="GtkToolbar*"/>
-				<parameters>
-					<parameter name="self" type="HildonProgram*"/>
-				</parameters>
-			</method>
-			<method name="get_instance" symbol="hildon_program_get_instance">
-				<return-type type="HildonProgram*"/>
-			</method>
-			<method name="get_is_topmost" symbol="hildon_program_get_is_topmost">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="self" type="HildonProgram*"/>
-				</parameters>
-			</method>
-			<method name="go_to_root_window" symbol="hildon_program_go_to_root_window">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonProgram*"/>
-				</parameters>
-			</method>
-			<method name="peek_window_stack" symbol="hildon_program_peek_window_stack">
-				<return-type type="HildonStackableWindow*"/>
-				<parameters>
-					<parameter name="self" type="HildonProgram*"/>
-				</parameters>
-			</method>
-			<method name="pop_window_stack" symbol="hildon_program_pop_window_stack">
-				<return-type type="HildonStackableWindow*"/>
-				<parameters>
-					<parameter name="self" type="HildonProgram*"/>
-				</parameters>
-			</method>
-			<method name="remove_window" symbol="hildon_program_remove_window">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonProgram*"/>
-					<parameter name="window" type="HildonWindow*"/>
-				</parameters>
-			</method>
-			<method name="set_can_hibernate" symbol="hildon_program_set_can_hibernate">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonProgram*"/>
-					<parameter name="can_hibernate" type="gboolean"/>
-				</parameters>
-			</method>
-			<method name="set_common_app_menu" symbol="hildon_program_set_common_app_menu">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonProgram*"/>
-					<parameter name="menu" type="HildonAppMenu*"/>
-				</parameters>
-			</method>
-			<method name="set_common_menu" symbol="hildon_program_set_common_menu">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonProgram*"/>
-					<parameter name="menu" type="GtkMenu*"/>
-				</parameters>
-			</method>
-			<method name="set_common_toolbar" symbol="hildon_program_set_common_toolbar">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonProgram*"/>
-					<parameter name="toolbar" type="GtkToolbar*"/>
-				</parameters>
-			</method>
-			<property name="can-hibernate" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="is-topmost" type="gboolean" readable="1" writable="0" construct="0" construct-only="0"/>
-		</object>
-		<object name="HildonRangeEditor" parent="GtkContainer" type-name="HildonRangeEditor" get-type="hildon_range_editor_get_type">
-			<implements>
-				<interface name="AtkImplementor"/>
-				<interface name="GtkBuildable"/>
-			</implements>
-			<method name="get_higher" symbol="hildon_range_editor_get_higher">
-				<return-type type="gint"/>
-				<parameters>
-					<parameter name="editor" type="HildonRangeEditor*"/>
-				</parameters>
-			</method>
-			<method name="get_lower" symbol="hildon_range_editor_get_lower">
-				<return-type type="gint"/>
-				<parameters>
-					<parameter name="editor" type="HildonRangeEditor*"/>
-				</parameters>
-			</method>
-			<method name="get_max" symbol="hildon_range_editor_get_max">
-				<return-type type="gint"/>
-				<parameters>
-					<parameter name="editor" type="HildonRangeEditor*"/>
-				</parameters>
-			</method>
-			<method name="get_min" symbol="hildon_range_editor_get_min">
-				<return-type type="gint"/>
-				<parameters>
-					<parameter name="editor" type="HildonRangeEditor*"/>
-				</parameters>
-			</method>
-			<method name="get_range" symbol="hildon_range_editor_get_range">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="editor" type="HildonRangeEditor*"/>
-					<parameter name="start" type="gint*"/>
-					<parameter name="end" type="gint*"/>
-				</parameters>
-			</method>
-			<method name="get_separator" symbol="hildon_range_editor_get_separator">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="editor" type="HildonRangeEditor*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="hildon_range_editor_new">
-				<return-type type="GtkWidget*"/>
-			</constructor>
-			<constructor name="new_with_separator" symbol="hildon_range_editor_new_with_separator">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="separator" type="gchar*"/>
-				</parameters>
-			</constructor>
-			<method name="set_higher" symbol="hildon_range_editor_set_higher">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="editor" type="HildonRangeEditor*"/>
-					<parameter name="value" type="gint"/>
-				</parameters>
-			</method>
-			<method name="set_limits" symbol="hildon_range_editor_set_limits">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="editor" type="HildonRangeEditor*"/>
-					<parameter name="start" type="gint"/>
-					<parameter name="end" type="gint"/>
-				</parameters>
-			</method>
-			<method name="set_lower" symbol="hildon_range_editor_set_lower">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="editor" type="HildonRangeEditor*"/>
-					<parameter name="value" type="gint"/>
-				</parameters>
-			</method>
-			<method name="set_max" symbol="hildon_range_editor_set_max">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="editor" type="HildonRangeEditor*"/>
-					<parameter name="value" type="gint"/>
-				</parameters>
-			</method>
-			<method name="set_min" symbol="hildon_range_editor_set_min">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="editor" type="HildonRangeEditor*"/>
-					<parameter name="value" type="gint"/>
-				</parameters>
-			</method>
-			<method name="set_range" symbol="hildon_range_editor_set_range">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="editor" type="HildonRangeEditor*"/>
-					<parameter name="start" type="gint"/>
-					<parameter name="end" type="gint"/>
-				</parameters>
-			</method>
-			<method name="set_separator" symbol="hildon_range_editor_set_separator">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="editor" type="HildonRangeEditor*"/>
-					<parameter name="separator" type="gchar*"/>
-				</parameters>
-			</method>
-			<property name="higher" type="gint" readable="1" writable="1" construct="1" construct-only="0"/>
-			<property name="lower" type="gint" readable="1" writable="1" construct="1" construct-only="0"/>
-			<property name="max" type="gint" readable="1" writable="1" construct="1" construct-only="0"/>
-			<property name="min" type="gint" readable="1" writable="1" construct="1" construct-only="0"/>
-			<property name="separator" type="char*" readable="1" writable="1" construct="1" construct-only="0"/>
-		</object>
-		<object name="HildonRemoteTexture" parent="GtkWindow" type-name="HildonRemoteTexture" get-type="hildon_remote_texture_get_type">
-			<implements>
-				<interface name="AtkImplementor"/>
-				<interface name="GtkBuildable"/>
-			</implements>
-			<constructor name="new" symbol="hildon_remote_texture_new">
-				<return-type type="GtkWidget*"/>
-			</constructor>
-			<method name="send_message" symbol="hildon_remote_texture_send_message">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonRemoteTexture*"/>
-					<parameter name="message_type" type="guint32"/>
-					<parameter name="l0" type="guint32"/>
-					<parameter name="l1" type="guint32"/>
-					<parameter name="l2" type="guint32"/>
-					<parameter name="l3" type="guint32"/>
-					<parameter name="l4" type="guint32"/>
-				</parameters>
-			</method>
-			<method name="set_image" symbol="hildon_remote_texture_set_image">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonRemoteTexture*"/>
-					<parameter name="key" type="guint32"/>
-					<parameter name="width" type="guint"/>
-					<parameter name="height" type="guint"/>
-					<parameter name="bpp" type="guint"/>
-				</parameters>
-			</method>
-			<method name="set_offset" symbol="hildon_remote_texture_set_offset">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonRemoteTexture*"/>
-					<parameter name="x" type="double"/>
-					<parameter name="y" type="double"/>
-				</parameters>
-			</method>
-			<method name="set_opacity" symbol="hildon_remote_texture_set_opacity">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonRemoteTexture*"/>
-					<parameter name="opacity" type="gint"/>
-				</parameters>
-			</method>
-			<method name="set_parent" symbol="hildon_remote_texture_set_parent">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonRemoteTexture*"/>
-					<parameter name="parent" type="GtkWindow*"/>
-				</parameters>
-			</method>
-			<method name="set_position" symbol="hildon_remote_texture_set_position">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonRemoteTexture*"/>
-					<parameter name="x" type="gint"/>
-					<parameter name="y" type="gint"/>
-					<parameter name="width" type="gint"/>
-					<parameter name="height" type="gint"/>
-				</parameters>
-			</method>
-			<method name="set_scale" symbol="hildon_remote_texture_set_scale">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonRemoteTexture*"/>
-					<parameter name="x_scale" type="double"/>
-					<parameter name="y_scale" type="double"/>
-				</parameters>
-			</method>
-			<method name="set_show" symbol="hildon_remote_texture_set_show">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonRemoteTexture*"/>
-					<parameter name="show" type="gint"/>
-				</parameters>
-			</method>
-			<method name="set_show_full" symbol="hildon_remote_texture_set_show_full">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonRemoteTexture*"/>
-					<parameter name="show" type="gint"/>
-					<parameter name="opacity" type="gint"/>
-				</parameters>
-			</method>
-			<method name="update_area" symbol="hildon_remote_texture_update_area">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonRemoteTexture*"/>
-					<parameter name="x" type="gint"/>
-					<parameter name="y" type="gint"/>
-					<parameter name="width" type="gint"/>
-					<parameter name="height" type="gint"/>
-				</parameters>
-			</method>
-		</object>
-		<object name="HildonSeekbar" parent="GtkScale" type-name="HildonSeekbar" get-type="hildon_seekbar_get_type">
-			<implements>
-				<interface name="AtkImplementor"/>
-				<interface name="GtkBuildable"/>
-			</implements>
-			<method name="get_fraction" symbol="hildon_seekbar_get_fraction">
-				<return-type type="guint"/>
-				<parameters>
-					<parameter name="seekbar" type="HildonSeekbar*"/>
-				</parameters>
-			</method>
-			<method name="get_position" symbol="hildon_seekbar_get_position">
-				<return-type type="gint"/>
-				<parameters>
-					<parameter name="seekbar" type="HildonSeekbar*"/>
-				</parameters>
-			</method>
-			<method name="get_total_time" symbol="hildon_seekbar_get_total_time">
-				<return-type type="gint"/>
-				<parameters>
-					<parameter name="seekbar" type="HildonSeekbar*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="hildon_seekbar_new">
-				<return-type type="GtkWidget*"/>
-			</constructor>
-			<method name="set_fraction" symbol="hildon_seekbar_set_fraction">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="seekbar" type="HildonSeekbar*"/>
-					<parameter name="fraction" type="guint"/>
-				</parameters>
-			</method>
-			<method name="set_position" symbol="hildon_seekbar_set_position">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="seekbar" type="HildonSeekbar*"/>
-					<parameter name="time" type="gint"/>
-				</parameters>
-			</method>
-			<method name="set_total_time" symbol="hildon_seekbar_set_total_time">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="seekbar" type="HildonSeekbar*"/>
-					<parameter name="time" type="gint"/>
-				</parameters>
-			</method>
-			<property name="fraction" type="gdouble" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="position" type="gdouble" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="total-time" type="gdouble" readable="1" writable="1" construct="0" construct-only="0"/>
-		</object>
-		<object name="HildonSetPasswordDialog" parent="GtkDialog" type-name="HildonSetPasswordDialog" get-type="hildon_set_password_dialog_get_type">
-			<implements>
-				<interface name="AtkImplementor"/>
-				<interface name="GtkBuildable"/>
-			</implements>
-			<method name="get_password" symbol="hildon_set_password_dialog_get_password">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="dialog" type="HildonSetPasswordDialog*"/>
-				</parameters>
-			</method>
-			<method name="get_protected" symbol="hildon_set_password_dialog_get_protected">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="dialog" type="HildonSetPasswordDialog*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="hildon_set_password_dialog_new">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="parent" type="GtkWindow*"/>
-					<parameter name="modify_protection" type="gboolean"/>
-				</parameters>
-			</constructor>
-			<constructor name="new_with_default" symbol="hildon_set_password_dialog_new_with_default">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="parent" type="GtkWindow*"/>
-					<parameter name="password" type="gchar*"/>
-					<parameter name="modify_protection" type="gboolean"/>
-				</parameters>
-			</constructor>
-			<method name="set_message" symbol="hildon_set_password_dialog_set_message">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="dialog" type="HildonSetPasswordDialog*"/>
-					<parameter name="message" type="gchar*"/>
-				</parameters>
-			</method>
-			<property name="message" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="modify-protection" type="gboolean" readable="1" writable="1" construct="0" construct-only="1"/>
-			<property name="password" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-		</object>
-		<object name="HildonSortDialog" parent="GtkDialog" type-name="HildonSortDialog" get-type="hildon_sort_dialog_get_type">
-			<implements>
-				<interface name="AtkImplementor"/>
-				<interface name="GtkBuildable"/>
-			</implements>
-			<method name="add_sort_key" symbol="hildon_sort_dialog_add_sort_key">
-				<return-type type="gint"/>
-				<parameters>
-					<parameter name="dialog" type="HildonSortDialog*"/>
-					<parameter name="sort_key" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="add_sort_key_reversed" symbol="hildon_sort_dialog_add_sort_key_reversed">
-				<return-type type="gint"/>
-				<parameters>
-					<parameter name="dialog" type="HildonSortDialog*"/>
-					<parameter name="sort_key" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="get_sort_key" symbol="hildon_sort_dialog_get_sort_key">
-				<return-type type="gint"/>
-				<parameters>
-					<parameter name="dialog" type="HildonSortDialog*"/>
-				</parameters>
-			</method>
-			<method name="get_sort_order" symbol="hildon_sort_dialog_get_sort_order">
-				<return-type type="GtkSortType"/>
-				<parameters>
-					<parameter name="dialog" type="HildonSortDialog*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="hildon_sort_dialog_new">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="parent" type="GtkWindow*"/>
-				</parameters>
-			</constructor>
-			<method name="set_sort_key" symbol="hildon_sort_dialog_set_sort_key">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="dialog" type="HildonSortDialog*"/>
-					<parameter name="key" type="int"/>
-				</parameters>
-			</method>
-			<method name="set_sort_order" symbol="hildon_sort_dialog_set_sort_order">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="dialog" type="HildonSortDialog*"/>
-					<parameter name="order" type="GtkSortType"/>
-				</parameters>
-			</method>
-			<property name="sort-key" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="sort-order" type="GtkSortType" readable="1" writable="1" construct="0" construct-only="0"/>
-		</object>
-		<object name="HildonStackableWindow" parent="HildonWindow" type-name="HildonStackableWindow" get-type="hildon_stackable_window_get_type">
-			<implements>
-				<interface name="AtkImplementor"/>
-				<interface name="GtkBuildable"/>
-			</implements>
-			<method name="get_stack" symbol="hildon_stackable_window_get_stack">
-				<return-type type="HildonWindowStack*"/>
-				<parameters>
-					<parameter name="self" type="HildonStackableWindow*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="hildon_stackable_window_new">
-				<return-type type="GtkWidget*"/>
-			</constructor>
-			<method name="set_main_menu" symbol="hildon_stackable_window_set_main_menu">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonStackableWindow*"/>
-					<parameter name="menu" type="HildonAppMenu*"/>
-				</parameters>
-			</method>
-		</object>
-		<object name="HildonTextView" parent="GtkTextView" type-name="HildonTextView" get-type="hildon_text_view_get_type">
-			<implements>
-				<interface name="AtkImplementor"/>
-				<interface name="GtkBuildable"/>
-			</implements>
-			<method name="get_buffer" symbol="hildon_text_view_get_buffer">
-				<return-type type="GtkTextBuffer*"/>
-				<parameters>
-					<parameter name="text_view" type="HildonTextView*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="hildon_text_view_new">
-				<return-type type="GtkWidget*"/>
-			</constructor>
-			<method name="set_buffer" symbol="hildon_text_view_set_buffer">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="text_view" type="HildonTextView*"/>
-					<parameter name="buffer" type="GtkTextBuffer*"/>
-				</parameters>
-			</method>
-			<method name="set_placeholder" symbol="hildon_text_view_set_placeholder">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="text_view" type="HildonTextView*"/>
-					<parameter name="text" type="gchar*"/>
-				</parameters>
-			</method>
-		</object>
-		<object name="HildonTimeButton" parent="HildonPickerButton" type-name="HildonTimeButton" get-type="hildon_time_button_get_type">
-			<implements>
-				<interface name="AtkImplementor"/>
-				<interface name="GtkBuildable"/>
-			</implements>
-			<method name="get_time" symbol="hildon_time_button_get_time">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="button" type="HildonTimeButton*"/>
-					<parameter name="hours" type="guint*"/>
-					<parameter name="minutes" type="guint*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="hildon_time_button_new">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="size" type="HildonSizeType"/>
-					<parameter name="arrangement" type="HildonButtonArrangement"/>
-				</parameters>
-			</constructor>
-			<constructor name="new_step" symbol="hildon_time_button_new_step">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="size" type="HildonSizeType"/>
-					<parameter name="arrangement" type="HildonButtonArrangement"/>
-					<parameter name="minutes_step" type="guint"/>
-				</parameters>
-			</constructor>
-			<method name="set_time" symbol="hildon_time_button_set_time">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="button" type="HildonTimeButton*"/>
-					<parameter name="hours" type="guint"/>
-					<parameter name="minutes" type="guint"/>
-				</parameters>
-			</method>
-		</object>
-		<object name="HildonTimeEditor" parent="GtkContainer" type-name="HildonTimeEditor" get-type="hildon_time_editor_get_type">
-			<implements>
-				<interface name="AtkImplementor"/>
-				<interface name="GtkBuildable"/>
-			</implements>
-			<method name="get_duration_max" symbol="hildon_time_editor_get_duration_max">
-				<return-type type="guint"/>
-				<parameters>
-					<parameter name="editor" type="HildonTimeEditor*"/>
-				</parameters>
-			</method>
-			<method name="get_duration_min" symbol="hildon_time_editor_get_duration_min">
-				<return-type type="guint"/>
-				<parameters>
-					<parameter name="editor" type="HildonTimeEditor*"/>
-				</parameters>
-			</method>
-			<method name="get_duration_mode" symbol="hildon_time_editor_get_duration_mode">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="editor" type="HildonTimeEditor*"/>
-				</parameters>
-			</method>
-			<method name="get_duration_range" symbol="hildon_time_editor_get_duration_range">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="editor" type="HildonTimeEditor*"/>
-					<parameter name="min_seconds" type="guint*"/>
-					<parameter name="max_seconds" type="guint*"/>
-				</parameters>
-			</method>
-			<method name="get_show_hours" symbol="hildon_time_editor_get_show_hours">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="editor" type="HildonTimeEditor*"/>
-				</parameters>
-			</method>
-			<method name="get_show_seconds" symbol="hildon_time_editor_get_show_seconds">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="editor" type="HildonTimeEditor*"/>
-				</parameters>
-			</method>
-			<method name="get_ticks" symbol="hildon_time_editor_get_ticks">
-				<return-type type="guint"/>
-				<parameters>
-					<parameter name="editor" type="HildonTimeEditor*"/>
-				</parameters>
-			</method>
-			<method name="get_time" symbol="hildon_time_editor_get_time">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="editor" type="HildonTimeEditor*"/>
-					<parameter name="hours" type="guint*"/>
-					<parameter name="minutes" type="guint*"/>
-					<parameter name="seconds" type="guint*"/>
-				</parameters>
-			</method>
-			<method name="get_time_separators" symbol="hildon_time_editor_get_time_separators">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="hm_sep_label" type="GtkLabel*"/>
-					<parameter name="ms_sep_label" type="GtkLabel*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="hildon_time_editor_new">
-				<return-type type="GtkWidget*"/>
-			</constructor>
-			<method name="set_duration_max" symbol="hildon_time_editor_set_duration_max">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="editor" type="HildonTimeEditor*"/>
-					<parameter name="duration_max" type="guint"/>
-				</parameters>
-			</method>
-			<method name="set_duration_min" symbol="hildon_time_editor_set_duration_min">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="editor" type="HildonTimeEditor*"/>
-					<parameter name="duration_min" type="guint"/>
-				</parameters>
-			</method>
-			<method name="set_duration_mode" symbol="hildon_time_editor_set_duration_mode">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="editor" type="HildonTimeEditor*"/>
-					<parameter name="duration_mode" type="gboolean"/>
-				</parameters>
-			</method>
-			<method name="set_duration_range" symbol="hildon_time_editor_set_duration_range">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="editor" type="HildonTimeEditor*"/>
-					<parameter name="min_seconds" type="guint"/>
-					<parameter name="max_seconds" type="guint"/>
-				</parameters>
-			</method>
-			<method name="set_show_hours" symbol="hildon_time_editor_set_show_hours">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="editor" type="HildonTimeEditor*"/>
-					<parameter name="show_hours" type="gboolean"/>
-				</parameters>
-			</method>
-			<method name="set_show_seconds" symbol="hildon_time_editor_set_show_seconds">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="editor" type="HildonTimeEditor*"/>
-					<parameter name="show_seconds" type="gboolean"/>
-				</parameters>
-			</method>
-			<method name="set_ticks" symbol="hildon_time_editor_set_ticks">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="editor" type="HildonTimeEditor*"/>
-					<parameter name="ticks" type="guint"/>
-				</parameters>
-			</method>
-			<method name="set_time" symbol="hildon_time_editor_set_time">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="editor" type="HildonTimeEditor*"/>
-					<parameter name="hours" type="guint"/>
-					<parameter name="minutes" type="guint"/>
-					<parameter name="seconds" type="guint"/>
-				</parameters>
-			</method>
-			<property name="duration-max" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="duration-min" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="duration-mode" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="show-hours" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="show-seconds" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="ticks" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
-			<signal name="time-error" when="LAST">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="editor" type="HildonTimeEditor*"/>
-					<parameter name="type" type="HildonDateTimeError"/>
-				</parameters>
-			</signal>
-		</object>
-		<object name="HildonTimePicker" parent="GtkDialog" type-name="HildonTimePicker" get-type="hildon_time_picker_get_type">
-			<implements>
-				<interface name="AtkImplementor"/>
-				<interface name="GtkBuildable"/>
-			</implements>
-			<method name="get_time" symbol="hildon_time_picker_get_time">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="picker" type="HildonTimePicker*"/>
-					<parameter name="hours" type="guint*"/>
-					<parameter name="minutes" type="guint*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="hildon_time_picker_new">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="parent" type="GtkWindow*"/>
-				</parameters>
-			</constructor>
-			<method name="set_time" symbol="hildon_time_picker_set_time">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="picker" type="HildonTimePicker*"/>
-					<parameter name="hours" type="guint"/>
-					<parameter name="minutes" type="guint"/>
-				</parameters>
-			</method>
-			<property name="minutes" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
-		</object>
-		<object name="HildonTimeSelector" parent="HildonTouchSelector" type-name="HildonTimeSelector" get-type="hildon_time_selector_get_type">
-			<implements>
-				<interface name="AtkImplementor"/>
-				<interface name="GtkBuildable"/>
-			</implements>
-			<method name="get_time" symbol="hildon_time_selector_get_time">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="selector" type="HildonTimeSelector*"/>
-					<parameter name="hours" type="guint*"/>
-					<parameter name="minutes" type="guint*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="hildon_time_selector_new">
-				<return-type type="GtkWidget*"/>
-			</constructor>
-			<constructor name="new_step" symbol="hildon_time_selector_new_step">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="minutes_step" type="guint"/>
-				</parameters>
-			</constructor>
-			<method name="set_time" symbol="hildon_time_selector_set_time">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="selector" type="HildonTimeSelector*"/>
-					<parameter name="hours" type="guint"/>
-					<parameter name="minutes" type="guint"/>
-				</parameters>
-			</method>
-			<property name="minutes-step" type="guint" readable="1" writable="1" construct="0" construct-only="1"/>
-			<property name="time-format-policy" type="HildonTimeSelectorFormatPolicy" readable="1" writable="1" construct="1" construct-only="0"/>
-		</object>
-		<object name="HildonTouchSelector" parent="GtkVBox" type-name="HildonTouchSelector" get-type="hildon_touch_selector_get_type">
-			<implements>
-				<interface name="AtkImplementor"/>
-				<interface name="GtkBuildable"/>
-			</implements>
-			<method name="append_column" symbol="hildon_touch_selector_append_column">
-				<return-type type="HildonTouchSelectorColumn*"/>
-				<parameters>
-					<parameter name="selector" type="HildonTouchSelector*"/>
-					<parameter name="model" type="GtkTreeModel*"/>
-					<parameter name="cell_renderer" type="GtkCellRenderer*"/>
-				</parameters>
-			</method>
-			<method name="append_text" symbol="hildon_touch_selector_append_text">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="selector" type="HildonTouchSelector*"/>
-					<parameter name="text" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="append_text_column" symbol="hildon_touch_selector_append_text_column">
-				<return-type type="HildonTouchSelectorColumn*"/>
-				<parameters>
-					<parameter name="selector" type="HildonTouchSelector*"/>
-					<parameter name="model" type="GtkTreeModel*"/>
-					<parameter name="center" type="gboolean"/>
-				</parameters>
-			</method>
-			<method name="center_on_selected" symbol="hildon_touch_selector_center_on_selected">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="selector" type="HildonTouchSelector*"/>
-				</parameters>
-			</method>
-			<method name="get_active" symbol="hildon_touch_selector_get_active">
-				<return-type type="gint"/>
-				<parameters>
-					<parameter name="selector" type="HildonTouchSelector*"/>
-					<parameter name="column" type="gint"/>
-				</parameters>
-			</method>
-			<method name="get_column" symbol="hildon_touch_selector_get_column">
-				<return-type type="HildonTouchSelectorColumn*"/>
-				<parameters>
-					<parameter name="selector" type="HildonTouchSelector*"/>
-					<parameter name="column" type="gint"/>
-				</parameters>
-			</method>
-			<method name="get_column_selection_mode" symbol="hildon_touch_selector_get_column_selection_mode">
-				<return-type type="HildonTouchSelectorSelectionMode"/>
-				<parameters>
-					<parameter name="selector" type="HildonTouchSelector*"/>
-				</parameters>
-			</method>
-			<method name="get_current_text" symbol="hildon_touch_selector_get_current_text">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="selector" type="HildonTouchSelector*"/>
-				</parameters>
-			</method>
-			<method name="get_hildon_ui_mode" symbol="hildon_touch_selector_get_hildon_ui_mode">
-				<return-type type="HildonUIMode"/>
-				<parameters>
-					<parameter name="selector" type="HildonTouchSelector*"/>
-				</parameters>
-			</method>
-			<method name="get_last_activated_row" symbol="hildon_touch_selector_get_last_activated_row">
-				<return-type type="GtkTreePath*"/>
-				<parameters>
-					<parameter name="selector" type="HildonTouchSelector*"/>
-					<parameter name="column" type="gint"/>
-				</parameters>
-			</method>
-			<method name="get_model" symbol="hildon_touch_selector_get_model">
-				<return-type type="GtkTreeModel*"/>
-				<parameters>
-					<parameter name="selector" type="HildonTouchSelector*"/>
-					<parameter name="column" type="gint"/>
-				</parameters>
-			</method>
-			<method name="get_num_columns" symbol="hildon_touch_selector_get_num_columns">
-				<return-type type="gint"/>
-				<parameters>
-					<parameter name="selector" type="HildonTouchSelector*"/>
-				</parameters>
-			</method>
-			<method name="get_print_func" symbol="hildon_touch_selector_get_print_func">
-				<return-type type="HildonTouchSelectorPrintFunc"/>
-				<parameters>
-					<parameter name="selector" type="HildonTouchSelector*"/>
-				</parameters>
-			</method>
-			<method name="get_selected" symbol="hildon_touch_selector_get_selected">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="selector" type="HildonTouchSelector*"/>
-					<parameter name="column" type="gint"/>
-					<parameter name="iter" type="GtkTreeIter*"/>
-				</parameters>
-			</method>
-			<method name="get_selected_rows" symbol="hildon_touch_selector_get_selected_rows">
-				<return-type type="GList*"/>
-				<parameters>
-					<parameter name="selector" type="HildonTouchSelector*"/>
-					<parameter name="column" type="gint"/>
-				</parameters>
-			</method>
-			<method name="insert_text" symbol="hildon_touch_selector_insert_text">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="selector" type="HildonTouchSelector*"/>
-					<parameter name="position" type="gint"/>
-					<parameter name="text" type="gchar*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="hildon_touch_selector_new">
-				<return-type type="GtkWidget*"/>
-			</constructor>
-			<constructor name="new_text" symbol="hildon_touch_selector_new_text">
-				<return-type type="GtkWidget*"/>
-			</constructor>
-			<method name="optimal_size_request" symbol="hildon_touch_selector_optimal_size_request">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="selector" type="HildonTouchSelector*"/>
-					<parameter name="requisition" type="GtkRequisition*"/>
-				</parameters>
-			</method>
-			<method name="prepend_text" symbol="hildon_touch_selector_prepend_text">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="selector" type="HildonTouchSelector*"/>
-					<parameter name="text" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="remove_column" symbol="hildon_touch_selector_remove_column">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="selector" type="HildonTouchSelector*"/>
-					<parameter name="column" type="gint"/>
-				</parameters>
-			</method>
-			<method name="select_iter" symbol="hildon_touch_selector_select_iter">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="selector" type="HildonTouchSelector*"/>
-					<parameter name="column" type="gint"/>
-					<parameter name="iter" type="GtkTreeIter*"/>
-					<parameter name="scroll_to" type="gboolean"/>
-				</parameters>
-			</method>
-			<method name="set_active" symbol="hildon_touch_selector_set_active">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="selector" type="HildonTouchSelector*"/>
-					<parameter name="column" type="gint"/>
-					<parameter name="index" type="gint"/>
-				</parameters>
-			</method>
-			<method name="set_column_attributes" symbol="hildon_touch_selector_set_column_attributes">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="selector" type="HildonTouchSelector*"/>
-					<parameter name="num_column" type="gint"/>
-					<parameter name="cell_renderer" type="GtkCellRenderer*"/>
-				</parameters>
-			</method>
-			<method name="set_column_selection_mode" symbol="hildon_touch_selector_set_column_selection_mode">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="selector" type="HildonTouchSelector*"/>
-					<parameter name="mode" type="HildonTouchSelectorSelectionMode"/>
-				</parameters>
-			</method>
-			<method name="set_hildon_ui_mode" symbol="hildon_touch_selector_set_hildon_ui_mode">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="selector" type="HildonTouchSelector*"/>
-					<parameter name="mode" type="HildonUIMode"/>
-				</parameters>
-			</method>
-			<method name="set_model" symbol="hildon_touch_selector_set_model">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="selector" type="HildonTouchSelector*"/>
-					<parameter name="column" type="gint"/>
-					<parameter name="model" type="GtkTreeModel*"/>
-				</parameters>
-			</method>
-			<method name="set_print_func" symbol="hildon_touch_selector_set_print_func">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="selector" type="HildonTouchSelector*"/>
-					<parameter name="func" type="HildonTouchSelectorPrintFunc"/>
-				</parameters>
-			</method>
-			<method name="set_print_func_full" symbol="hildon_touch_selector_set_print_func_full">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="selector" type="HildonTouchSelector*"/>
-					<parameter name="func" type="HildonTouchSelectorPrintFunc"/>
-					<parameter name="user_data" type="gpointer"/>
-					<parameter name="destroy_func" type="GDestroyNotify"/>
-				</parameters>
-			</method>
-			<method name="unselect_all" symbol="hildon_touch_selector_unselect_all">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="selector" type="HildonTouchSelector*"/>
-					<parameter name="column" type="gint"/>
-				</parameters>
-			</method>
-			<method name="unselect_iter" symbol="hildon_touch_selector_unselect_iter">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="selector" type="HildonTouchSelector*"/>
-					<parameter name="column" type="gint"/>
-					<parameter name="iter" type="GtkTreeIter*"/>
-				</parameters>
-			</method>
-			<property name="has-multiple-selection" type="gboolean" readable="1" writable="0" construct="0" construct-only="0"/>
-			<property name="hildon-ui-mode" type="HildonUIMode" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="initial-scroll" type="gboolean" readable="1" writable="1" construct="1" construct-only="0"/>
-			<signal name="changed" when="LAST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="selector" type="HildonTouchSelector*"/>
-					<parameter name="column" type="gint"/>
-				</parameters>
-			</signal>
-			<signal name="columns-changed" when="LAST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="object" type="HildonTouchSelector*"/>
-				</parameters>
-			</signal>
-			<vfunc name="set_model">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="selector" type="HildonTouchSelector*"/>
-					<parameter name="column" type="gint"/>
-					<parameter name="model" type="GtkTreeModel*"/>
-				</parameters>
-			</vfunc>
-		</object>
-		<object name="HildonTouchSelectorColumn" parent="GObject" type-name="HildonTouchSelectorColumn" get-type="hildon_touch_selector_column_get_type">
-			<implements>
-				<interface name="GtkCellLayout"/>
-			</implements>
-			<method name="get_text_column" symbol="hildon_touch_selector_column_get_text_column">
-				<return-type type="gint"/>
-				<parameters>
-					<parameter name="column" type="HildonTouchSelectorColumn*"/>
-				</parameters>
-			</method>
-			<method name="set_text_column" symbol="hildon_touch_selector_column_set_text_column">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="column" type="HildonTouchSelectorColumn*"/>
-					<parameter name="text_column" type="gint"/>
-				</parameters>
-			</method>
-			<property name="text-column" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-		</object>
-		<object name="HildonTouchSelectorEntry" parent="HildonTouchSelector" type-name="HildonTouchSelectorEntry" get-type="hildon_touch_selector_entry_get_type">
-			<implements>
-				<interface name="AtkImplementor"/>
-				<interface name="GtkBuildable"/>
-			</implements>
-			<method name="get_entry" symbol="hildon_touch_selector_entry_get_entry">
-				<return-type type="HildonEntry*"/>
-				<parameters>
-					<parameter name="selector" type="HildonTouchSelectorEntry*"/>
-				</parameters>
-			</method>
-			<method name="get_input_mode" symbol="hildon_touch_selector_entry_get_input_mode">
-				<return-type type="HildonGtkInputMode"/>
-				<parameters>
-					<parameter name="selector" type="HildonTouchSelectorEntry*"/>
-				</parameters>
-			</method>
-			<method name="get_text_column" symbol="hildon_touch_selector_entry_get_text_column">
-				<return-type type="gint"/>
-				<parameters>
-					<parameter name="selector" type="HildonTouchSelectorEntry*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="hildon_touch_selector_entry_new">
-				<return-type type="GtkWidget*"/>
-			</constructor>
-			<constructor name="new_text" symbol="hildon_touch_selector_entry_new_text">
-				<return-type type="GtkWidget*"/>
-			</constructor>
-			<method name="set_input_mode" symbol="hildon_touch_selector_entry_set_input_mode">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="selector" type="HildonTouchSelectorEntry*"/>
-					<parameter name="input_mode" type="HildonGtkInputMode"/>
-				</parameters>
-			</method>
-			<method name="set_text_column" symbol="hildon_touch_selector_entry_set_text_column">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="selector" type="HildonTouchSelectorEntry*"/>
-					<parameter name="text_column" type="gint"/>
-				</parameters>
-			</method>
-			<property name="text-column" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-		</object>
-		<object name="HildonVVolumebar" parent="HildonVolumebar" type-name="HildonVVolumebar" get-type="hildon_vvolumebar_get_type">
-			<implements>
-				<interface name="AtkImplementor"/>
-				<interface name="GtkBuildable"/>
-			</implements>
-			<constructor name="new" symbol="hildon_vvolumebar_new">
-				<return-type type="GtkWidget*"/>
-			</constructor>
-		</object>
-		<object name="HildonVolumebar" parent="GtkContainer" type-name="HildonVolumebar" get-type="hildon_volumebar_get_type">
-			<implements>
-				<interface name="AtkImplementor"/>
-				<interface name="GtkBuildable"/>
-			</implements>
-			<method name="get_adjustment" symbol="hildon_volumebar_get_adjustment">
-				<return-type type="GtkAdjustment*"/>
-				<parameters>
-					<parameter name="self" type="HildonVolumebar*"/>
-				</parameters>
-			</method>
-			<method name="get_level" symbol="hildon_volumebar_get_level">
-				<return-type type="double"/>
-				<parameters>
-					<parameter name="self" type="HildonVolumebar*"/>
-				</parameters>
-			</method>
-			<method name="get_mute" symbol="hildon_volumebar_get_mute">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="self" type="HildonVolumebar*"/>
-				</parameters>
-			</method>
-			<method name="set_level" symbol="hildon_volumebar_set_level">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonVolumebar*"/>
-					<parameter name="level" type="gdouble"/>
-				</parameters>
-			</method>
-			<method name="set_mute" symbol="hildon_volumebar_set_mute">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonVolumebar*"/>
-					<parameter name="mute" type="gboolean"/>
-				</parameters>
-			</method>
-			<method name="set_range_insensitive_message" symbol="hildon_volumebar_set_range_insensitive_message">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="widget" type="HildonVolumebar*"/>
-					<parameter name="message" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="set_range_insensitive_messagef" symbol="hildon_volumebar_set_range_insensitive_messagef">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="widget" type="HildonVolumebar*"/>
-					<parameter name="format" type="gchar*"/>
-				</parameters>
-			</method>
-			<property name="has-mute" type="gboolean" readable="1" writable="1" construct="1" construct-only="0"/>
-			<property name="level" type="gdouble" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="mute" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-			<signal name="level-changed" when="LAST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonVolumebar*"/>
-				</parameters>
-			</signal>
-			<signal name="mute-toggled" when="LAST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonVolumebar*"/>
-				</parameters>
-			</signal>
-		</object>
-		<object name="HildonVolumebarRange" parent="GtkScale" type-name="HildonVolumebarRange" get-type="hildon_volumebar_range_get_type">
-			<implements>
-				<interface name="AtkImplementor"/>
-				<interface name="GtkBuildable"/>
-			</implements>
-			<method name="get_level" symbol="hildon_volumebar_range_get_level">
-				<return-type type="gdouble"/>
-				<parameters>
-					<parameter name="self" type="HildonVolumebarRange*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="hildon_volumebar_range_new">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="orientation" type="GtkOrientation"/>
-				</parameters>
-			</constructor>
-			<method name="set_level" symbol="hildon_volumebar_range_set_level">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonVolumebarRange*"/>
-					<parameter name="level" type="gdouble"/>
-				</parameters>
-			</method>
-			<property name="level" type="gdouble" readable="1" writable="1" construct="0" construct-only="0"/>
-		</object>
-		<object name="HildonWeekdayPicker" parent="GtkContainer" type-name="HildonWeekdayPicker" get-type="hildon_weekday_picker_get_type">
-			<implements>
-				<interface name="AtkImplementor"/>
-				<interface name="GtkBuildable"/>
-			</implements>
-			<method name="isset_day" symbol="hildon_weekday_picker_isset_day">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="picker" type="HildonWeekdayPicker*"/>
-					<parameter name="day" type="GDateWeekday"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="hildon_weekday_picker_new">
-				<return-type type="GtkWidget*"/>
-			</constructor>
-			<method name="set_all" symbol="hildon_weekday_picker_set_all">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="picker" type="HildonWeekdayPicker*"/>
-				</parameters>
-			</method>
-			<method name="set_day" symbol="hildon_weekday_picker_set_day">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="picker" type="HildonWeekdayPicker*"/>
-					<parameter name="day" type="GDateWeekday"/>
-				</parameters>
-			</method>
-			<method name="toggle_day" symbol="hildon_weekday_picker_toggle_day">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="picker" type="HildonWeekdayPicker*"/>
-					<parameter name="day" type="GDateWeekday"/>
-				</parameters>
-			</method>
-			<method name="unset_all" symbol="hildon_weekday_picker_unset_all">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="picker" type="HildonWeekdayPicker*"/>
-				</parameters>
-			</method>
-			<method name="unset_day" symbol="hildon_weekday_picker_unset_day">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="picker" type="HildonWeekdayPicker*"/>
-					<parameter name="day" type="GDateWeekday"/>
-				</parameters>
-			</method>
-			<signal name="selection-changed" when="LAST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonWeekdayPicker*"/>
-					<parameter name="p0" type="gint"/>
-				</parameters>
-			</signal>
-		</object>
-		<object name="HildonWindow" parent="GtkWindow" type-name="HildonWindow" get-type="hildon_window_get_type">
-			<implements>
-				<interface name="AtkImplementor"/>
-				<interface name="GtkBuildable"/>
-			</implements>
-			<method name="add_toolbar" symbol="hildon_window_add_toolbar">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonWindow*"/>
-					<parameter name="toolbar" type="GtkToolbar*"/>
-				</parameters>
-			</method>
-			<method name="add_with_scrollbar" symbol="hildon_window_add_with_scrollbar">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonWindow*"/>
-					<parameter name="child" type="GtkWidget*"/>
-				</parameters>
-			</method>
-			<method name="get_app_menu" symbol="hildon_window_get_app_menu">
-				<return-type type="HildonAppMenu*"/>
-				<parameters>
-					<parameter name="self" type="HildonWindow*"/>
-				</parameters>
-			</method>
-			<method name="get_is_topmost" symbol="hildon_window_get_is_topmost">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="self" type="HildonWindow*"/>
-				</parameters>
-			</method>
-			<method name="get_main_menu" symbol="hildon_window_get_main_menu">
-				<return-type type="GtkMenu*"/>
-				<parameters>
-					<parameter name="self" type="HildonWindow*"/>
-				</parameters>
-			</method>
-			<method name="get_markup" symbol="hildon_window_get_markup">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="window" type="HildonWindow*"/>
-				</parameters>
-			</method>
-			<method name="get_menu" symbol="hildon_window_get_menu">
-				<return-type type="GtkMenu*"/>
-				<parameters>
-					<parameter name="self" type="HildonWindow*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="hildon_window_new">
-				<return-type type="GtkWidget*"/>
-			</constructor>
-			<method name="remove_toolbar" symbol="hildon_window_remove_toolbar">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonWindow*"/>
-					<parameter name="toolbar" type="GtkToolbar*"/>
-				</parameters>
-			</method>
-			<method name="set_app_menu" symbol="hildon_window_set_app_menu">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonWindow*"/>
-					<parameter name="menu" type="HildonAppMenu*"/>
-				</parameters>
-			</method>
-			<method name="set_edit_toolbar" symbol="hildon_window_set_edit_toolbar">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonWindow*"/>
-					<parameter name="toolbar" type="HildonEditToolbar*"/>
-				</parameters>
-			</method>
-			<method name="set_main_menu" symbol="hildon_window_set_main_menu">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonWindow*"/>
-					<parameter name="menu" type="GtkMenu*"/>
-				</parameters>
-			</method>
-			<method name="set_markup" symbol="hildon_window_set_markup">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="window" type="HildonWindow*"/>
-					<parameter name="markup" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="set_menu" symbol="hildon_window_set_menu">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonWindow*"/>
-					<parameter name="menu" type="GtkMenu*"/>
-				</parameters>
-			</method>
-			<property name="is-topmost" type="gboolean" readable="1" writable="0" construct="0" construct-only="0"/>
-			<property name="markup" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-			<signal name="clipboard-operation" when="FIRST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="hwindow" type="HildonWindow*"/>
-					<parameter name="operation" type="gint"/>
-				</parameters>
-			</signal>
-			<vfunc name="toggle_menu">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="self" type="HildonWindow*"/>
-					<parameter name="button" type="guint"/>
-					<parameter name="time" type="guint32"/>
-				</parameters>
-			</vfunc>
-		</object>
-		<object name="HildonWindowStack" parent="GObject" type-name="HildonWindowStack" get-type="hildon_window_stack_get_type">
-			<method name="get_default" symbol="hildon_window_stack_get_default">
-				<return-type type="HildonWindowStack*"/>
-			</method>
-			<method name="get_windows" symbol="hildon_window_stack_get_windows">
-				<return-type type="GList*"/>
-				<parameters>
-					<parameter name="stack" type="HildonWindowStack*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="hildon_window_stack_new">
-				<return-type type="HildonWindowStack*"/>
-			</constructor>
-			<method name="peek" symbol="hildon_window_stack_peek">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="stack" type="HildonWindowStack*"/>
-				</parameters>
-			</method>
-			<method name="pop" symbol="hildon_window_stack_pop">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="stack" type="HildonWindowStack*"/>
-					<parameter name="nwindows" type="gint"/>
-					<parameter name="popped_windows" type="GList**"/>
-				</parameters>
-			</method>
-			<method name="pop_1" symbol="hildon_window_stack_pop_1">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="stack" type="HildonWindowStack*"/>
-				</parameters>
-			</method>
-			<method name="pop_and_push" symbol="hildon_window_stack_pop_and_push">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="stack" type="HildonWindowStack*"/>
-					<parameter name="nwindows" type="gint"/>
-					<parameter name="popped_windows" type="GList**"/>
-					<parameter name="win1" type="HildonStackableWindow*"/>
-				</parameters>
-			</method>
-			<method name="pop_and_push_list" symbol="hildon_window_stack_pop_and_push_list">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="stack" type="HildonWindowStack*"/>
-					<parameter name="nwindows" type="gint"/>
-					<parameter name="popped_windows" type="GList**"/>
-					<parameter name="list" type="GList*"/>
-				</parameters>
-			</method>
-			<method name="push" symbol="hildon_window_stack_push">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="stack" type="HildonWindowStack*"/>
-					<parameter name="win1" type="HildonStackableWindow*"/>
-				</parameters>
-			</method>
-			<method name="push_1" symbol="hildon_window_stack_push_1">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="stack" type="HildonWindowStack*"/>
-					<parameter name="win" type="HildonStackableWindow*"/>
-				</parameters>
-			</method>
-			<method name="push_list" symbol="hildon_window_stack_push_list">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="stack" type="HildonWindowStack*"/>
-					<parameter name="list" type="GList*"/>
-				</parameters>
-			</method>
-			<method name="size" symbol="hildon_window_stack_size">
-				<return-type type="gint"/>
-				<parameters>
-					<parameter name="stack" type="HildonWindowStack*"/>
-				</parameters>
-			</method>
-			<property name="window-group" type="GtkWindowGroup*" readable="1" writable="1" construct="0" construct-only="1"/>
-		</object>
-		<object name="HildonWizardDialog" parent="GtkDialog" type-name="HildonWizardDialog" get-type="hildon_wizard_dialog_get_type">
-			<implements>
-				<interface name="AtkImplementor"/>
-				<interface name="GtkBuildable"/>
-			</implements>
-			<constructor name="new" symbol="hildon_wizard_dialog_new">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="parent" type="GtkWindow*"/>
-					<parameter name="wizard_name" type="char*"/>
-					<parameter name="notebook" type="GtkNotebook*"/>
-				</parameters>
-			</constructor>
-			<method name="set_forward_page_func" symbol="hildon_wizard_dialog_set_forward_page_func">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="wizard_dialog" type="HildonWizardDialog*"/>
-					<parameter name="page_func" type="HildonWizardDialogPageFunc"/>
-					<parameter name="data" type="gpointer"/>
-					<parameter name="destroy" type="GDestroyNotify"/>
-				</parameters>
-			</method>
-			<property name="autotitle" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="wizard-name" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="wizard-notebook" type="GtkNotebook*" readable="1" writable="1" construct="0" construct-only="0"/>
-		</object>
-		<interface name="HildonBreadCrumb" type-name="HildonBreadCrumb" get-type="hildon_bread_crumb_get_type">
-			<requires>
-				<interface name="GtkWidget"/>
-			</requires>
-			<method name="activated" symbol="hildon_bread_crumb_activated">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="bread_crumb" type="HildonBreadCrumb*"/>
-				</parameters>
-			</method>
-			<method name="get_natural_size" symbol="hildon_bread_crumb_get_natural_size">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="bread_crumb" type="HildonBreadCrumb*"/>
-					<parameter name="width" type="gint*"/>
-					<parameter name="height" type="gint*"/>
-				</parameters>
-			</method>
-			<signal name="crumb-activated" when="LAST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="bread_crumb" type="HildonBreadCrumb*"/>
-				</parameters>
-			</signal>
-			<vfunc name="get_natural_size">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="bread_crumb" type="HildonBreadCrumb*"/>
-					<parameter name="natural_width" type="gint*"/>
-					<parameter name="natural_height" type="gint*"/>
-				</parameters>
-			</vfunc>
-		</interface>
-		<constant name="HILDON_AA_CENTER_GRAVITY" type="int" value="9"/>
-		<constant name="HILDON_AA_E_GRAVITY" type="int" value="3"/>
-		<constant name="HILDON_AA_NE_GRAVITY" type="int" value="2"/>
-		<constant name="HILDON_AA_NW_GRAVITY" type="int" value="8"/>
-		<constant name="HILDON_AA_N_GRAVITY" type="int" value="1"/>
-		<constant name="HILDON_AA_SE_GRAVITY" type="int" value="4"/>
-		<constant name="HILDON_AA_SW_GRAVITY" type="int" value="6"/>
-		<constant name="HILDON_AA_S_GRAVITY" type="int" value="5"/>
-		<constant name="HILDON_AA_W_GRAVITY" type="int" value="7"/>
-		<constant name="HILDON_AA_X_AXIS" type="int" value="0"/>
-		<constant name="HILDON_AA_Y_AXIS" type="int" value="1"/>
-		<constant name="HILDON_AA_Z_AXIS" type="int" value="2"/>
-		<constant name="HILDON_MAJOR_VERSION" type="int" value="2"/>
-		<constant name="HILDON_MARGIN_DEFAULT" type="int" value="8"/>
-		<constant name="HILDON_MARGIN_DOUBLE" type="int" value="16"/>
-		<constant name="HILDON_MARGIN_HALF" type="int" value="4"/>
-		<constant name="HILDON_MARGIN_TRIPLE" type="int" value="24"/>
-		<constant name="HILDON_MICRO_VERSION" type="int" value="86"/>
-		<constant name="HILDON_MINOR_VERSION" type="int" value="1"/>
-		<constant name="HILDON_WINDOW_LONG_PRESS_TIME" type="int" value="800"/>
-		<constant name="HILDON_WINDOW_TITLEBAR_HEIGHT" type="int" value="56"/>
-	</namespace>
-</api>
diff --git a/vapi/packages/hildon-1/hildon-1.metadata b/vapi/packages/hildon-1/hildon-1.metadata
deleted file mode 100644
index c5f7ba031..000000000
--- a/vapi/packages/hildon-1/hildon-1.metadata
+++ /dev/null
@@ -1,15 +0,0 @@
-Hildon cprefix="Hildon" lower_case_cprefix="hildon_" cheader_filename="hildon/hildon.h"
-hildon_banner_show_information.icon_name nullable="1"
-hildon_banner_show_information_with_markup.icon_name nullable="1"
-hildon_color_button_get_color.color is_out="1"
-hildon_color_chooser_get_color.color is_out="1"
-hildon_color_chooser_dialog_get_color.color is_out="1"
-hildon_find_toolbar_get_active_iter.iter is_out="1"
-hildon_gtk_init.argc hidden="1"
-hildon_gtk_init.argv is_array="1" is_ref="1" array_length_pos="0.9"
-hildon_touch_selector_set_print_func_full.func value_owned="1"
-hildon_touch_selector_set_print_func_full.destroy_func hidden="1"
-hildon_wizard_dialog_set_forward_page_func.data hidden="1"
-hildon_wizard_dialog_set_forward_page_func.destroy hidden="1"
-hildon_wizard_dialog_set_forward_page_func.page_func value_owned="1"
-
diff --git a/vapi/packages/hildon-1/hildon-1.namespace b/vapi/packages/hildon-1/hildon-1.namespace
deleted file mode 100644
index d297f6d9a..000000000
--- a/vapi/packages/hildon-1/hildon-1.namespace
+++ /dev/null
@@ -1 +0,0 @@
-Hildon
diff --git a/vapi/packages/hildon-fm-2/hildon-fm-2.deps b/vapi/packages/hildon-fm-2/hildon-fm-2.deps
deleted file mode 100644
index 1bc6b0778..000000000
--- a/vapi/packages/hildon-fm-2/hildon-fm-2.deps
+++ /dev/null
@@ -1,8 +0,0 @@
-atk
-gio-2.0
-gdk-2.0
-gdk-pixbuf-2.0
-gtk+-2.0
-pango
-cairo
-glib-2.0
diff --git a/vapi/packages/hildon-fm-2/hildon-fm-2.files b/vapi/packages/hildon-fm-2/hildon-fm-2.files
deleted file mode 100644
index 57a03efce..000000000
--- a/vapi/packages/hildon-fm-2/hildon-fm-2.files
+++ /dev/null
@@ -1,2 +0,0 @@
-include/hildon-fm-2
-lib/libhildonfm.so
diff --git a/vapi/packages/hildon-fm-2/hildon-fm-2.gi b/vapi/packages/hildon-fm-2/hildon-fm-2.gi
deleted file mode 100644
index 2b8ecbef0..000000000
--- a/vapi/packages/hildon-fm-2/hildon-fm-2.gi
+++ /dev/null
@@ -1,715 +0,0 @@
-<?xml version="1.0"?>
-<api version="1.0">
-	<namespace name="Hildon">
-		<function name="file_system_create_backend" symbol="hildon_file_system_create_backend">
-			<return-type type="GtkFileSystem*"/>
-			<parameters>
-				<parameter name="name" type="gchar*"/>
-				<parameter name="use_fallback" type="gboolean"/>
-			</parameters>
-		</function>
-		<callback name="HildonFileSystemInfoCallback">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="handle" type="HildonFileSystemInfoHandle*"/>
-				<parameter name="info" type="HildonFileSystemInfo*"/>
-				<parameter name="error" type="GError*"/>
-				<parameter name="data" type="gpointer"/>
-			</parameters>
-		</callback>
-		<callback name="HildonFileSystemModelThumbnailCallback">
-			<return-type type="gboolean"/>
-			<parameters>
-				<parameter name="uri" type="gchar*"/>
-				<parameter name="path" type="gchar*"/>
-				<parameter name="thumbnail_file" type="gchar*"/>
-			</parameters>
-		</callback>
-		<struct name="HildonFileSystemInfo">
-			<method name="async_cancel" symbol="hildon_file_system_info_async_cancel">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="handle" type="HildonFileSystemInfoHandle*"/>
-				</parameters>
-			</method>
-			<method name="async_new" symbol="hildon_file_system_info_async_new">
-				<return-type type="HildonFileSystemInfoHandle*"/>
-				<parameters>
-					<parameter name="uri" type="gchar*"/>
-					<parameter name="callback" type="HildonFileSystemInfoCallback"/>
-					<parameter name="data" type="gpointer"/>
-				</parameters>
-			</method>
-			<method name="free" symbol="hildon_file_system_info_free">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="info" type="HildonFileSystemInfo*"/>
-				</parameters>
-			</method>
-			<method name="get_display_name" symbol="hildon_file_system_info_get_display_name">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="info" type="HildonFileSystemInfo*"/>
-				</parameters>
-			</method>
-			<method name="get_icon" symbol="hildon_file_system_info_get_icon">
-				<return-type type="GdkPixbuf*"/>
-				<parameters>
-					<parameter name="info" type="HildonFileSystemInfo*"/>
-					<parameter name="ref_widget" type="GtkWidget*"/>
-				</parameters>
-			</method>
-			<method name="get_icon_at_size" symbol="hildon_file_system_info_get_icon_at_size">
-				<return-type type="GdkPixbuf*"/>
-				<parameters>
-					<parameter name="info" type="HildonFileSystemInfo*"/>
-					<parameter name="ref_widget" type="GtkWidget*"/>
-					<parameter name="size" type="gint"/>
-				</parameters>
-			</method>
-			<method name="new" symbol="hildon_file_system_info_new">
-				<return-type type="HildonFileSystemInfo*"/>
-				<parameters>
-					<parameter name="uri" type="gchar*"/>
-					<parameter name="error" type="GError**"/>
-				</parameters>
-			</method>
-		</struct>
-		<struct name="HildonFileSystemInfoHandle">
-		</struct>
-		<struct name="HildonFileSystemStorageDialogPriv">
-		</struct>
-		<enum name="HildonFileSelectionMode">
-			<member name="HILDON_FILE_SELECTION_MODE_LIST" value="0"/>
-			<member name="HILDON_FILE_SELECTION_MODE_THUMBNAILS" value="1"/>
-		</enum>
-		<enum name="HildonFileSelectionPane">
-			<member name="HILDON_FILE_SELECTION_PANE_NAVIGATION" value="0"/>
-			<member name="HILDON_FILE_SELECTION_PANE_CONTENT" value="1"/>
-		</enum>
-		<enum name="HildonFileSelectionSortKey">
-			<member name="HILDON_FILE_SELECTION_SORT_NAME" value="0"/>
-			<member name="HILDON_FILE_SELECTION_SORT_TYPE" value="1"/>
-			<member name="HILDON_FILE_SELECTION_SORT_MODIFIED" value="2"/>
-			<member name="HILDON_FILE_SELECTION_SORT_SIZE" value="3"/>
-		</enum>
-		<enum name="HildonFileSelectionVisibleColumns">
-			<member name="HILDON_FILE_SELECTION_SHOW_NAME" value="1"/>
-			<member name="HILDON_FILE_SELECTION_SHOW_MODIFIED" value="2"/>
-			<member name="HILDON_FILE_SELECTION_SHOW_SIZE" value="4"/>
-			<member name="HILDON_FILE_SELECTION_SHOW_ALL" value="7"/>
-		</enum>
-		<enum name="HildonFileSystemModelColumns">
-			<member name="HILDON_FILE_SYSTEM_MODEL_COLUMN_GTK_PATH_INTERNAL" value="0"/>
-			<member name="HILDON_FILE_SYSTEM_MODEL_COLUMN_LOCAL_PATH" value="1"/>
-			<member name="HILDON_FILE_SYSTEM_MODEL_COLUMN_URI" value="2"/>
-			<member name="HILDON_FILE_SYSTEM_MODEL_COLUMN_FILE_NAME" value="3"/>
-			<member name="HILDON_FILE_SYSTEM_MODEL_COLUMN_DISPLAY_NAME" value="4"/>
-			<member name="HILDON_FILE_SYSTEM_MODEL_COLUMN_SORT_KEY" value="5"/>
-			<member name="HILDON_FILE_SYSTEM_MODEL_COLUMN_MIME_TYPE" value="6"/>
-			<member name="HILDON_FILE_SYSTEM_MODEL_COLUMN_FILE_SIZE" value="7"/>
-			<member name="HILDON_FILE_SYSTEM_MODEL_COLUMN_FILE_TIME" value="8"/>
-			<member name="HILDON_FILE_SYSTEM_MODEL_COLUMN_IS_FOLDER" value="9"/>
-			<member name="HILDON_FILE_SYSTEM_MODEL_COLUMN_IS_AVAILABLE" value="10"/>
-			<member name="HILDON_FILE_SYSTEM_MODEL_COLUMN_HAS_LOCAL_PATH" value="11"/>
-			<member name="HILDON_FILE_SYSTEM_MODEL_COLUMN_TYPE" value="12"/>
-			<member name="HILDON_FILE_SYSTEM_MODEL_COLUMN_ICON" value="13"/>
-			<member name="HILDON_FILE_SYSTEM_MODEL_COLUMN_ICON_EXPANDED" value="14"/>
-			<member name="HILDON_FILE_SYSTEM_MODEL_COLUMN_ICON_COLLAPSED" value="15"/>
-			<member name="HILDON_FILE_SYSTEM_MODEL_COLUMN_THUMBNAIL" value="16"/>
-			<member name="HILDON_FILE_SYSTEM_MODEL_COLUMN_LOAD_READY" value="17"/>
-			<member name="HILDON_FILE_SYSTEM_MODEL_COLUMN_FREE_SPACE" value="18"/>
-			<member name="HILDON_FILE_SYSTEM_MODEL_COLUMN_TITLE" value="19"/>
-			<member name="HILDON_FILE_SYSTEM_MODEL_COLUMN_AUTHOR" value="20"/>
-			<member name="HILDON_FILE_SYSTEM_MODEL_COLUMN_IS_HIDDEN" value="21"/>
-			<member name="HILDON_FILE_SYSTEM_MODEL_COLUMN_UNAVAILABLE_REASON" value="22"/>
-			<member name="HILDON_FILE_SYSTEM_MODEL_COLUMN_FAILED_ACCESS_MESSAGE" value="23"/>
-			<member name="HILDON_FILE_SYSTEM_MODEL_COLUMN_SORT_WEIGHT" value="24"/>
-			<member name="HILDON_FILE_SYSTEM_MODEL_COLUMN_EXTRA_INFO" value="25"/>
-			<member name="HILDON_FILE_SYSTEM_MODEL_COLUMN_IS_DRIVE" value="26"/>
-			<member name="HILDON_FILE_SYSTEM_MODEL_NUM_COLUMNS" value="27"/>
-		</enum>
-		<enum name="HildonFileSystemModelItemType">
-			<member name="HILDON_FILE_SYSTEM_MODEL_UNKNOWN" value="0"/>
-			<member name="HILDON_FILE_SYSTEM_MODEL_FILE" value="1"/>
-			<member name="HILDON_FILE_SYSTEM_MODEL_FOLDER" value="2"/>
-			<member name="HILDON_FILE_SYSTEM_MODEL_SAFE_FOLDER_IMAGES" value="3"/>
-			<member name="HILDON_FILE_SYSTEM_MODEL_SAFE_FOLDER_VIDEOS" value="4"/>
-			<member name="HILDON_FILE_SYSTEM_MODEL_SAFE_FOLDER_SOUNDS" value="5"/>
-			<member name="HILDON_FILE_SYSTEM_MODEL_SAFE_FOLDER_DOCUMENTS" value="6"/>
-			<member name="HILDON_FILE_SYSTEM_MODEL_SAFE_FOLDER_GAMES" value="7"/>
-			<member name="HILDON_FILE_SYSTEM_MODEL_MMC" value="8"/>
-			<member name="HILDON_FILE_SYSTEM_MODEL_GATEWAY" value="9"/>
-			<member name="HILDON_FILE_SYSTEM_MODEL_LOCAL_DEVICE" value="10"/>
-		</enum>
-		<object name="HildonFileChooserDialog" parent="GtkDialog" type-name="HildonFileChooserDialog" get-type="hildon_file_chooser_dialog_get_type">
-			<implements>
-				<interface name="AtkImplementor"/>
-				<interface name="GtkBuildable"/>
-				<interface name="GtkFileChooser"/>
-			</implements>
-			<method name="add_extensions_combo" symbol="hildon_file_chooser_dialog_add_extensions_combo">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="self" type="HildonFileChooserDialog*"/>
-					<parameter name="extensions" type="char**"/>
-					<parameter name="ext_names" type="char**"/>
-				</parameters>
-			</method>
-			<method name="add_extra" symbol="hildon_file_chooser_dialog_add_extra">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonFileChooserDialog*"/>
-					<parameter name="widget" type="GtkWidget*"/>
-				</parameters>
-			</method>
-			<method name="focus_to_input" symbol="hildon_file_chooser_dialog_focus_to_input">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="d" type="HildonFileChooserDialog*"/>
-				</parameters>
-			</method>
-			<method name="get_extension" symbol="hildon_file_chooser_dialog_get_extension">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="self" type="HildonFileChooserDialog*"/>
-				</parameters>
-			</method>
-			<method name="get_safe_folder" symbol="hildon_file_chooser_dialog_get_safe_folder">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="self" type="HildonFileChooserDialog*"/>
-				</parameters>
-			</method>
-			<method name="get_safe_folder_uri" symbol="hildon_file_chooser_dialog_get_safe_folder_uri">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="self" type="HildonFileChooserDialog*"/>
-				</parameters>
-			</method>
-			<method name="get_show_upnp" symbol="hildon_file_chooser_dialog_get_show_upnp">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="self" type="HildonFileChooserDialog*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="hildon_file_chooser_dialog_new">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="parent" type="GtkWindow*"/>
-					<parameter name="action" type="GtkFileChooserAction"/>
-				</parameters>
-			</constructor>
-			<constructor name="new_with_properties" symbol="hildon_file_chooser_dialog_new_with_properties">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="parent" type="GtkWindow*"/>
-					<parameter name="first_property" type="gchar*"/>
-				</parameters>
-			</constructor>
-			<method name="set_extension" symbol="hildon_file_chooser_dialog_set_extension">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonFileChooserDialog*"/>
-					<parameter name="extension" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="set_safe_folder" symbol="hildon_file_chooser_dialog_set_safe_folder">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonFileChooserDialog*"/>
-					<parameter name="local_path" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="set_safe_folder_uri" symbol="hildon_file_chooser_dialog_set_safe_folder_uri">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonFileChooserDialog*"/>
-					<parameter name="uri" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="set_show_upnp" symbol="hildon_file_chooser_dialog_set_show_upnp">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonFileChooserDialog*"/>
-					<parameter name="value" type="gboolean"/>
-				</parameters>
-			</method>
-			<property name="autonaming" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="empty-text" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="file-system-model" type="HildonFileSystemModel*" readable="1" writable="1" construct="0" construct-only="1"/>
-			<property name="max-full-path-length" type="gint" readable="1" writable="1" construct="1" construct-only="0"/>
-			<property name="max-name-length" type="gint" readable="1" writable="1" construct="1" construct-only="0"/>
-			<property name="open-button-text" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="save-multiple" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="selection-mode" type="HildonFileChooserDialogSelectionMode" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="show-folder-button" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="show-location" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-		</object>
-		<object name="HildonFileDetailsDialog" parent="GtkDialog" type-name="HildonFileDetailsDialog" get-type="hildon_file_details_dialog_get_type">
-			<implements>
-				<interface name="AtkImplementor"/>
-				<interface name="GtkBuildable"/>
-			</implements>
-			<method name="get_file_iter" symbol="hildon_file_details_dialog_get_file_iter">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="self" type="HildonFileDetailsDialog*"/>
-					<parameter name="iter" type="GtkTreeIter*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="hildon_file_details_dialog_new">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="parent" type="GtkWindow*"/>
-					<parameter name="filename" type="gchar*"/>
-				</parameters>
-			</constructor>
-			<constructor name="new_with_model" symbol="hildon_file_details_dialog_new_with_model">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="parent" type="GtkWindow*"/>
-					<parameter name="model" type="HildonFileSystemModel*"/>
-				</parameters>
-			</constructor>
-			<method name="set_file_iter" symbol="hildon_file_details_dialog_set_file_iter">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonFileDetailsDialog*"/>
-					<parameter name="iter" type="GtkTreeIter*"/>
-				</parameters>
-			</method>
-			<property name="additional-tab" type="GtkWidget*" readable="1" writable="1" construct="1" construct-only="0"/>
-			<property name="additional-tab-label" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="enable-read-only-checkbox" type="gboolean" readable="1" writable="1" construct="1" construct-only="0"/>
-			<property name="model" type="HildonFileSystemModel*" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="show-tabs" type="gboolean" readable="1" writable="1" construct="1" construct-only="0"/>
-			<property name="show-type-icon" type="gboolean" readable="1" writable="1" construct="1" construct-only="0"/>
-		</object>
-		<object name="HildonFileSelection" parent="GtkContainer" type-name="HildonFileSelection" get-type="hildon_file_selection_get_type">
-			<implements>
-				<interface name="AtkImplementor"/>
-				<interface name="GtkBuildable"/>
-			</implements>
-			<method name="clear_multi_selection" symbol="hildon_file_selection_clear_multi_selection">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonFileSelection*"/>
-				</parameters>
-			</method>
-			<method name="content_iter_is_selected" symbol="hildon_file_selection_content_iter_is_selected">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="self" type="HildonFileSelection*"/>
-					<parameter name="iter" type="GtkTreeIter*"/>
-				</parameters>
-			</method>
-			<method name="dim_current_selection" symbol="hildon_file_selection_dim_current_selection">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonFileSelection*"/>
-				</parameters>
-			</method>
-			<method name="get_active_content_iter" symbol="hildon_file_selection_get_active_content_iter">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="self" type="HildonFileSelection*"/>
-					<parameter name="iter" type="GtkTreeIter*"/>
-				</parameters>
-			</method>
-			<method name="get_active_pane" symbol="hildon_file_selection_get_active_pane">
-				<return-type type="HildonFileSelectionPane"/>
-				<parameters>
-					<parameter name="self" type="HildonFileSelection*"/>
-				</parameters>
-			</method>
-			<method name="get_column_headers_visible" symbol="hildon_file_selection_get_column_headers_visible">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="self" type="HildonFileSelection*"/>
-				</parameters>
-			</method>
-			<method name="get_current_content_iter" symbol="hildon_file_selection_get_current_content_iter">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="self" type="HildonFileSelection*"/>
-					<parameter name="iter" type="GtkTreeIter*"/>
-				</parameters>
-			</method>
-			<method name="get_current_folder" symbol="hildon_file_selection_get_current_folder">
-				<return-type type="GtkFilePath*"/>
-				<parameters>
-					<parameter name="self" type="HildonFileSelection*"/>
-				</parameters>
-			</method>
-			<method name="get_current_folder_iter" symbol="hildon_file_selection_get_current_folder_iter">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="self" type="HildonFileSelection*"/>
-					<parameter name="iter" type="GtkTreeIter*"/>
-				</parameters>
-			</method>
-			<method name="get_current_folder_uri" symbol="hildon_file_selection_get_current_folder_uri">
-				<return-type type="char*"/>
-				<parameters>
-					<parameter name="self" type="HildonFileSelection*"/>
-				</parameters>
-			</method>
-			<method name="get_filter" symbol="hildon_file_selection_get_filter">
-				<return-type type="GtkFileFilter*"/>
-				<parameters>
-					<parameter name="self" type="HildonFileSelection*"/>
-				</parameters>
-			</method>
-			<method name="get_mode" symbol="hildon_file_selection_get_mode">
-				<return-type type="HildonFileSelectionMode"/>
-				<parameters>
-					<parameter name="self" type="HildonFileSelection*"/>
-				</parameters>
-			</method>
-			<method name="get_select_multiple" symbol="hildon_file_selection_get_select_multiple">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="self" type="HildonFileSelection*"/>
-				</parameters>
-			</method>
-			<method name="get_selected_paths" symbol="hildon_file_selection_get_selected_paths">
-				<return-type type="GSList*"/>
-				<parameters>
-					<parameter name="self" type="HildonFileSelection*"/>
-				</parameters>
-			</method>
-			<method name="get_selected_uris" symbol="hildon_file_selection_get_selected_uris">
-				<return-type type="GSList*"/>
-				<parameters>
-					<parameter name="self" type="HildonFileSelection*"/>
-				</parameters>
-			</method>
-			<method name="get_sort_key" symbol="hildon_file_selection_get_sort_key">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonFileSelection*"/>
-					<parameter name="key" type="HildonFileSelectionSortKey*"/>
-					<parameter name="order" type="GtkSortType*"/>
-				</parameters>
-			</method>
-			<method name="hide_content_pane" symbol="hildon_file_selection_hide_content_pane">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonFileSelection*"/>
-				</parameters>
-			</method>
-			<method name="move_cursor_to_uri" symbol="hildon_file_selection_move_cursor_to_uri">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonFileSelection*"/>
-					<parameter name="uri" type="gchar*"/>
-				</parameters>
-			</method>
-			<constructor name="new_with_model" symbol="hildon_file_selection_new_with_model">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="model" type="HildonFileSystemModel*"/>
-				</parameters>
-			</constructor>
-			<method name="select_all" symbol="hildon_file_selection_select_all">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonFileSelection*"/>
-				</parameters>
-			</method>
-			<method name="select_path" symbol="hildon_file_selection_select_path">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="self" type="HildonFileSelection*"/>
-					<parameter name="path" type="GtkFilePath*"/>
-					<parameter name="error" type="GError**"/>
-				</parameters>
-			</method>
-			<method name="select_uri" symbol="hildon_file_selection_select_uri">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="self" type="HildonFileSelection*"/>
-					<parameter name="uri" type="char*"/>
-					<parameter name="error" type="GError**"/>
-				</parameters>
-			</method>
-			<method name="set_column_headers_visible" symbol="hildon_file_selection_set_column_headers_visible">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonFileSelection*"/>
-					<parameter name="visible" type="gboolean"/>
-				</parameters>
-			</method>
-			<method name="set_current_folder" symbol="hildon_file_selection_set_current_folder">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="self" type="HildonFileSelection*"/>
-					<parameter name="folder" type="GtkFilePath*"/>
-					<parameter name="error" type="GError**"/>
-				</parameters>
-			</method>
-			<method name="set_current_folder_uri" symbol="hildon_file_selection_set_current_folder_uri">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="self" type="HildonFileSelection*"/>
-					<parameter name="folder" type="char*"/>
-					<parameter name="error" type="GError**"/>
-				</parameters>
-			</method>
-			<method name="set_filter" symbol="hildon_file_selection_set_filter">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonFileSelection*"/>
-					<parameter name="filter" type="GtkFileFilter*"/>
-				</parameters>
-			</method>
-			<method name="set_mode" symbol="hildon_file_selection_set_mode">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonFileSelection*"/>
-					<parameter name="mode" type="HildonFileSelectionMode"/>
-				</parameters>
-			</method>
-			<method name="set_select_multiple" symbol="hildon_file_selection_set_select_multiple">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonFileSelection*"/>
-					<parameter name="select_multiple" type="gboolean"/>
-				</parameters>
-			</method>
-			<method name="set_sort_key" symbol="hildon_file_selection_set_sort_key">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonFileSelection*"/>
-					<parameter name="key" type="HildonFileSelectionSortKey"/>
-					<parameter name="order" type="GtkSortType"/>
-				</parameters>
-			</method>
-			<method name="show_content_pane" symbol="hildon_file_selection_show_content_pane">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonFileSelection*"/>
-				</parameters>
-			</method>
-			<method name="undim_all" symbol="hildon_file_selection_undim_all">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonFileSelection*"/>
-				</parameters>
-			</method>
-			<method name="unselect_all" symbol="hildon_file_selection_unselect_all">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonFileSelection*"/>
-				</parameters>
-			</method>
-			<method name="unselect_path" symbol="hildon_file_selection_unselect_path">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonFileSelection*"/>
-					<parameter name="path" type="GtkFilePath*"/>
-				</parameters>
-			</method>
-			<method name="unselect_uri" symbol="hildon_file_selection_unselect_uri">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonFileSelection*"/>
-					<parameter name="uri" type="char*"/>
-				</parameters>
-			</method>
-			<property name="active-pane" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="drag-enabled" type="gboolean" readable="1" writable="1" construct="0" construct-only="1"/>
-			<property name="empty-text" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="local-only" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="model" type="HildonFileSystemModel*" readable="1" writable="1" construct="0" construct-only="1"/>
-			<property name="pane-position" type="gint" readable="1" writable="1" construct="1" construct-only="0"/>
-			<property name="safe-folder" type="GtkFilePath*" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="show-hidden" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="show-upnp" type="gboolean" readable="1" writable="1" construct="1" construct-only="0"/>
-			<property name="visible-columns" type="gint" readable="1" writable="1" construct="0" construct-only="1"/>
-			<signal name="content-pane-context-menu" when="LAST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonFileSelection*"/>
-				</parameters>
-			</signal>
-			<signal name="current-folder-changed" when="LAST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonFileSelection*"/>
-				</parameters>
-			</signal>
-			<signal name="file-activated" when="LAST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonFileSelection*"/>
-				</parameters>
-			</signal>
-			<signal name="location-insensitive" when="LAST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonFileSelection*"/>
-					<parameter name="iter" type="GtkTreeIter*"/>
-				</parameters>
-			</signal>
-			<signal name="navigation-pane-context-menu" when="LAST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonFileSelection*"/>
-				</parameters>
-			</signal>
-			<signal name="selection-changed" when="LAST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonFileSelection*"/>
-				</parameters>
-			</signal>
-			<signal name="uris-dropped" when="LAST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="HildonFileSelection*"/>
-					<parameter name="destination" type="char*"/>
-					<parameter name="sources" type="gpointer"/>
-				</parameters>
-			</signal>
-		</object>
-		<object name="HildonFileSystemModel" parent="GObject" type-name="HildonFileSystemModel" get-type="hildon_file_system_model_get_type">
-			<implements>
-				<interface name="GtkTreeModel"/>
-				<interface name="GtkTreeDragSource"/>
-			</implements>
-			<method name="autoname_uri" symbol="hildon_file_system_model_autoname_uri">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="model" type="HildonFileSystemModel*"/>
-					<parameter name="uri" type="gchar*"/>
-					<parameter name="error" type="GError**"/>
-				</parameters>
-			</method>
-			<method name="finished_loading" symbol="hildon_file_system_model_finished_loading">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="model" type="HildonFileSystemModel*"/>
-				</parameters>
-			</method>
-			<method name="iter_available" symbol="hildon_file_system_model_iter_available">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="model" type="HildonFileSystemModel*"/>
-					<parameter name="iter" type="GtkTreeIter*"/>
-					<parameter name="available" type="gboolean"/>
-				</parameters>
-			</method>
-			<method name="load_local_path" symbol="hildon_file_system_model_load_local_path">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="model" type="HildonFileSystemModel*"/>
-					<parameter name="path" type="gchar*"/>
-					<parameter name="iter" type="GtkTreeIter*"/>
-				</parameters>
-			</method>
-			<method name="load_path" symbol="hildon_file_system_model_load_path">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="model" type="HildonFileSystemModel*"/>
-					<parameter name="path" type="GtkFilePath*"/>
-					<parameter name="iter" type="GtkTreeIter*"/>
-				</parameters>
-			</method>
-			<method name="load_uri" symbol="hildon_file_system_model_load_uri">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="model" type="HildonFileSystemModel*"/>
-					<parameter name="uri" type="gchar*"/>
-					<parameter name="iter" type="GtkTreeIter*"/>
-				</parameters>
-			</method>
-			<constructor name="new_item" symbol="hildon_file_system_model_new_item">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="model" type="HildonFileSystemModel*"/>
-					<parameter name="parent" type="GtkTreeIter*"/>
-					<parameter name="stub_name" type="gchar*"/>
-					<parameter name="extension" type="gchar*"/>
-				</parameters>
-			</constructor>
-			<method name="reset_available" symbol="hildon_file_system_model_reset_available">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="model" type="HildonFileSystemModel*"/>
-				</parameters>
-			</method>
-			<method name="search_local_path" symbol="hildon_file_system_model_search_local_path">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="model" type="HildonFileSystemModel*"/>
-					<parameter name="path" type="gchar*"/>
-					<parameter name="iter" type="GtkTreeIter*"/>
-					<parameter name="start_iter" type="GtkTreeIter*"/>
-					<parameter name="recursive" type="gboolean"/>
-				</parameters>
-			</method>
-			<method name="search_path" symbol="hildon_file_system_model_search_path">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="model" type="HildonFileSystemModel*"/>
-					<parameter name="path" type="GtkFilePath*"/>
-					<parameter name="iter" type="GtkTreeIter*"/>
-					<parameter name="start_iter" type="GtkTreeIter*"/>
-					<parameter name="recursive" type="gboolean"/>
-				</parameters>
-			</method>
-			<method name="search_uri" symbol="hildon_file_system_model_search_uri">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="model" type="HildonFileSystemModel*"/>
-					<parameter name="uri" type="gchar*"/>
-					<parameter name="iter" type="GtkTreeIter*"/>
-					<parameter name="start_iter" type="GtkTreeIter*"/>
-					<parameter name="recursive" type="gboolean"/>
-				</parameters>
-			</method>
-			<property name="backend" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
-			<property name="backend-object" type="GtkFileSystem*" readable="1" writable="1" construct="0" construct-only="1"/>
-			<property name="multi-root" type="gboolean" readable="1" writable="1" construct="0" construct-only="1"/>
-			<property name="ref-widget" type="GtkWidget*" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="root-dir" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
-			<property name="thumbnail-callback" type="gpointer" readable="1" writable="1" construct="0" construct-only="0"/>
-			<signal name="device-disconnected" when="LAST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="model" type="HildonFileSystemModel*"/>
-					<parameter name="iter" type="GtkTreeIter*"/>
-				</parameters>
-			</signal>
-			<signal name="finished-loading" when="LAST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="model" type="HildonFileSystemModel*"/>
-					<parameter name="iter" type="GtkTreeIter*"/>
-				</parameters>
-			</signal>
-		</object>
-		<object name="HildonFileSystemStorageDialog" parent="GtkDialog" type-name="HildonFileSystemStorageDialog" get-type="hildon_file_system_storage_dialog_get_type">
-			<implements>
-				<interface name="AtkImplementor"/>
-				<interface name="GtkBuildable"/>
-			</implements>
-			<constructor name="new" symbol="hildon_file_system_storage_dialog_new">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="parent" type="GtkWindow*"/>
-					<parameter name="uri_str" type="gchar*"/>
-				</parameters>
-			</constructor>
-			<method name="set_uri" symbol="hildon_file_system_storage_dialog_set_uri">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="widget" type="GtkWidget*"/>
-					<parameter name="uri_str" type="gchar*"/>
-				</parameters>
-			</method>
-		</object>
-	</namespace>
-</api>
diff --git a/vapi/packages/hildon-fm-2/hildon-fm-2.metadata b/vapi/packages/hildon-fm-2/hildon-fm-2.metadata
deleted file mode 100644
index 9196dce22..000000000
--- a/vapi/packages/hildon-fm-2/hildon-fm-2.metadata
+++ /dev/null
@@ -1,31 +0,0 @@
-HildonFileSystemInfo cheader_filename="hildon/hildon-file-system-info.h"
-HildonFileSystemInfoHandle cheader_filename="hildon/hildon-file-system-info.h"
-HildonFileChooserDialog cheader_filename="hildon/hildon-file-chooser-dialog.h"
-HildonFileDetailsDialog cheader_filename="hildon/hildon-file-details-dialog.h"
-hildon_file_details_dialog_get_file_iter.iter is_out="1"
-HildonFileSelection cheader_filename="hildon/hildon-file-selection.h"
-HildonFileSystemModel cheader_filename="hildon/hildon-file-system-model.h"
-HildonFileSystemStorageDialog cheader_filename="hildon/hildon-file-system-storage-dialog.h"
-HildonFileSelectionMode cheader_filename="hildon/hildon-file-selection.h"
-HildonFileSelectionPane cheader_filename="hildon/hildon-file-selection.h"
-HildonFileSelectionSortKey cheader_filename="hildon/hildon-file-selection.h"
-HildonFileSelectionVisibleColumns cheader_filename="hildon/hildon-file-selection.h"
-HildonFileSystemInfoCallback cheader_filename="hildon/hildon-file-system-info.h"
-HildonFileSystemModelColumns cheader_filename="hildon/hildon-file-system-model.h"
-HildonFileSystemModelItemType cheader_filename="hildon/hildon-file-system-model.h"
-HildonFileSystemModelThumbnailCallback cheader_filename="hildon/hildon-file-system-model.h"
-hildon_file_system_model_finished_loading hidden="1"
-hildon_file_system_create_backend hidden="1"
-hildon_file_selection_get_current_folder hidden="1"
-hildon_file_selection_set_current_folder hidden="1"
-hildon_file_selection_select_path hidden="1"
-hildon_file_selection_unselect_path hidden="1"
-hildon_file_system_info_async_new.data hidden="1"
-hildon_file_system_model_load_path hidden="1"
-hildon_file_system_model_search_path hidden="1"
-hildon_file_chooser_dialog_selection_mode hidden="1"
-HildonFileSystemStorageDialogPriv hidden="1"
-HildonFileChooserDialogSelectionMode name="int"
-GtkFileSystem name="pointer"
-GtkFilePath name="pointer"
-
diff --git a/vapi/packages/hildon-fm-2/hildon-fm-2.namespace b/vapi/packages/hildon-fm-2/hildon-fm-2.namespace
deleted file mode 100644
index d297f6d9a..000000000
--- a/vapi/packages/hildon-fm-2/hildon-fm-2.namespace
+++ /dev/null
@@ -1 +0,0 @@
-Hildon