[Xfce4-commits] <xfce4-vala:xfce-4.6> Update bindings with Vala 0.10

Mike Massonnet noreply at xfce.org
Sun Oct 31 09:02:03 CET 2010


Updating branch refs/heads/xfce-4.6
         to 142e8592d2964d8a929a11c5f938bd21f9cb96ca (commit)
       from ddc41d565069caaa74567a3c3765f384bb9d7b1c (commit)

commit 142e8592d2964d8a929a11c5f938bd21f9cb96ca
Author: Mike Massonnet <mmassonnet at xfce.org>
Date:   Sun Oct 31 08:34:55 2010 +0100

    Update bindings with Vala 0.10

 packages/exo-0.3/exo-0.3-custom.vala               |    4 +-
 packages/exo-0.3/exo-0.3.gi                        |    2 +
 .../libxfce4menu-0.1/libxfce4menu-0.1-custom.vala  |    5 --
 packages/libxfce4menu-0.1/libxfce4menu-0.1.gi      |   22 +++-----
 .../libxfce4util-1.0/libxfce4util-1.0-custom.vala  |    4 +-
 packages/libxfce4util-1.0/libxfce4util-1.0.gi      |    6 ++
 .../libxfce4util-1.0/libxfce4util-1.0.metadata     |    1 +
 packages/libxfcegui4-1.0/libxfcegui4-1.0.gi        |    5 +-
 vapi/exo-0.3.vapi                                  |   51 +++++++++++---------
 vapi/libxfce4menu-0.1.vapi                         |   38 ++++++++------
 vapi/libxfce4util-1.0.vapi                         |    6 +-
 vapi/libxfcegui4-1.0.vapi                          |   10 ++--
 vapi/libxfconf-0.vapi                              |    8 ++--
 13 files changed, 86 insertions(+), 76 deletions(-)

diff --git a/packages/exo-0.3/exo-0.3-custom.vala b/packages/exo-0.3/exo-0.3-custom.vala
index b010988..e1d1ae9 100644
--- a/packages/exo-0.3/exo-0.3-custom.vala
+++ b/packages/exo-0.3/exo-0.3-custom.vala
@@ -68,9 +68,9 @@ namespace Exo {
 	[Compact]
 	public class String {
 		[CCode (cname = "exo_intern_static_string")]
-		public static weak string intern_static (string str);
+		public static unowned string intern_static (string str);
 		[CCode (cname = "exo_intern_string")]
-		public static weak string intern (string str);
+		public static unowned string intern (string str);
 		[CCode (cname = "exo_str_elide_underscores")]
 		public static string elide_underscores (string text);
 		[CCode (cname = "exo_str_is_equal")]
diff --git a/packages/exo-0.3/exo-0.3.gi b/packages/exo-0.3/exo-0.3.gi
index d18c894..b3c51c7 100644
--- a/packages/exo-0.3/exo-0.3.gi
+++ b/packages/exo-0.3/exo-0.3.gi
@@ -1018,6 +1018,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
+				<interface name="GtkOrientable"/>
 			</implements>
 			<method name="get_model" symbol="exo_toolbars_editor_get_model">
 				<return-type type="ExoToolbarsModel*"/>
@@ -1373,6 +1374,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
+				<interface name="GtkOrientable"/>
 			</implements>
 			<method name="get_editing" symbol="exo_toolbars_view_get_editing">
 				<return-type type="gboolean"/>
diff --git a/packages/libxfce4menu-0.1/libxfce4menu-0.1-custom.vala b/packages/libxfce4menu-0.1/libxfce4menu-0.1-custom.vala
index dc9a1e9..4506139 100644
--- a/packages/libxfce4menu-0.1/libxfce4menu-0.1-custom.vala
+++ b/packages/libxfce4menu-0.1/libxfce4menu-0.1-custom.vala
@@ -1,10 +1,5 @@
 namespace Xfce {
 
-	public class MenuItemCache {
-		/* Should be scanned by gen-introspect (bug?) */
-		public	unowned Xfce.MenuItem lookup (string filename, string desktop_id);
-	}
-
 	[Compact]
 	public class MenuMonitor {
 		public void* add_directory (string directory);
diff --git a/packages/libxfce4menu-0.1/libxfce4menu-0.1.gi b/packages/libxfce4menu-0.1/libxfce4menu-0.1.gi
index 1f39e77..17ec016 100644
--- a/packages/libxfce4menu-0.1/libxfce4menu-0.1.gi
+++ b/packages/libxfce4menu-0.1/libxfce4menu-0.1.gi
@@ -657,6 +657,14 @@
 					<parameter name="cache" type="XfceMenuItemCache*"/>
 				</parameters>
 			</method>
+			<method name="lookup" symbol="xfce_menu_item_cache_lookup">
+				<return-type type="XfceMenuItem*"/>
+				<parameters>
+					<parameter name="cache" type="XfceMenuItemCache*"/>
+					<parameter name="filename" type="gchar*"/>
+					<parameter name="desktop_id" type="gchar*"/>
+				</parameters>
+			</method>
 		</object>
 		<object name="XfceMenuItemPool" parent="GObject" type-name="XfceMenuItemPool" get-type="xfce_menu_item_pool_get_type">
 			<method name="apply_exclude_rule" symbol="xfce_menu_item_pool_apply_exclude_rule">
@@ -680,20 +688,6 @@
 					<parameter name="pool" type="XfceMenuItemPool*"/>
 				</parameters>
 			</method>
-			<method name="insert" symbol="xfce_menu_item_pool_insert">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="pool" type="XfceMenuItemPool*"/>
-					<parameter name="item" type="XfceMenuItem*"/>
-				</parameters>
-			</method>
-			<method name="lookup" symbol="xfce_menu_item_pool_lookup">
-				<return-type type="XfceMenuItem*"/>
-				<parameters>
-					<parameter name="pool" type="XfceMenuItemPool*"/>
-					<parameter name="desktop_id" type="gchar*"/>
-				</parameters>
-			</method>
 			<constructor name="new" symbol="xfce_menu_item_pool_new">
 				<return-type type="XfceMenuItemPool*"/>
 			</constructor>
diff --git a/packages/libxfce4util-1.0/libxfce4util-1.0-custom.vala b/packages/libxfce4util-1.0/libxfce4util-1.0-custom.vala
index d16d57f..4df5da9 100644
--- a/packages/libxfce4util-1.0/libxfce4util-1.0-custom.vala
+++ b/packages/libxfce4util-1.0/libxfce4util-1.0-custom.vala
@@ -38,8 +38,8 @@ namespace Xfce {
 	}
 
 	[CCode (cname = "xfce_version_string")]
-	public static weak string get_version_string ();
-	public static weak string get_license_text (Xfce.LicenseTextType type);
+	public static unowned string get_version_string ();
+	public static unowned string get_license_text (Xfce.LicenseTextType type);
 	public static void textdomain (string package, string localedir, string? encoding = null);
 
 }
diff --git a/packages/libxfce4util-1.0/libxfce4util-1.0.gi b/packages/libxfce4util-1.0/libxfce4util-1.0.gi
index 5548dd9..9c30525 100644
--- a/packages/libxfce4util-1.0/libxfce4util-1.0.gi
+++ b/packages/libxfce4util-1.0/libxfce4util-1.0.gi
@@ -1,6 +1,12 @@
 <?xml version="1.0"?>
 <api version="1.0">
 	<namespace name="Xfce">
+		<function name="get_license_text" symbol="xfce_get_license_text">
+			<return-type type="gchar*"/>
+			<parameters>
+				<parameter name="license_type" type="XfceLicenseTextType"/>
+			</parameters>
+		</function>
 		<struct name="XfceKiosk">
 			<method name="free" symbol="xfce_kiosk_free">
 				<return-type type="void"/>
diff --git a/packages/libxfce4util-1.0/libxfce4util-1.0.metadata b/packages/libxfce4util-1.0/libxfce4util-1.0.metadata
index 3af4719..b4bc4d5 100644
--- a/packages/libxfce4util-1.0/libxfce4util-1.0.metadata
+++ b/packages/libxfce4util-1.0/libxfce4util-1.0.metadata
@@ -3,3 +3,4 @@ Xfce cheader_filename="libxfce4util/libxfce4util.h"
 xfce_rc_simple_open hidden="1"
 xfce_rc_config_open hidden="1"
 xfce_rc_close hidden="1"
+xfce_get_license_text hidden="1"
diff --git a/packages/libxfcegui4-1.0/libxfcegui4-1.0.gi b/packages/libxfcegui4-1.0/libxfcegui4-1.0.gi
index 5526728..5172667 100644
--- a/packages/libxfcegui4-1.0/libxfcegui4-1.0.gi
+++ b/packages/libxfcegui4-1.0/libxfcegui4-1.0.gi
@@ -5,8 +5,9 @@
 		</struct>
 		<object name="XfceAppMenuItem" parent="GtkImageMenuItem" type-name="XfceAppMenuItem" get-type="xfce_app_menu_item_get_type">
 			<implements>
-				<interface name="GtkBuildable"/>
 				<interface name="AtkImplementor"/>
+				<interface name="GtkBuildable"/>
+				<interface name="GtkActivatable"/>
 			</implements>
 			<method name="get_command" symbol="xfce_app_menu_item_get_command">
 				<return-type type="gchar*"/>
@@ -127,8 +128,8 @@
 		</object>
 		<object name="XfceTitledDialog" parent="GtkDialog" type-name="XfceTitledDialog" get-type="xfce_titled_dialog_get_type">
 			<implements>
-				<interface name="GtkBuildable"/>
 				<interface name="AtkImplementor"/>
+				<interface name="GtkBuildable"/>
 			</implements>
 			<method name="get_subtitle" symbol="xfce_titled_dialog_get_subtitle">
 				<return-type type="gchar*"/>
diff --git a/vapi/exo-0.3.vapi b/vapi/exo-0.3.vapi
index 4c32a4a..3a193b6 100644
--- a/vapi/exo-0.3.vapi
+++ b/vapi/exo-0.3.vapi
@@ -1,4 +1,4 @@
-/* exo-0.3.vapi generated by vapigen, do not modify. */
+/* exo-0.3.vapi generated by vapigen-0.10, do not modify. */
 
 [CCode (cprefix = "Exo", lower_case_cprefix = "exo_")]
 namespace Exo {
@@ -6,9 +6,9 @@ namespace Exo {
 	[CCode (free_function = "", cheader_filename = "exo/exo.h")]
 	public class Binding {
 		[CCode (has_construct_function = false)]
-		public Binding.full (GLib.Object src_object, string src_property, GLib.Object dst_object, string dst_property, Exo.BindingTransform transform, GLib.DestroyNotify destroy_notify);
-		[CCode (has_construct_function = false)]
 		public Binding (GLib.Object src_object, string src_property, GLib.Object dst_object, string dst_property);
+		[CCode (has_construct_function = false)]
+		public Binding.full (GLib.Object src_object, string src_property, GLib.Object dst_object, string dst_property, Exo.BindingTransform transform, GLib.DestroyNotify destroy_notify);
 		public void unbind ();
 		[CCode (has_construct_function = false)]
 		public Binding.with_negation (GLib.Object src_object, string src_property, GLib.Object dst_object, string dst_property);
@@ -56,14 +56,14 @@ namespace Exo {
 	}
 	[CCode (cheader_filename = "exo/exo.h")]
 	public class IconBar : Gtk.Container, Atk.Implementor, Gtk.Buildable {
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public IconBar ();
 		public int get_active ();
 		public bool get_active_iter (Gtk.TreeIter iter);
 		public unowned Gtk.TreeModel get_model ();
 		public Gtk.Orientation get_orientation ();
 		public int get_pixbuf_column ();
 		public int get_text_column ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public IconBar ();
 		public void set_active (int index);
 		public void set_active_iter (Gtk.TreeIter iter);
 		public void set_model (Gtk.TreeModel model);
@@ -82,13 +82,15 @@ namespace Exo {
 	}
 	[CCode (cheader_filename = "exo/exo.h")]
 	public class IconChooserDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
-		public unowned string get_icon ();
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public IconChooserDialog (string title, Gtk.Window parent, ...);
+		public unowned string get_icon ();
 		public bool set_icon (string icon);
 	}
 	[CCode (cheader_filename = "exo/exo.h")]
 	public class IconView : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.CellLayout {
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public IconView ();
 		public unowned Gdk.Pixmap create_drag_icon (Gtk.TreePath path);
 		public void enable_model_drag_dest (Gtk.TargetEntry[] targets, Gdk.DragAction actions);
 		public void enable_model_drag_source (Gdk.ModifierType start_button_mask, Gtk.TargetEntry[] targets, Gdk.DragAction actions);
@@ -119,8 +121,6 @@ namespace Exo {
 		public int get_spacing ();
 		public bool get_visible_range (out unowned Gtk.TreePath start_path, out unowned Gtk.TreePath end_path);
 		public void icon_to_widget_coords (int ix, int iy, int wx, int wy);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public IconView ();
 		public bool path_is_selected (Gtk.TreePath path);
 		public void scroll_to_path (Gtk.TreePath path, bool use_align, float row_align, float col_align);
 		public void select_all ();
@@ -220,9 +220,9 @@ namespace Exo {
 	[CCode (free_function = "", cheader_filename = "exo/exo.h")]
 	public class MutualBinding {
 		[CCode (has_construct_function = false)]
-		public MutualBinding.full (GLib.Object object1, string property1, GLib.Object object2, string property2, Exo.BindingTransform transform, Exo.BindingTransform reverse_transform, GLib.DestroyNotify destroy_notify);
-		[CCode (has_construct_function = false)]
 		public MutualBinding (GLib.Object object1, string property1, GLib.Object object2, string property2);
+		[CCode (has_construct_function = false)]
+		public MutualBinding.full (GLib.Object object1, string property1, GLib.Object object2, string property2, Exo.BindingTransform transform, Exo.BindingTransform reverse_transform, GLib.DestroyNotify destroy_notify);
 		public void unbind ();
 		[CCode (has_construct_function = false)]
 		public MutualBinding.with_negation (GLib.Object object1, string property1, GLib.Object object2, string property2);
@@ -246,11 +246,11 @@ namespace Exo {
 		public static string replace (string str, string pattern, string replacement);
 	}
 	[CCode (cheader_filename = "exo/exo.h")]
-	public class ToolbarsEditor : Gtk.VBox, Atk.Implementor, Gtk.Buildable {
-		public unowned Exo.ToolbarsModel get_model ();
-		public unowned Gtk.UIManager get_ui_manager ();
+	public class ToolbarsEditor : Gtk.VBox, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public ToolbarsEditor (Gtk.UIManager ui_manager);
+		public unowned Exo.ToolbarsModel get_model ();
+		public unowned Gtk.UIManager get_ui_manager ();
 		public void set_model (Exo.ToolbarsModel model);
 		public void set_ui_manager (Gtk.UIManager ui_manager);
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
@@ -260,11 +260,15 @@ namespace Exo {
 	}
 	[CCode (cheader_filename = "exo/exo.h")]
 	public class ToolbarsEditorDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
+		[CCode (has_construct_function = false)]
+		protected ToolbarsEditorDialog ();
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public ToolbarsEditorDialog.with_model (Gtk.UIManager ui_manager, Exo.ToolbarsModel model);
 	}
 	[CCode (cheader_filename = "exo/exo.h")]
 	public class ToolbarsModel : GLib.Object {
+		[CCode (has_construct_function = false)]
+		public ToolbarsModel ();
 		public virtual bool add_item (int toolbar_position, int item_position, string id, string type);
 		public void add_separator (int toolbar_position, int item_position);
 		public int add_toolbar (int toolbar_position, string name);
@@ -279,8 +283,6 @@ namespace Exo {
 		public void move_item (int toolbar_position, int item_position, int new_toolbar_position, int new_item_position);
 		public int n_items (int toolbar_position);
 		public int n_toolbars ();
-		[CCode (has_construct_function = false)]
-		public ToolbarsModel ();
 		public void remove_item (int toolbar_position, int item_position);
 		public void remove_toolbar (int toolbar_position);
 		public bool save_to_file (string filename) throws GLib.Error;
@@ -299,12 +301,12 @@ namespace Exo {
 		public virtual signal void toolbar_removed (int toolbar_position);
 	}
 	[CCode (cheader_filename = "exo/exo.h")]
-	public class ToolbarsView : Gtk.VBox, Atk.Implementor, Gtk.Buildable {
+	public class ToolbarsView : Gtk.VBox, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public ToolbarsView (Gtk.UIManager ui_manager);
 		public bool get_editing ();
 		public unowned Exo.ToolbarsModel get_model ();
 		public unowned Gtk.UIManager get_ui_manager ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public ToolbarsView (Gtk.UIManager ui_manager);
 		public void set_editing (bool editing);
 		public void set_model (Exo.ToolbarsModel model);
 		public void set_ui_manager (Gtk.UIManager ui_manager);
@@ -318,10 +320,10 @@ namespace Exo {
 	}
 	[CCode (cheader_filename = "exo/exo.h")]
 	public class TreeView : Gtk.TreeView, Atk.Implementor, Gtk.Buildable {
-		public bool get_single_click ();
-		public uint get_single_click_timeout ();
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public TreeView ();
+		public bool get_single_click ();
+		public uint get_single_click_timeout ();
 		public void set_single_click (bool single_click);
 		public void set_single_click_timeout (uint single_click_timeout);
 		public bool single_click { get; set; }
@@ -336,11 +338,11 @@ namespace Exo {
 	}
 	[CCode (cheader_filename = "exo/exo.h")]
 	public class WrapTable : Gtk.Container, Atk.Implementor, Gtk.Buildable {
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public WrapTable (bool homogeneous);
 		public uint get_col_spacing ();
 		public bool get_homogeneous ();
 		public uint get_row_spacing ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public WrapTable (bool homogeneous);
 		public void set_col_spacing (uint col_spacing);
 		public void set_homogeneous (bool homogeneous);
 		public void set_row_spacing (uint row_spacing);
@@ -351,8 +353,11 @@ namespace Exo {
 	[CCode (cheader_filename = "exo/exo.h")]
 	public class XsessionClient : GLib.Object {
 		[CCode (has_construct_function = false)]
+		protected XsessionClient ();
+		[CCode (has_construct_function = false)]
 		public XsessionClient.with_group (Gdk.Window leader);
 		public Gdk.Window group { get; set; }
+		[CCode (array_length = false, array_null_terminated = true)]
 		public string[] restart_command { get; set; }
 		public virtual signal void save_yourself ();
 	}
@@ -375,7 +380,7 @@ namespace Exo {
 	public enum MountPointFlags {
 		READ_ONLY
 	}
-	[CCode (cprefix = "EXO_MOUNT_POINT_MATCH_", has_type_id = "0", cheader_filename = "exo/exo.h")]
+	[CCode (cprefix = "EXO_MOUNT_POINT_MATCH_", has_type_id = false, cheader_filename = "exo/exo.h")]
 	public enum MountPointMatchMask {
 		ACTIVE,
 		CONFIGURED,
diff --git a/vapi/libxfce4menu-0.1.vapi b/vapi/libxfce4menu-0.1.vapi
index 4bf7a55..034dbb1 100644
--- a/vapi/libxfce4menu-0.1.vapi
+++ b/vapi/libxfce4menu-0.1.vapi
@@ -1,9 +1,11 @@
-/* libxfce4menu-0.1.vapi generated by vapigen, do not modify. */
+/* libxfce4menu-0.1.vapi generated by vapigen-0.10, do not modify. */
 
 [CCode (cprefix = "Xfce", lower_case_cprefix = "xfce_")]
 namespace Xfce {
 	[CCode (cheader_filename = "libxfce4menu/libxfce4menu.h")]
 	public class Menu : GLib.Object, Xfce.MenuElement {
+		[CCode (has_construct_function = false)]
+		public Menu (string filename) throws GLib.Error;
 		public void add_menu (Xfce.Menu submenu);
 		public unowned GLib.SList get_app_dirs ();
 		public bool get_deleted ();
@@ -20,8 +22,6 @@ namespace Xfce {
 		public unowned Xfce.Menu get_parent ();
 		public static unowned Xfce.Menu get_root () throws GLib.Error;
 		public bool has_layout ();
-		[CCode (has_construct_function = false)]
-		public Menu (string filename) throws GLib.Error;
 		public void set_deleted (bool deleted);
 		public void set_directory (Xfce.MenuDirectory directory);
 		public void set_filename (string filename);
@@ -43,6 +43,8 @@ namespace Xfce {
 	}
 	[CCode (cheader_filename = "libxfce4menu/libxfce4menu.h")]
 	public class MenuDirectory : GLib.Object {
+		[CCode (has_construct_function = false)]
+		protected MenuDirectory ();
 		public unowned string get_comment ();
 		public unowned string get_filename ();
 		public bool get_hidden ();
@@ -62,6 +64,8 @@ namespace Xfce {
 	}
 	[CCode (cheader_filename = "libxfce4menu/libxfce4menu.h")]
 	public class MenuItem : GLib.Object, Xfce.MenuElement {
+		[CCode (has_construct_function = false)]
+		public MenuItem (string filename);
 		public void decrement_allocated ();
 		public int get_allocated ();
 		public unowned GLib.List get_categories ();
@@ -75,8 +79,6 @@ namespace Xfce {
 		public unowned string get_try_exec ();
 		public bool has_category (string category);
 		public void increment_allocated ();
-		[CCode (has_construct_function = false)]
-		public MenuItem (string filename);
 		public bool only_show_in_environment ();
 		public bool requires_terminal ();
 		public void set_categories (GLib.List categories);
@@ -97,6 +99,8 @@ namespace Xfce {
 	}
 	[CCode (cheader_filename = "libxfce4menu/libxfce4menu.h")]
 	public class MenuItemCache : GLib.Object {
+		[CCode (has_construct_function = false)]
+		protected MenuItemCache ();
 		public void @foreach (GLib.HFunc func);
 		public static unowned Xfce.MenuItemCache get_default ();
 		public void invalidate ();
@@ -112,13 +116,11 @@ namespace Xfce {
 	}
 	[CCode (cheader_filename = "libxfce4menu/libxfce4menu.h")]
 	public class MenuItemPool : GLib.Object {
+		[CCode (has_construct_function = false)]
+		public MenuItemPool ();
 		public void apply_exclude_rule (Xfce.MenuStandardRules rule);
 		public void @foreach (GLib.HFunc func);
 		public bool get_empty ();
-		public void insert (Xfce.MenuItem item);
-		public unowned Xfce.MenuItem lookup (string desktop_id);
-		[CCode (has_construct_function = false)]
-		public MenuItemPool ();
 	}
 	[Compact]
 	[CCode (cheader_filename = "libxfce4menu/libxfce4menu.h")]
@@ -126,6 +128,8 @@ namespace Xfce {
 	}
 	[CCode (cheader_filename = "libxfce4menu/libxfce4menu.h")]
 	public class MenuLayout : GLib.Object {
+		[CCode (has_construct_function = false)]
+		public MenuLayout ();
 		public void add_filename (string filename);
 		public void add_menuname (string menuname);
 		public void add_merge (Xfce.MenuLayoutMergeType type);
@@ -133,8 +137,6 @@ namespace Xfce {
 		public bool get_filename_used (string filename);
 		public bool get_menuname_used (string menuname);
 		public unowned GLib.SList get_nodes ();
-		[CCode (has_construct_function = false)]
-		public MenuLayout ();
 	}
 	[Compact]
 	[CCode (cheader_filename = "libxfce4menu/libxfce4menu.h")]
@@ -170,10 +172,10 @@ namespace Xfce {
 	}
 	[CCode (cheader_filename = "libxfce4menu/libxfce4menu.h")]
 	public class MenuMove : GLib.Object {
-		public unowned string get_new ();
-		public unowned string get_old ();
 		[CCode (has_construct_function = false)]
 		public MenuMove ();
+		public unowned string get_new ();
+		public unowned string get_old ();
 		public void set_new (string @new);
 		public void set_old (string old);
 	}
@@ -201,6 +203,8 @@ namespace Xfce {
 	}
 	[CCode (cheader_filename = "libxfce4menu/libxfce4menu.h")]
 	public class MenuSeparator : GLib.Object, Xfce.MenuElement {
+		[CCode (has_construct_function = false)]
+		protected MenuSeparator ();
 		public static unowned Xfce.MenuSeparator get_default ();
 	}
 	[Compact]
@@ -214,6 +218,8 @@ namespace Xfce {
 		public weak GLib.List filenames;
 		public bool include;
 		public weak GLib.List rules;
+		[CCode (has_construct_function = false)]
+		protected MenuStandardRules ();
 		public bool get_include ();
 		public void set_include (bool include);
 	}
@@ -234,13 +240,13 @@ namespace Xfce {
 		public abstract void add_rules (Xfce.MenuRules additional_rules);
 		public abstract bool match (Xfce.MenuItem item);
 	}
-	[CCode (cprefix = "XFCE_MENU_LAYOUT_MERGE_", has_type_id = "0", cheader_filename = "libxfce4menu/libxfce4menu.h")]
+	[CCode (cprefix = "XFCE_MENU_LAYOUT_MERGE_", has_type_id = false, cheader_filename = "libxfce4menu/libxfce4menu.h")]
 	public enum MenuLayoutMergeType {
 		MENUS,
 		FILES,
 		ALL
 	}
-	[CCode (cprefix = "XFCE_MENU_LAYOUT_NODE_", has_type_id = "0", cheader_filename = "libxfce4menu/libxfce4menu.h")]
+	[CCode (cprefix = "XFCE_MENU_LAYOUT_NODE_", has_type_id = false, cheader_filename = "libxfce4menu/libxfce4menu.h")]
 	public enum MenuLayoutNodeType {
 		INVALID,
 		FILENAME,
@@ -248,7 +254,7 @@ namespace Xfce {
 		SEPARATOR,
 		MERGE
 	}
-	[CCode (cprefix = "XFCE_MENU_MONITOR_", has_type_id = "0", cheader_filename = "libxfce4menu/libxfce4menu.h")]
+	[CCode (cprefix = "XFCE_MENU_MONITOR_", has_type_id = false, cheader_filename = "libxfce4menu/libxfce4menu.h")]
 	public enum MenuMonitorFlags {
 		DIRECTORIES,
 		MENU_FILES,
diff --git a/vapi/libxfce4util-1.0.vapi b/vapi/libxfce4util-1.0.vapi
index 78075bc..0659347 100644
--- a/vapi/libxfce4util-1.0.vapi
+++ b/vapi/libxfce4util-1.0.vapi
@@ -1,4 +1,4 @@
-/* libxfce4util-1.0.vapi generated by vapigen, do not modify. */
+/* libxfce4util-1.0.vapi generated by vapigen-0.10, do not modify. */
 
 [CCode (cprefix = "Xfce", lower_case_cprefix = "xfce_")]
 namespace Xfce {
@@ -22,6 +22,8 @@ namespace Xfce {
 	[Compact]
 	[CCode (free_function = "xfce_rc_close", cheader_filename = "libxfce4util/libxfce4util.h")]
 	public class Rc {
+		[CCode (cname = "xfce_rc_simple_open", has_construct_function = false)]
+		public Rc (string filename, bool readonly);
 		public void delete_entry (string key, bool global);
 		public void delete_group (string group, bool global);
 		public void flush ();
@@ -35,8 +37,6 @@ namespace Xfce {
 		public bool has_group (string group);
 		public bool is_dirty ();
 		public bool is_readonly ();
-		[CCode (cname = "xfce_rc_simple_open", has_construct_function = false)]
-		public Rc (string filename, bool readonly);
 		public bool read_bool_entry (string key, bool fallback);
 		public unowned string read_entry (string key, string fallback);
 		public unowned string read_entry_untranslated (string key, string fallback);
diff --git a/vapi/libxfcegui4-1.0.vapi b/vapi/libxfcegui4-1.0.vapi
index 8cde8bc..56aada0 100644
--- a/vapi/libxfcegui4-1.0.vapi
+++ b/vapi/libxfcegui4-1.0.vapi
@@ -1,13 +1,13 @@
-/* libxfcegui4-1.0.vapi generated by vapigen, do not modify. */
+/* libxfcegui4-1.0.vapi generated by vapigen-0.10, do not modify. */
 
 [CCode (cprefix = "Xfce", lower_case_cprefix = "xfce_")]
 namespace Xfce {
 	[CCode (cheader_filename = "libxfcegui4/libxfcegui4.h")]
-	public class AppMenuItem : Gtk.ImageMenuItem, Gtk.Buildable, Atk.Implementor {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public AppMenuItem.full (string label, string command, string icon_filename, bool needs_term, bool snotify);
+	public class AppMenuItem : Gtk.ImageMenuItem, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public AppMenuItem ();
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public AppMenuItem.full (string label, string command, string icon_filename, bool needs_term, bool snotify);
 		public static void set_icon_theme_name (string theme_name);
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public AppMenuItem.with_command (string label, string command);
@@ -76,7 +76,7 @@ namespace Xfce {
 		public static string lookup (string name, int size);
 	}
 	[CCode (cheader_filename = "libxfcegui4/libxfcegui4.h")]
-	public class TitledDialog : Gtk.Dialog, Gtk.Buildable, Atk.Implementor {
+	public class TitledDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public TitledDialog ();
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
diff --git a/vapi/libxfconf-0.vapi b/vapi/libxfconf-0.vapi
index 497debe..0e255fe 100644
--- a/vapi/libxfconf-0.vapi
+++ b/vapi/libxfconf-0.vapi
@@ -1,9 +1,11 @@
-/* libxfconf-0.vapi generated by vapigen, do not modify. */
+/* libxfconf-0.vapi generated by vapigen-0.10, do not modify. */
 
 [CCode (cprefix = "Xfconf", lower_case_cprefix = "xfconf_")]
 namespace Xfconf {
 	[CCode (cheader_filename = "xfconf/xfconf.h")]
 	public class Channel : GLib.Object {
+		[CCode (has_construct_function = false)]
+		public Channel (string channel_name);
 		public static unowned Xfconf.Channel @get (string channel_name);
 		[CCode (sentinel = "G_TYPE_INVALID")]
 		public bool get_array (string property, ...);
@@ -23,8 +25,6 @@ namespace Xfconf {
 		public uint64 get_uint64 (string property, uint64 default_value);
 		public bool has_property (string property);
 		public bool is_property_locked (string property);
-		[CCode (has_construct_function = false)]
-		public Channel (string channel_name);
 		public void reset_property (string property_base, bool recursive);
 		[CCode (sentinel = "G_TYPE_INVALID")]
 		public bool set_array (string property, ...);
@@ -72,7 +72,7 @@ namespace Xfconf {
 		INVALID_CHANNEL,
 	}
 	[CCode (cheader_filename = "xfconf/xfconf.h")]
-	public static void array_free (GLib.PtrArray arr);
+	public static void array_free (GLib.GenericArray arr);
 	[CCode (cheader_filename = "xfconf/xfconf.h")]
 	public static bool init () throws Xfconf.Error;
 	[CCode (cheader_filename = "xfconf/xfconf.h", array_length = false)]



More information about the Xfce4-commits mailing list