[Xfce4-commits] <xfce4-vala:master> Update bindings to Xfce 4.7

Mike Massonnet noreply at xfce.org
Mon Dec 21 19:26:01 CET 2009


Updating branch refs/heads/master
         to 81c695feb1db96166c5d4be1076ea9927b3c95d3 (commit)
       from c360d1807f6db61b2de738cbcb9a969bbc42eca7 (commit)

commit 81c695feb1db96166c5d4be1076ea9927b3c95d3
Author: Mike Massonnet <mmassonnet at xfce.org>
Date:   Sun Jun 14 20:47:43 2009 +0200

    Update bindings to Xfce 4.7

 Makefile.am                                        |   26 +-
 configure.ac.in                                    |   13 +-
 examples/panel-plugin/button.desktop               |    9 +-
 examples/panel-plugin/button.vala                  |   37 -
 packages/exo-0.3/exo-0.3-custom.vala               |   99 --
 packages/exo-0.3/exo-0.3.deps                      |    7 -
 packages/exo-0.3/exo-0.3.excludes                  |    9 -
 packages/exo-0.3/exo-0.3.files                     |    2 -
 packages/exo-1/exo-1-custom.vala                   |   55 ++
 .../exo-0.3.defines => exo-1/exo-1.defines}        |    0
 .../libxfcegui4-1.0.deps => exo-1/exo-1.deps}      |    0
 packages/exo-1/exo-1.excludes                      |    9 +
 packages/exo-1/exo-1.files                         |    2 +
 packages/{exo-0.3/exo-0.3.gi => exo-1/exo-1.gi}    |  262 +++---
 .../exo-0.3.metadata => exo-1/exo-1.metadata}      |   14 +-
 .../exo-0.3.namespace => exo-1/exo-1.namespace}    |    0
 .../libxfce4menu-0.1/libxfce4menu-0.1-custom.vala  |   26 -
 packages/libxfce4menu-0.1/libxfce4menu-0.1.defines |    1 -
 .../libxfce4menu-0.1/libxfce4menu-0.1.excludes     |    1 -
 packages/libxfce4menu-0.1/libxfce4menu-0.1.files   |    2 -
 packages/libxfce4menu-0.1/libxfce4menu-0.1.gi      |  937 --------------------
 .../libxfce4menu-0.1/libxfce4menu-0.1.metadata     |   50 -
 .../libxfce4panel-1.0-custom.vala                  |    6 +
 .../libxfce4panel-1.0/libxfce4panel-1.0.defines    |    1 +
 .../libxfce4panel-1.0/libxfce4panel-1.0.deps       |    0
 .../libxfce4panel-1.0/libxfce4panel-1.0.excludes   |    5 +
 packages/libxfce4panel-1.0/libxfce4panel-1.0.files |    2 +
 packages/libxfce4panel-1.0/libxfce4panel-1.0.gi    |  394 ++++++++
 .../libxfce4panel-1.0/libxfce4panel-1.0.metadata   |   15 +
 .../libxfce4panel-1.0.namespace}                   |    0
 packages/libxfce4ui-1/libxfce4ui-1.defines         |    1 +
 .../libxfce4ui-1.deps}                             |    0
 packages/libxfce4ui-1/libxfce4ui-1.excludes        |    1 +
 packages/libxfce4ui-1/libxfce4ui-1.files           |    2 +
 packages/libxfce4ui-1/libxfce4ui-1.gi              |  401 +++++++++
 packages/libxfce4ui-1/libxfce4ui-1.metadata        |    3 +
 .../libxfce4ui-1.namespace}                        |    0
 .../libxfce4util-1.0/libxfce4util-1.0-custom.vala  |    2 +-
 .../libxfcegui4-1.0/libxfcegui4-1.0-custom.vala    |   74 --
 packages/libxfcegui4-1.0/libxfcegui4-1.0.defines   |    1 -
 packages/libxfcegui4-1.0/libxfcegui4-1.0.files     |    3 -
 packages/libxfcegui4-1.0/libxfcegui4-1.0.gi        |  179 ----
 packages/libxfcegui4-1.0/libxfcegui4-1.0.metadata  |   25 -
 packages/libxfconf-0/libxfconf-0.gi                |    1 +
 tests/{exo-0.3.vala => exo-1.vala}                 |    0
 tests/libxfce4menu-0.1.vala                        |   97 --
 tests/libxfcegui4-1.0.vala                         |   27 -
 vapi/exo-0.3.deps                                  |    7 -
 .../libxfcegui4-1.0.deps => vapi/exo-1.deps        |    0
 vapi/{exo-0.3.vapi => exo-1.vapi}                  |  135 ++--
 vapi/libxfce4menu-0.1.vapi                         |  266 ------
 vapi/libxfce4panel-1.0.deps                        |    1 -
 vapi/libxfce4panel-1.0.vapi                        |  219 ++---
 .../libxfcegui4-1.0.deps => vapi/libxfce4ui-1.deps |    0
 vapi/libxfce4ui-1.vapi                             |  119 +++
 vapi/libxfce4util-1.0.vapi                         |    6 +-
 vapi/libxfcegui4-1.0.vapi                          |   94 --
 vapi/libxfconf-0.vapi                              |    6 +-
 58 files changed, 1313 insertions(+), 2341 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index e9c875d..9e3086e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,9 +3,9 @@ NULL =
 if MAINTAINER_MODE
 update-gi:
 	$(VALAGI) $(LIBXFCE4UTIL) packages/$(LIBXFCE4UTIL)
-	$(VALAGI) $(LIBXFCE4MENU) packages/$(LIBXFCE4MENU)
 	$(VALAGI) $(XFCONF) packages/$(XFCONF)
-	$(VALAGI) $(LIBXFCEGUI4) packages/$(LIBXFCEGUI4)
+	$(VALAGI) $(LIBXFCE4UI) packages/$(LIBXFCE4UI)
+	$(VALAGI) $(LIBXFCE4PANEL) packages/$(LIBXFCE4PANEL)
 	$(VALAGI) $(EXO) packages/$(EXO)
 
 update-vapi:
@@ -13,15 +13,14 @@ update-vapi:
 	$(VAPIGEN) --vapidir=. --library $(LIBXFCE4UTIL)\
 		../packages/$(LIBXFCE4UTIL)/$(LIBXFCE4UTIL).gi\
 		../packages/$(LIBXFCE4UTIL)/$(LIBXFCE4UTIL)-custom.vala;\
-	$(VAPIGEN) --vapidir=. --library $(LIBXFCE4MENU)\
-		../packages/$(LIBXFCE4MENU)/$(LIBXFCE4MENU).gi\
-		../packages/$(LIBXFCE4MENU)/$(LIBXFCE4MENU)-custom.vala;\
 	$(VAPIGEN) --vapidir=. --library $(XFCONF)\
 		../packages/$(XFCONF)/$(XFCONF).gi\
 		../packages/$(XFCONF)/$(XFCONF)-custom.vala;\
-	$(VAPIGEN) --vapidir=. --library $(LIBXFCEGUI4)\
-		../packages/$(LIBXFCEGUI4)/$(LIBXFCEGUI4).gi\
-		../packages/$(LIBXFCEGUI4)/$(LIBXFCEGUI4)-custom.vala;\
+	$(VAPIGEN) --vapidir=. --library $(LIBXFCE4UI)\
+		../packages/$(LIBXFCE4UI)/$(LIBXFCE4UI).gi;\
+	$(VAPIGEN) --vapidir=. --library $(LIBXFCE4PANEL)\
+		../packages/$(LIBXFCE4PANEL)/$(LIBXFCE4PANEL).gi\
+		../packages/$(LIBXFCE4PANEL)/$(LIBXFCE4PANEL)-custom.vala;\
 	$(VAPIGEN) --vapidir=. --library $(EXO)\
 		../packages/$(EXO)/$(EXO).gi\
 		../packages/$(EXO)/$(EXO)-custom.vala;\
@@ -33,19 +32,16 @@ tests: tests.stamp
 tests.stamp:
 	(cd tests;\
 	$(VALAC) --pkg=$(LIBXFCE4UTIL) --vapidir=../vapi $(LIBXFCE4UTIL).vala;\
-	$(VALAC) --pkg=gtk+-2.0 --pkg=$(LIBXFCE4MENU) --vapidir=../vapi $(LIBXFCE4MENU).vala;\
 	$(VALAC) --pkg=$(XFCONF) --vapidir=../vapi $(XFCONF).vala;\
-	$(VALAC) --pkg=$(LIBXFCEGUI4) --vapidir=../vapi $(LIBXFCEGUI4).vala;\
 	$(VALAC) --pkg=$(EXO) --vapidir=../vapi $(EXO).vala;\
 	)
 	touch $@
 
 vapi_DATA =								\
 	vapi/$(LIBXFCE4UTIL).vapi					\
-	vapi/$(LIBXFCE4MENU).vapi					\
 	vapi/$(XFCONF).vapi						\
-	vapi/$(LIBXFCEGUI4).vapi					\
-	vapi/$(LIBXFCEGUI4).deps					\
+	vapi/$(LIBXFCE4UI).vapi						\
+	vapi/$(LIBXFCE4UI).deps						\
 	vapi/$(LIBXFCE4PANEL).vapi					\
 	vapi/$(LIBXFCE4PANEL).deps					\
 	vapi/$(EXO).vapi						\
@@ -66,9 +62,7 @@ EXTRA_DIST =								\
 	packages							\
 	vapi								\
 	tests/$(LIBXFCE4UTIL).vala					\
-	tests/$(LIBXFCE4MENU).vala					\
 	tests/$(XFCONF).vala						\
-	tests/$(LIBXFCEGUI4).vala					\
 	tests/$(EXO).vala						\
 	$(NULL)
 
@@ -76,9 +70,7 @@ CLEANFILES =								\
 	tests.stamp							\
 	tests/$(LIBXFCE4UTIL)						\
 	tests/rcfile.rc							\
-	tests/$(LIBXFCE4MENU)						\
 	tests/$(XFCONF)							\
-	tests/$(LIBXFCEGUI4)						\
 	tests/$(EXO)							\
 	$(NULL)
 
diff --git a/configure.ac.in b/configure.ac.in
index 56daa8c..ed8f06b 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -6,7 +6,7 @@ dnl
 
 dnl Version information
 m4_define([project_version_major], [4])
-m4_define([project_version_minor], [6])
+m4_define([project_version_minor], [7])
 m4_define([project_version_micro], [0])
 m4_define([project_version_build], [@REVISION@])
 m4_define([project_version_tag], []) # leave empty for release
@@ -21,12 +21,11 @@ dnl Check for basic programs
 AC_PROG_INSTALL()
 
 dnl Check for required packages
-M8T_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.6.0])
-M8T_CHECK_PACKAGE([LIBXFCE4MENU], [libxfce4menu-0.1], [4.6.0])
-M8T_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.6.0])
-M8T_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.6.0])
-M8T_CHECK_PACKAGE([EXO], [exo-0.3], [0.3.100])
-M8T_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.6.0])
+M8T_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.7.0])
+M8T_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.7.0])
+M8T_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.7.0])
+M8T_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.7.0])
+M8T_CHECK_PACKAGE([EXO], [exo-1], [0.5])
 
 dnl Check for Vala
 M8T_CHECK_VALA([0.7.1])
diff --git a/examples/panel-plugin/button.desktop b/examples/panel-plugin/button.desktop
index 3c094de..8b13789 100644
--- a/examples/panel-plugin/button.desktop
+++ b/examples/panel-plugin/button.desktop
@@ -1,8 +1 @@
-[Xfce Panel]
-Type=X-XFCE-PanelPlugin
-Encoding=UTF-8
-Name=Button
-Comment=Vala test plugin
-Icon=xfce4_xicon
-X-XFCE-Exec=/home/mmassonnet/Développement/xfce4-vala/tests/panel-plugin/button
-X-XFCE-Unique=false
+
diff --git a/examples/panel-plugin/button.vala b/examples/panel-plugin/button.vala
index c6335b1..8b13789 100644
--- a/examples/panel-plugin/button.vala
+++ b/examples/panel-plugin/button.vala
@@ -1,38 +1 @@
-// build with valac --pkg=libxfce4panel-1.0 button.vala 
-using Xfce;
-using Gtk;
 
-public class TestPlugin : GLib.Object {
-
-    private Xfce.PanelPlugin panel_plugin;
-    private Gtk.Button button;
-
-    public TestPlugin (Xfce.PanelPlugin panel_plugin) {
-        this.panel_plugin = panel_plugin;
-	button = Xfce.create_panel_button ();
-        button.set_label ("Hello World!");
-        button.show ();
-        panel_plugin.add (button);
-        panel_plugin.add_action_widget (button);
-
-        button.clicked.connect ((button) => {
-                var dialog = new Gtk.MessageDialog ((Gtk.Window)button.get_toplevel (),
-                        Gtk.DialogFlags.DESTROY_WITH_PARENT, Gtk.MessageType.INFO, Gtk.ButtonsType.OK,
-                        "Hello World!");
-                dialog.run ();
-                dialog.destroy ();
-            });
-    }
-
-    static TestPlugin plugin;
-    public static void register (Xfce.PanelPlugin panel_plugin) {
-        plugin = new TestPlugin (panel_plugin);
-        panel_plugin.size_changed += (panel_plugin, size) => {
-            panel_plugin.set_size_request (-1, -1);
-        };
-    }
-
-    public static int main (string[] args) {
-        return Xfce.PanelPluginRegisterExternal (ref args, TestPlugin.register);
-    }
-}
diff --git a/packages/exo-0.3/exo-0.3-custom.vala b/packages/exo-0.3/exo-0.3-custom.vala
deleted file mode 100644
index b010988..0000000
--- a/packages/exo-0.3/exo-0.3-custom.vala
+++ /dev/null
@@ -1,99 +0,0 @@
-namespace Exo {
-
-	[Compact]
-	[CCode (free_function = "")]
-	public class Binding {
-	}
-
-	[Compact]
-	[CCode (free_function = "")]
-	public class MutualBinding {
-	}
-
-	/* exo-gdk-pixbuf-extensions.h exo-gobject-extensions.h exo-gtk-extensions.h exo-pango-extensions.h */
-	[Compact]
-	public class Extensions {
-		public static Gdk.Pixbuf gdk_pixbuf_colorize (Gdk.Pixbuf src, Gdk.Color color);
-		public static Gdk.Pixbuf gdk_pixbuf_frame (Gdk.Pixbuf src, Gdk.Pixbuf frame, int left_offset, int top_offset, int right_offset, int bottom_offset);
-		public static Gdk.Pixbuf gdk_pixbuf_lucent (Gdk.Pixbuf src, uint percent);
-		public static Gdk.Pixbuf gdk_pixbuf_new_from_file_at_max_size (string filename, int max_width, int max_height, bool preserve_aspect_ratio) throws GLib.Error;
-		public static Gdk.Pixbuf gdk_pixbuf_scale_down (Gdk.Pixbuf source, bool preserve_aspect_ratio, int dest_width, int dest_height);
-		public static Gdk.Pixbuf gdk_pixbuf_scale_ratio (Gdk.Pixbuf source, int dest_size);
-		public static Gdk.Pixbuf gdk_pixbuf_spotlight (Gdk.Pixbuf src);
-
-		public static bool g_value_transform_negate (GLib.Value src_value, GLib.Value dst_value);
-
-		public static void gtk_file_chooser_add_thumbnail_preview (Gtk.FileChooser chooser);
-		public static void gtk_object_destroy_later (Gtk.Object object);
-		public static void gtk_radio_action_set_current_value (Gtk.RadioAction action, int current_value);
-	}
-
-	/* exo-execute.h */
-	[Compact]
-	public class Execute {
-		public static bool preferred_application (string category, string? parameter, string working_directory, string[]? envp) throws GLib.Error;
-		public static bool preferred_application_on_screen (string category, string? parameter, string working_directory, string[]? envp, Gdk.Screen screen) throws GLib.Error;
-		public static bool terminal_shell (string command_line, string? working_directory, string[]? envp) throws GLib.Error;
-		public static bool terminal_shell_on_screen (string command_line, string? working_directory, string[]? envp, Gdk.Screen screen) throws GLib.Error;
-	}
-
-	/* exo-md5.h */
-	[Compact]
-	public class Md5Digest {
-		[CCode (cname = "exo_md5_str_to_digest")]
-		public static Exo.Md5Digest md5_str_to_digest (string str_digest);
-		[CCode (cname = "exo_str_get_md5_digest")]
-		public static Exo.Md5Digest str_get_md5_digest (string contents);
-	}
-	[Compact]
-	public class Md5 {
-		[CCode (cname = "exo_str_get_md5_str")]
-		public static string str_get_md5_str (string contents);
-	}
-
-	/* exo-mount-point.h */
-	[CCode (cprefix = "EXO_MOUNT_POINT_")]
-	[Flags]
-	public enum MountPointFlags {
-		READ_ONLY
-	}
-
-	[Compact]
-	public class MountPoint {
-		public static unowned GLib.SList list_active () throws GLib.Error;
-		public static unowned GLib.SList list_configured () throws GLib.Error;
-	}
-
-	/* exo-string.h */
-	[Compact]
-	public class String {
-		[CCode (cname = "exo_intern_static_string")]
-		public static weak string intern_static (string str);
-		[CCode (cname = "exo_intern_string")]
-		public static weak string intern (string str);
-		[CCode (cname = "exo_str_elide_underscores")]
-		public static string elide_underscores (string text);
-		[CCode (cname = "exo_str_is_equal")]
-		public static bool is_equal (string? a, string? b);
-		[CCode (cname = "exo_str_replace")]
-		public static string replace (string str, string pattern, string replacement);
-		[CCode (cname = "exo_strdup_strftime")]
-		public static string dup_strftime (string format, void* tm);
-		[CCode (cname = "exo_strndupv")]
-		public static string[] ndupv (string[] strv, int num);
-	}
-
-	/* exo-url.h */
-	[CCode (cprefix = "EXO_URL_ERROR_")]
-	public errordomain UrlError {
-		NOT_SUPPORTED
-	}
-
-	[Compact]
-	public class Url {
-		public static void about_dialog_hook (Gtk.AboutDialog about_dialog, string link);
-		public static bool show (string url, string? envp) throws Exo.UrlError;
-		public static bool show_on_screen (string url, string? envp, Gdk.Screen screen) throws Exo.UrlError;
-	}
-
-}
diff --git a/packages/exo-0.3/exo-0.3.deps b/packages/exo-0.3/exo-0.3.deps
deleted file mode 100644
index 4dc3754..0000000
--- a/packages/exo-0.3/exo-0.3.deps
+++ /dev/null
@@ -1,7 +0,0 @@
-atk
-gio-2.0
-cairo
-pango
-gdk-pixbuf-2.0
-gdk-2.0
-gtk+-2.0
diff --git a/packages/exo-0.3/exo-0.3.excludes b/packages/exo-0.3/exo-0.3.excludes
deleted file mode 100644
index 3039b78..0000000
--- a/packages/exo-0.3/exo-0.3.excludes
+++ /dev/null
@@ -1,9 +0,0 @@
-include/exo-0.3/exo/exo.h
-include/exo-0.3/exo/exo-config.h
-include/exo-0.3/exo/exo-execute.h
-include/exo-0.3/exo/exo-gdk-pixbuf-extensions.h
-include/exo-0.3/exo/exo-gobject-extensions.h
-include/exo-0.3/exo/exo-gtk-extensions.h
-include/exo-0.3/exo/exo-pango-extensions.h
-include/exo-0.3/exo/exo-string.h
-include/exo-0.3/exo/exo-utils.h
diff --git a/packages/exo-0.3/exo-0.3.files b/packages/exo-0.3/exo-0.3.files
deleted file mode 100644
index b5215a1..0000000
--- a/packages/exo-0.3/exo-0.3.files
+++ /dev/null
@@ -1,2 +0,0 @@
-include/exo-0.3/exo
-lib/libexo-0.3.so
diff --git a/packages/exo-1/exo-1-custom.vala b/packages/exo-1/exo-1-custom.vala
new file mode 100644
index 0000000..796b758
--- /dev/null
+++ b/packages/exo-1/exo-1-custom.vala
@@ -0,0 +1,55 @@
+namespace Exo {
+
+	[Compact]
+	[CCode (free_function = "")]
+	public class Binding {
+	}
+
+	[Compact]
+	[CCode (free_function = "")]
+	public class MutualBinding {
+	}
+
+	/* exo-gdk-pixbuf-extensions.h exo-gobject-extensions.h exo-gtk-extensions.h exo-pango-extensions.h */
+	[Compact]
+	public class Extensions {
+		public static Gdk.Pixbuf gdk_pixbuf_colorize (Gdk.Pixbuf src, Gdk.Color color);
+		public static Gdk.Pixbuf gdk_pixbuf_frame (Gdk.Pixbuf src, Gdk.Pixbuf frame, int left_offset, int top_offset, int right_offset, int bottom_offset);
+		public static Gdk.Pixbuf gdk_pixbuf_lucent (Gdk.Pixbuf src, uint percent);
+		public static Gdk.Pixbuf gdk_pixbuf_new_from_file_at_max_size (string filename, int max_width, int max_height, bool preserve_aspect_ratio) throws GLib.Error;
+		public static Gdk.Pixbuf gdk_pixbuf_scale_down (Gdk.Pixbuf source, bool preserve_aspect_ratio, int dest_width, int dest_height);
+		public static Gdk.Pixbuf gdk_pixbuf_scale_ratio (Gdk.Pixbuf source, int dest_size);
+		public static Gdk.Pixbuf gdk_pixbuf_spotlight (Gdk.Pixbuf src);
+
+		public static bool g_value_transform_negate (GLib.Value src_value, GLib.Value dst_value);
+
+		public static void gtk_file_chooser_add_thumbnail_preview (Gtk.FileChooser chooser);
+		public static void gtk_object_destroy_later (Gtk.Object object);
+		public static void gtk_radio_action_set_current_value (Gtk.RadioAction action, int current_value);
+	}
+
+	/* exo-execute.h */
+	[Compact]
+	public class Execute {
+		public static bool preferred_application (string category, string? parameter, string working_directory, string[]? envp) throws GLib.Error;
+		public static bool preferred_application_on_screen (string category, string? parameter, string working_directory, string[]? envp, Gdk.Screen screen) throws GLib.Error;
+		public static bool terminal_shell (string command_line, string? working_directory, string[]? envp) throws GLib.Error;
+		public static bool terminal_shell_on_screen (string command_line, string? working_directory, string[]? envp, Gdk.Screen screen) throws GLib.Error;
+	}
+
+	/* exo-string.h */
+	[Compact]
+	public class String {
+		[CCode (cname = "exo_str_elide_underscores")]
+		public static string elide_underscores (string text);
+		[CCode (cname = "exo_str_is_equal")]
+		public static bool is_equal (string? a, string? b);
+		[CCode (cname = "exo_str_replace")]
+		public static string replace (string str, string pattern, string replacement);
+		[CCode (cname = "exo_strdup_strftime")]
+		public static string dup_strftime (string format, void* tm);
+		[CCode (cname = "exo_strndupv")]
+		public static string[] ndupv (string[] strv, int num);
+	}
+
+}
diff --git a/packages/exo-0.3/exo-0.3.defines b/packages/exo-1/exo-1.defines
similarity index 100%
rename from packages/exo-0.3/exo-0.3.defines
rename to packages/exo-1/exo-1.defines
diff --git a/packages/libxfcegui4-1.0/libxfcegui4-1.0.deps b/packages/exo-1/exo-1.deps
similarity index 100%
copy from packages/libxfcegui4-1.0/libxfcegui4-1.0.deps
copy to packages/exo-1/exo-1.deps
diff --git a/packages/exo-1/exo-1.excludes b/packages/exo-1/exo-1.excludes
new file mode 100644
index 0000000..1f6c9c3
--- /dev/null
+++ b/packages/exo-1/exo-1.excludes
@@ -0,0 +1,9 @@
+include/exo-1/exo/exo.h
+include/exo-1/exo/exo-config.h
+include/exo-1/exo/exo-execute.h
+include/exo-1/exo/exo-gdk-pixbuf-extensions.h
+include/exo-1/exo/exo-gobject-extensions.h
+include/exo-1/exo/exo-gtk-extensions.h
+include/exo-1/exo/exo-pango-extensions.h
+include/exo-1/exo/exo-string.h
+include/exo-1/exo/exo-utils.h
diff --git a/packages/exo-1/exo-1.files b/packages/exo-1/exo-1.files
new file mode 100644
index 0000000..b22267a
--- /dev/null
+++ b/packages/exo-1/exo-1.files
@@ -0,0 +1,2 @@
+include/exo-1/exo
+lib/libexo-1.so
diff --git a/packages/exo-0.3/exo-0.3.gi b/packages/exo-1/exo-1.gi
similarity index 92%
rename from packages/exo-0.3/exo-0.3.gi
rename to packages/exo-1/exo-1.gi
index d18c894..110cb6b 100644
--- a/packages/exo-0.3/exo-0.3.gi
+++ b/packages/exo-1/exo-1.gi
@@ -1,52 +1,6 @@
 <?xml version="1.0"?>
 <api version="1.0">
 	<namespace name="Exo">
-		<function name="md5_str_to_digest" symbol="exo_md5_str_to_digest">
-			<return-type type="ExoMd5Digest*"/>
-			<parameters>
-				<parameter name="str_digest" type="gchar*"/>
-			</parameters>
-		</function>
-		<function name="str_get_md5_digest" symbol="exo_str_get_md5_digest">
-			<return-type type="ExoMd5Digest*"/>
-			<parameters>
-				<parameter name="contents" type="gchar*"/>
-			</parameters>
-		</function>
-		<function name="str_get_md5_str" symbol="exo_str_get_md5_str">
-			<return-type type="gchar*"/>
-			<parameters>
-				<parameter name="contents" type="gchar*"/>
-			</parameters>
-		</function>
-		<function name="url_about_dialog_hook" symbol="exo_url_about_dialog_hook">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="about_dialog" type="GtkAboutDialog*"/>
-				<parameter name="link" type="gchar*"/>
-				<parameter name="user_data" type="gpointer"/>
-			</parameters>
-		</function>
-		<function name="url_error_quark" symbol="exo_url_error_quark">
-			<return-type type="GQuark"/>
-		</function>
-		<function name="url_show" symbol="exo_url_show">
-			<return-type type="gboolean"/>
-			<parameters>
-				<parameter name="url" type="gchar*"/>
-				<parameter name="envp" type="gchar**"/>
-				<parameter name="error" type="GError**"/>
-			</parameters>
-		</function>
-		<function name="url_show_on_screen" symbol="exo_url_show_on_screen">
-			<return-type type="gboolean"/>
-			<parameters>
-				<parameter name="url" type="gchar*"/>
-				<parameter name="envp" type="gchar**"/>
-				<parameter name="screen" type="GdkScreen*"/>
-				<parameter name="error" type="GError**"/>
-			</parameters>
-		</function>
 		<callback name="ExoBindingTransform">
 			<return-type type="gboolean"/>
 			<parameters>
@@ -81,6 +35,14 @@
 				<parameter name="user_data" type="gpointer"/>
 			</parameters>
 		</callback>
+		<callback name="ExoSimpleJobFunc">
+			<return-type type="gboolean"/>
+			<parameters>
+				<parameter name="job" type="ExoJob*"/>
+				<parameter name="param_values" type="GValueArray*"/>
+				<parameter name="error" type="GError**"/>
+			</parameters>
+		</callback>
 		<struct name="ExoBinding">
 			<method name="new" symbol="exo_binding_new">
 				<return-type type="ExoBinding*"/>
@@ -118,20 +80,6 @@
 					<parameter name="binding" type="ExoBinding*"/>
 				</parameters>
 			</method>
-			<field name="src_object" type="GObject*"/>
-			<field name="base" type="ExoBindingBase"/>
-			<field name="link" type="ExoBindingLink"/>
-		</struct>
-		<struct name="ExoBindingBase">
-			<field name="destroy" type="GDestroyNotify"/>
-		</struct>
-		<struct name="ExoBindingLink">
-			<field name="dst_object" type="GObject*"/>
-			<field name="dst_pspec" type="GParamSpec*"/>
-			<field name="dst_handler" type="gulong"/>
-			<field name="handler" type="gulong"/>
-			<field name="transform" type="ExoBindingTransform"/>
-			<field name="user_data" type="gpointer"/>
 		</struct>
 		<struct name="ExoMutualBinding">
 			<method name="new" symbol="exo_mutual_binding_new">
@@ -171,72 +119,9 @@
 					<parameter name="binding" type="ExoMutualBinding*"/>
 				</parameters>
 			</method>
-			<field name="base" type="ExoBindingBase"/>
-			<field name="direct" type="ExoBindingLink"/>
-			<field name="reverse" type="ExoBindingLink"/>
 		</struct>
-		<boxed name="ExoMd5Digest" type-name="ExoMd5Digest" get-type="exo_md5_digest_get_type">
-			<method name="dup" symbol="exo_md5_digest_dup">
-				<return-type type="ExoMd5Digest*"/>
-				<parameters>
-					<parameter name="digest" type="ExoMd5Digest*"/>
-				</parameters>
-			</method>
-			<method name="equal" symbol="exo_md5_digest_equal">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="digest1" type="gconstpointer"/>
-					<parameter name="digest2" type="gconstpointer"/>
-				</parameters>
-			</method>
-			<method name="free" symbol="exo_md5_digest_free">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="digest" type="ExoMd5Digest*"/>
-				</parameters>
-			</method>
-			<method name="hash" symbol="exo_md5_digest_hash">
-				<return-type type="guint"/>
-				<parameters>
-					<parameter name="digest" type="gconstpointer"/>
-				</parameters>
-			</method>
-			<method name="to_str" symbol="exo_md5_digest_to_str">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="digest" type="ExoMd5Digest*"/>
-				</parameters>
-			</method>
-			<field name="digest" type="guchar[]"/>
-		</boxed>
-		<boxed name="ExoMountPoint" type-name="ExoMountPoint" get-type="exo_mount_point_get_type">
-			<method name="dup" symbol="exo_mount_point_dup">
-				<return-type type="ExoMountPoint*"/>
-				<parameters>
-					<parameter name="mount_point" type="ExoMountPoint*"/>
-				</parameters>
-			</method>
-			<method name="free" symbol="exo_mount_point_free">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="mount_point" type="ExoMountPoint*"/>
-				</parameters>
-			</method>
-			<method name="list_matched" symbol="exo_mount_point_list_matched">
-				<return-type type="GSList*"/>
-				<parameters>
-					<parameter name="mask" type="ExoMountPointMatchMask"/>
-					<parameter name="device" type="gchar*"/>
-					<parameter name="folder" type="gchar*"/>
-					<parameter name="fstype" type="gchar*"/>
-					<parameter name="error" type="GError**"/>
-				</parameters>
-			</method>
-			<field name="flags" type="ExoMountPointFlags"/>
-			<field name="device" type="gchar*"/>
-			<field name="folder" type="gchar*"/>
-			<field name="fstype" type="gchar*"/>
-		</boxed>
+		<struct name="ExoSimpleJobClass">
+		</struct>
 		<enum name="ExoIconViewDropPosition" type-name="ExoIconViewDropPosition" get-type="exo_icon_view_drop_position_get_type">
 			<member name="EXO_ICON_VIEW_NO_DROP" value="0"/>
 			<member name="EXO_ICON_VIEW_DROP_INTO" value="1"/>
@@ -249,19 +134,6 @@
 			<member name="EXO_ICON_VIEW_LAYOUT_ROWS" value="0"/>
 			<member name="EXO_ICON_VIEW_LAYOUT_COLS" value="1"/>
 		</enum>
-		<enum name="ExoMountPointMatchMask">
-			<member name="EXO_MOUNT_POINT_MATCH_ACTIVE" value="0"/>
-			<member name="EXO_MOUNT_POINT_MATCH_CONFIGURED" value="1"/>
-			<member name="EXO_MOUNT_POINT_MATCH_DEVICE" value="2"/>
-			<member name="EXO_MOUNT_POINT_MATCH_FOLDER" value="4"/>
-			<member name="EXO_MOUNT_POINT_MATCH_FSTYPE" value="8"/>
-		</enum>
-		<enum name="ExoUrlError">
-			<member name="EXO_URL_ERROR_NOT_SUPPORTED" value="0"/>
-		</enum>
-		<flags name="ExoMountPointFlags" type-name="ExoMountPointFlags" get-type="exo_mount_point_flags_get_type">
-			<member name="EXO_MOUNT_POINT_READ_ONLY" value="1"/>
-		</flags>
 		<flags name="ExoToolbarsModelFlags" type-name="ExoToolbarsModelFlags" get-type="exo_toolbars_model_flags_get_type">
 			<member name="EXO_TOOLBARS_MODEL_NOT_REMOVABLE" value="1"/>
 			<member name="EXO_TOOLBARS_MODEL_ACCEPT_ITEMS_ONLY" value="2"/>
@@ -278,6 +150,7 @@
 				<return-type type="GtkCellRenderer*"/>
 			</constructor>
 			<property name="follow-state" type="gboolean" readable="1" writable="1" construct="1" construct-only="0"/>
+			<property name="gicon" type="GIcon*" 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="size" type="gint" readable="1" writable="1" construct="1" construct-only="0"/>
 			<vfunc name="reserved1">
@@ -354,7 +227,7 @@
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="icon_bar" type="ExoIconBar*"/>
-					<parameter name="index" type="gint"/>
+					<parameter name="idx" type="gint"/>
 				</parameters>
 			</method>
 			<method name="set_active_iter" symbol="exo_icon_bar_set_active_iter">
@@ -471,9 +344,9 @@
 		</object>
 		<object name="ExoIconView" parent="GtkContainer" type-name="ExoIconView" get-type="exo_icon_view_get_type">
 			<implements>
+				<interface name="GtkCellLayout"/>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkCellLayout"/>
 			</implements>
 			<method name="create_drag_icon" symbol="exo_icon_view_create_drag_icon">
 				<return-type type="GdkPixmap*"/>
@@ -1014,10 +887,118 @@
 				<return-type type="void"/>
 			</vfunc>
 		</object>
+		<object name="ExoJob" parent="GObject" type-name="ExoJob" get-type="exo_job_get_type">
+			<method name="cancel" symbol="exo_job_cancel">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="job" type="ExoJob*"/>
+				</parameters>
+			</method>
+			<method name="emit" symbol="exo_job_emit">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="job" type="ExoJob*"/>
+					<parameter name="signal_id" type="guint"/>
+					<parameter name="signal_detail" type="GQuark"/>
+				</parameters>
+			</method>
+			<method name="get_cancellable" symbol="exo_job_get_cancellable">
+				<return-type type="GCancellable*"/>
+				<parameters>
+					<parameter name="job" type="ExoJob*"/>
+				</parameters>
+			</method>
+			<method name="info_message" symbol="exo_job_info_message">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="job" type="ExoJob*"/>
+					<parameter name="format" type="gchar*"/>
+				</parameters>
+			</method>
+			<method name="is_cancelled" symbol="exo_job_is_cancelled">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="job" type="ExoJob*"/>
+				</parameters>
+			</method>
+			<method name="launch" symbol="exo_job_launch">
+				<return-type type="ExoJob*"/>
+				<parameters>
+					<parameter name="job" type="ExoJob*"/>
+				</parameters>
+			</method>
+			<method name="percent" symbol="exo_job_percent">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="job" type="ExoJob*"/>
+					<parameter name="percent" type="gdouble"/>
+				</parameters>
+			</method>
+			<method name="send_to_mainloop" symbol="exo_job_send_to_mainloop">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="job" type="ExoJob*"/>
+					<parameter name="func" type="GSourceFunc"/>
+					<parameter name="user_data" type="gpointer"/>
+					<parameter name="destroy_notify" type="GDestroyNotify"/>
+				</parameters>
+			</method>
+			<method name="set_error_if_cancelled" symbol="exo_job_set_error_if_cancelled">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="job" type="ExoJob*"/>
+					<parameter name="error" type="GError**"/>
+				</parameters>
+			</method>
+			<signal name="error" when="LAST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="job" type="ExoJob*"/>
+					<parameter name="error" type="gpointer"/>
+				</parameters>
+			</signal>
+			<signal name="finished" when="LAST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="job" type="ExoJob*"/>
+				</parameters>
+			</signal>
+			<signal name="info-message" when="LAST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="job" type="ExoJob*"/>
+					<parameter name="message" type="char*"/>
+				</parameters>
+			</signal>
+			<signal name="percent" when="LAST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="job" type="ExoJob*"/>
+					<parameter name="percent" type="gdouble"/>
+				</parameters>
+			</signal>
+			<vfunc name="execute">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="job" type="ExoJob*"/>
+					<parameter name="error" type="GError**"/>
+				</parameters>
+			</vfunc>
+		</object>
+		<object name="ExoSimpleJob" parent="ExoJob" type-name="ExoSimpleJob" get-type="exo_simple_job_get_type">
+			<method name="launch" symbol="exo_simple_job_launch">
+				<return-type type="ExoJob*"/>
+				<parameters>
+					<parameter name="func" type="ExoSimpleJobFunc"/>
+					<parameter name="n_param_values" type="guint"/>
+				</parameters>
+			</method>
+		</object>
 		<object name="ExoToolbarsEditor" parent="GtkVBox" type-name="ExoToolbarsEditor" get-type="exo_toolbars_editor_get_type">
 			<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 +1354,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/exo-0.3/exo-0.3.metadata b/packages/exo-1/exo-1.metadata
similarity index 77%
rename from packages/exo-0.3/exo-0.3.metadata
rename to packages/exo-1/exo-1.metadata
index 8a90f38..d732170 100644
--- a/packages/exo-0.3/exo-0.3.metadata
+++ b/packages/exo-1/exo-1.metadata
@@ -9,18 +9,6 @@ ExoMutualBinding.base hidden="1"
 ExoMutualBinding.direct hidden="1"
 ExoMutualBinding.reverse hidden="1"
 
-ExoMountPointFlags hidden="1"
-
-exo_md5_str_to_digest hidden="1"
-exo_str_get_md5_digest hidden="1"
-exo_str_get_md5_str hidden="1"
-
-ExoUrlError hidden="1"
-exo_url_error_quark hidden="1"
-exo_url_about_dialog_hook hidden="1"
-exo_url_show hidden="1"
-exo_url_show_on_screen hidden="1"
-
 exo_xsession_client_get_restart_command hidden="1"
 exo_xsession_client_set_restart_command hidden="1"
 exo_xsession_client_get_group hidden="1"
@@ -33,6 +21,8 @@ exo_*_reserved* hidden="1"
 # Rename signal names duplicated with method names
 ExoIconView::item_activated hidden="0"
 exo_icon_view_item_activated name="exo_icon_view_activate_item"
+ExoJob::info_message name="info_message_received"
+ExoJob::percent name="percent_progress"
 ExoIconView::select_all name="all_selected"
 ExoIconView::unselect_all name="all_unselected"
 ExoToolbarsModel::get_item_data name="item_data"
diff --git a/packages/exo-0.3/exo-0.3.namespace b/packages/exo-1/exo-1.namespace
similarity index 100%
rename from packages/exo-0.3/exo-0.3.namespace
rename to packages/exo-1/exo-1.namespace
diff --git a/packages/libxfce4menu-0.1/libxfce4menu-0.1-custom.vala b/packages/libxfce4menu-0.1/libxfce4menu-0.1-custom.vala
deleted file mode 100644
index dc9a1e9..0000000
--- a/packages/libxfce4menu-0.1/libxfce4menu-0.1-custom.vala
+++ /dev/null
@@ -1,26 +0,0 @@
-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);
-		public void* add_file (string filename);
-		public void* add_item (Xfce.MenuItem item);
-		public static Xfce.MenuMonitorFlags get_flags ();
-		public static bool has_flags (Xfce.MenuMonitorFlags flags);
-		public void remove_directory (string directory);
-		public void remove_file (string filename);
-		public void remove_item (Xfce.MenuItem item);
-		public static void set_flags (Xfce.MenuMonitorFlags flags);
-		public static void set_vtable (Xfce.MenuMonitorVTable vtable);
-	}
-
-	public static void menu_init (string env);
-	public static void menu_shutdown ();
-	public static unowned string menu_get_environment ();
-	public static void menu_set_environment (string env);
-}
diff --git a/packages/libxfce4menu-0.1/libxfce4menu-0.1.defines b/packages/libxfce4menu-0.1/libxfce4menu-0.1.defines
deleted file mode 100644
index b686f34..0000000
--- a/packages/libxfce4menu-0.1/libxfce4menu-0.1.defines
+++ /dev/null
@@ -1 +0,0 @@
--DLIBXFCE4MENU_INSIDE_LIBXFCE4MENU_H
diff --git a/packages/libxfce4menu-0.1/libxfce4menu-0.1.excludes b/packages/libxfce4menu-0.1/libxfce4menu-0.1.excludes
deleted file mode 100644
index bc289e9..0000000
--- a/packages/libxfce4menu-0.1/libxfce4menu-0.1.excludes
+++ /dev/null
@@ -1 +0,0 @@
-include/xfce4/libxfce4menu-0.1/libxfce4menu/libxfce4menu-config.h
diff --git a/packages/libxfce4menu-0.1/libxfce4menu-0.1.files b/packages/libxfce4menu-0.1/libxfce4menu-0.1.files
deleted file mode 100644
index a2e6552..0000000
--- a/packages/libxfce4menu-0.1/libxfce4menu-0.1.files
+++ /dev/null
@@ -1,2 +0,0 @@
-include/xfce4/libxfce4menu-0.1/libxfce4menu
-lib/libxfce4menu-0.1.so
diff --git a/packages/libxfce4menu-0.1/libxfce4menu-0.1.gi b/packages/libxfce4menu-0.1/libxfce4menu-0.1.gi
deleted file mode 100644
index 1f39e77..0000000
--- a/packages/libxfce4menu-0.1/libxfce4menu-0.1.gi
+++ /dev/null
@@ -1,937 +0,0 @@
-<?xml version="1.0"?>
-<api version="1.0">
-	<namespace name="Xfce">
-		<struct name="XfceMenuAndRulesClass">
-		</struct>
-		<struct name="XfceMenuClass">
-		</struct>
-		<struct name="XfceMenuDirectoryClass">
-		</struct>
-		<struct name="XfceMenuItemCacheClass">
-		</struct>
-		<struct name="XfceMenuItemClass">
-		</struct>
-		<struct name="XfceMenuItemPoolClass">
-		</struct>
-		<struct name="XfceMenuLayoutClass">
-		</struct>
-		<struct name="XfceMenuLayoutNode">
-			<method name="get_filename" symbol="xfce_menu_layout_node_get_filename">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="node" type="XfceMenuLayoutNode*"/>
-				</parameters>
-			</method>
-			<method name="get_menuname" symbol="xfce_menu_layout_node_get_menuname">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="node" type="XfceMenuLayoutNode*"/>
-				</parameters>
-			</method>
-			<method name="get_merge_type" symbol="xfce_menu_layout_node_get_merge_type">
-				<return-type type="XfceMenuLayoutMergeType"/>
-				<parameters>
-					<parameter name="node" type="XfceMenuLayoutNode*"/>
-				</parameters>
-			</method>
-		</struct>
-		<struct name="XfceMenuMonitorVTable">
-			<field name="monitor_file" type="GCallback"/>
-			<field name="monitor_directory" type="GCallback"/>
-			<field name="remove_monitor" type="GCallback"/>
-		</struct>
-		<struct name="XfceMenuMoveClass">
-		</struct>
-		<struct name="XfceMenuNotRulesClass">
-		</struct>
-		<struct name="XfceMenuOrRulesClass">
-		</struct>
-		<struct name="XfceMenuSeparatorClass">
-		</struct>
-		<struct name="XfceMenuStandardRulesClass">
-		</struct>
-		<enum name="XfceMenuLayoutMergeType">
-			<member name="XFCE_MENU_LAYOUT_MERGE_MENUS" value="0"/>
-			<member name="XFCE_MENU_LAYOUT_MERGE_FILES" value="1"/>
-			<member name="XFCE_MENU_LAYOUT_MERGE_ALL" value="2"/>
-		</enum>
-		<enum name="XfceMenuLayoutNodeType">
-			<member name="XFCE_MENU_LAYOUT_NODE_INVALID" value="0"/>
-			<member name="XFCE_MENU_LAYOUT_NODE_FILENAME" value="1"/>
-			<member name="XFCE_MENU_LAYOUT_NODE_MENUNAME" value="2"/>
-			<member name="XFCE_MENU_LAYOUT_NODE_SEPARATOR" value="3"/>
-			<member name="XFCE_MENU_LAYOUT_NODE_MERGE" value="4"/>
-		</enum>
-		<enum name="XfceMenuMonitorFlags">
-			<member name="XFCE_MENU_MONITOR_DIRECTORIES" value="1"/>
-			<member name="XFCE_MENU_MONITOR_MENU_FILES" value="2"/>
-			<member name="XFCE_MENU_MONITOR_DIRECTORY_FILES" value="4"/>
-			<member name="XFCE_MENU_MONITOR_DESKTOP_FILES" value="8"/>
-		</enum>
-		<object name="XfceMenu" parent="GObject" type-name="XfceMenu" get-type="xfce_menu_get_type">
-			<implements>
-				<interface name="XfceMenuElement"/>
-			</implements>
-			<method name="add_menu" symbol="xfce_menu_add_menu">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="menu" type="XfceMenu*"/>
-					<parameter name="submenu" type="XfceMenu*"/>
-				</parameters>
-			</method>
-			<method name="get_app_dirs" symbol="xfce_menu_get_app_dirs">
-				<return-type type="GSList*"/>
-				<parameters>
-					<parameter name="menu" type="XfceMenu*"/>
-				</parameters>
-			</method>
-			<method name="get_deleted" symbol="xfce_menu_get_deleted">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="menu" type="XfceMenu*"/>
-				</parameters>
-			</method>
-			<method name="get_directory" symbol="xfce_menu_get_directory">
-				<return-type type="XfceMenuDirectory*"/>
-				<parameters>
-					<parameter name="menu" type="XfceMenu*"/>
-				</parameters>
-			</method>
-			<method name="get_directory_dirs" symbol="xfce_menu_get_directory_dirs">
-				<return-type type="GSList*"/>
-				<parameters>
-					<parameter name="menu" type="XfceMenu*"/>
-				</parameters>
-			</method>
-			<method name="get_environment" symbol="xfce_menu_get_environment">
-				<return-type type="gchar*"/>
-			</method>
-			<method name="get_filename" symbol="xfce_menu_get_filename">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="menu" type="XfceMenu*"/>
-				</parameters>
-			</method>
-			<method name="get_item_pool" symbol="xfce_menu_get_item_pool">
-				<return-type type="XfceMenuItemPool*"/>
-				<parameters>
-					<parameter name="menu" type="XfceMenu*"/>
-				</parameters>
-			</method>
-			<method name="get_items" symbol="xfce_menu_get_items">
-				<return-type type="GSList*"/>
-				<parameters>
-					<parameter name="menu" type="XfceMenu*"/>
-				</parameters>
-			</method>
-			<method name="get_layout_elements" symbol="xfce_menu_get_layout_elements">
-				<return-type type="GSList*"/>
-				<parameters>
-					<parameter name="menu" type="XfceMenu*"/>
-				</parameters>
-			</method>
-			<method name="get_legacy_dirs" symbol="xfce_menu_get_legacy_dirs">
-				<return-type type="GSList*"/>
-				<parameters>
-					<parameter name="menu" type="XfceMenu*"/>
-				</parameters>
-			</method>
-			<method name="get_menu_with_name" symbol="xfce_menu_get_menu_with_name">
-				<return-type type="XfceMenu*"/>
-				<parameters>
-					<parameter name="menu" type="XfceMenu*"/>
-					<parameter name="name" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="get_menus" symbol="xfce_menu_get_menus">
-				<return-type type="GSList*"/>
-				<parameters>
-					<parameter name="menu" type="XfceMenu*"/>
-				</parameters>
-			</method>
-			<method name="get_name" symbol="xfce_menu_get_name">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="menu" type="XfceMenu*"/>
-				</parameters>
-			</method>
-			<method name="get_only_unallocated" symbol="xfce_menu_get_only_unallocated">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="menu" type="XfceMenu*"/>
-				</parameters>
-			</method>
-			<method name="get_parent" symbol="xfce_menu_get_parent">
-				<return-type type="XfceMenu*"/>
-				<parameters>
-					<parameter name="menu" type="XfceMenu*"/>
-				</parameters>
-			</method>
-			<method name="get_root" symbol="xfce_menu_get_root">
-				<return-type type="XfceMenu*"/>
-				<parameters>
-					<parameter name="error" type="GError**"/>
-				</parameters>
-			</method>
-			<method name="has_layout" symbol="xfce_menu_has_layout">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="menu" type="XfceMenu*"/>
-				</parameters>
-			</method>
-			<method name="init" symbol="xfce_menu_init">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="env" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="monitor_add_directory" symbol="xfce_menu_monitor_add_directory">
-				<return-type type="gpointer"/>
-				<parameters>
-					<parameter name="menu" type="XfceMenu*"/>
-					<parameter name="directory" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="monitor_add_file" symbol="xfce_menu_monitor_add_file">
-				<return-type type="gpointer"/>
-				<parameters>
-					<parameter name="menu" type="XfceMenu*"/>
-					<parameter name="filename" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="monitor_add_item" symbol="xfce_menu_monitor_add_item">
-				<return-type type="gpointer"/>
-				<parameters>
-					<parameter name="menu" type="XfceMenu*"/>
-					<parameter name="item" type="XfceMenuItem*"/>
-				</parameters>
-			</method>
-			<method name="monitor_get_flags" symbol="xfce_menu_monitor_get_flags">
-				<return-type type="XfceMenuMonitorFlags"/>
-			</method>
-			<method name="monitor_has_flags" symbol="xfce_menu_monitor_has_flags">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="flags" type="XfceMenuMonitorFlags"/>
-				</parameters>
-			</method>
-			<method name="monitor_remove_directory" symbol="xfce_menu_monitor_remove_directory">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="menu" type="XfceMenu*"/>
-					<parameter name="directory" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="monitor_remove_file" symbol="xfce_menu_monitor_remove_file">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="menu" type="XfceMenu*"/>
-					<parameter name="filename" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="monitor_remove_item" symbol="xfce_menu_monitor_remove_item">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="menu" type="XfceMenu*"/>
-					<parameter name="item" type="XfceMenuItem*"/>
-				</parameters>
-			</method>
-			<method name="monitor_set_flags" symbol="xfce_menu_monitor_set_flags">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="flags" type="XfceMenuMonitorFlags"/>
-				</parameters>
-			</method>
-			<method name="monitor_set_vtable" symbol="xfce_menu_monitor_set_vtable">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="vtable" type="XfceMenuMonitorVTable*"/>
-					<parameter name="user_data" type="gpointer"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="xfce_menu_new">
-				<return-type type="XfceMenu*"/>
-				<parameters>
-					<parameter name="filename" type="gchar*"/>
-					<parameter name="error" type="GError**"/>
-				</parameters>
-			</constructor>
-			<method name="set_deleted" symbol="xfce_menu_set_deleted">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="menu" type="XfceMenu*"/>
-					<parameter name="deleted" type="gboolean"/>
-				</parameters>
-			</method>
-			<method name="set_directory" symbol="xfce_menu_set_directory">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="menu" type="XfceMenu*"/>
-					<parameter name="directory" type="XfceMenuDirectory*"/>
-				</parameters>
-			</method>
-			<method name="set_environment" symbol="xfce_menu_set_environment">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="env" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="set_filename" symbol="xfce_menu_set_filename">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="menu" type="XfceMenu*"/>
-					<parameter name="filename" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="set_name" symbol="xfce_menu_set_name">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="menu" type="XfceMenu*"/>
-					<parameter name="name" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="set_only_unallocated" symbol="xfce_menu_set_only_unallocated">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="menu" type="XfceMenu*"/>
-					<parameter name="only_unallocated" type="gboolean"/>
-				</parameters>
-			</method>
-			<method name="shutdown" symbol="xfce_menu_shutdown">
-				<return-type type="void"/>
-			</method>
-			<property name="deleted" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="directory" type="XfceMenuDirectory*" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="filename" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="name" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="only-unallocated" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-		</object>
-		<object name="XfceMenuAndRules" parent="XfceMenuStandardRules" type-name="XfceMenuAndRules" get-type="xfce_menu_and_rules_get_type">
-			<implements>
-				<interface name="XfceMenuRules"/>
-			</implements>
-			<constructor name="new" symbol="xfce_menu_and_rules_new">
-				<return-type type="XfceMenuAndRules*"/>
-			</constructor>
-		</object>
-		<object name="XfceMenuDirectory" parent="GObject" type-name="XfceMenuDirectory" get-type="xfce_menu_directory_get_type">
-			<method name="get_comment" symbol="xfce_menu_directory_get_comment">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="directory" type="XfceMenuDirectory*"/>
-				</parameters>
-			</method>
-			<method name="get_filename" symbol="xfce_menu_directory_get_filename">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="directory" type="XfceMenuDirectory*"/>
-				</parameters>
-			</method>
-			<method name="get_hidden" symbol="xfce_menu_directory_get_hidden">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="directory" type="XfceMenuDirectory*"/>
-				</parameters>
-			</method>
-			<method name="get_icon" symbol="xfce_menu_directory_get_icon">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="directory" type="XfceMenuDirectory*"/>
-				</parameters>
-			</method>
-			<method name="get_name" symbol="xfce_menu_directory_get_name">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="directory" type="XfceMenuDirectory*"/>
-				</parameters>
-			</method>
-			<method name="get_no_display" symbol="xfce_menu_directory_get_no_display">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="directory" type="XfceMenuDirectory*"/>
-				</parameters>
-			</method>
-			<method name="set_comment" symbol="xfce_menu_directory_set_comment">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="directory" type="XfceMenuDirectory*"/>
-					<parameter name="comment" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="set_filename" symbol="xfce_menu_directory_set_filename">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="directory" type="XfceMenuDirectory*"/>
-					<parameter name="name" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="set_icon" symbol="xfce_menu_directory_set_icon">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="directory" type="XfceMenuDirectory*"/>
-					<parameter name="icon" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="set_name" symbol="xfce_menu_directory_set_name">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="directory" type="XfceMenuDirectory*"/>
-					<parameter name="name" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="set_no_display" symbol="xfce_menu_directory_set_no_display">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="directory" type="XfceMenuDirectory*"/>
-					<parameter name="no_display" type="gboolean"/>
-				</parameters>
-			</method>
-			<method name="show_in_environment" symbol="xfce_menu_directory_show_in_environment">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="directory" type="XfceMenuDirectory*"/>
-				</parameters>
-			</method>
-			<property name="comment" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="filename" 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="name" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="no-display" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-		</object>
-		<object name="XfceMenuItem" parent="GObject" type-name="XfceMenuItem" get-type="xfce_menu_item_get_type">
-			<implements>
-				<interface name="XfceMenuElement"/>
-			</implements>
-			<method name="decrement_allocated" symbol="xfce_menu_item_decrement_allocated">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="item" type="XfceMenuItem*"/>
-				</parameters>
-			</method>
-			<method name="get_allocated" symbol="xfce_menu_item_get_allocated">
-				<return-type type="gint"/>
-				<parameters>
-					<parameter name="item" type="XfceMenuItem*"/>
-				</parameters>
-			</method>
-			<method name="get_categories" symbol="xfce_menu_item_get_categories">
-				<return-type type="GList*"/>
-				<parameters>
-					<parameter name="item" type="XfceMenuItem*"/>
-				</parameters>
-			</method>
-			<method name="get_command" symbol="xfce_menu_item_get_command">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="item" type="XfceMenuItem*"/>
-				</parameters>
-			</method>
-			<method name="get_comment" symbol="xfce_menu_item_get_comment">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="item" type="XfceMenuItem*"/>
-				</parameters>
-			</method>
-			<method name="get_desktop_id" symbol="xfce_menu_item_get_desktop_id">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="item" type="XfceMenuItem*"/>
-				</parameters>
-			</method>
-			<method name="get_filename" symbol="xfce_menu_item_get_filename">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="item" type="XfceMenuItem*"/>
-				</parameters>
-			</method>
-			<method name="get_generic_name" symbol="xfce_menu_item_get_generic_name">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="item" type="XfceMenuItem*"/>
-				</parameters>
-			</method>
-			<method name="get_icon_name" symbol="xfce_menu_item_get_icon_name">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="item" type="XfceMenuItem*"/>
-				</parameters>
-			</method>
-			<method name="get_name" symbol="xfce_menu_item_get_name">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="item" type="XfceMenuItem*"/>
-				</parameters>
-			</method>
-			<method name="get_no_display" symbol="xfce_menu_item_get_no_display">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="item" type="XfceMenuItem*"/>
-				</parameters>
-			</method>
-			<method name="get_path" symbol="xfce_menu_item_get_path">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="item" type="XfceMenuItem*"/>
-				</parameters>
-			</method>
-			<method name="get_try_exec" symbol="xfce_menu_item_get_try_exec">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="item" type="XfceMenuItem*"/>
-				</parameters>
-			</method>
-			<method name="has_category" symbol="xfce_menu_item_has_category">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="item" type="XfceMenuItem*"/>
-					<parameter name="category" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="increment_allocated" symbol="xfce_menu_item_increment_allocated">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="item" type="XfceMenuItem*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="xfce_menu_item_new">
-				<return-type type="XfceMenuItem*"/>
-				<parameters>
-					<parameter name="filename" type="gchar*"/>
-				</parameters>
-			</constructor>
-			<method name="only_show_in_environment" symbol="xfce_menu_item_only_show_in_environment">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="item" type="XfceMenuItem*"/>
-				</parameters>
-			</method>
-			<method name="ref" symbol="xfce_menu_item_ref">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="item" type="XfceMenuItem*"/>
-				</parameters>
-			</method>
-			<method name="requires_terminal" symbol="xfce_menu_item_requires_terminal">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="item" type="XfceMenuItem*"/>
-				</parameters>
-			</method>
-			<method name="set_categories" symbol="xfce_menu_item_set_categories">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="item" type="XfceMenuItem*"/>
-					<parameter name="categories" type="GList*"/>
-				</parameters>
-			</method>
-			<method name="set_command" symbol="xfce_menu_item_set_command">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="item" type="XfceMenuItem*"/>
-					<parameter name="command" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="set_comment" symbol="xfce_menu_item_set_comment">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="item" type="XfceMenuItem*"/>
-					<parameter name="comment" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="set_desktop_id" symbol="xfce_menu_item_set_desktop_id">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="item" type="XfceMenuItem*"/>
-					<parameter name="desktop_id" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="set_filename" symbol="xfce_menu_item_set_filename">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="item" type="XfceMenuItem*"/>
-					<parameter name="filename" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="set_generic_name" symbol="xfce_menu_item_set_generic_name">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="item" type="XfceMenuItem*"/>
-					<parameter name="generic_name" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="set_icon_name" symbol="xfce_menu_item_set_icon_name">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="item" type="XfceMenuItem*"/>
-					<parameter name="icon_name" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="set_name" symbol="xfce_menu_item_set_name">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="item" type="XfceMenuItem*"/>
-					<parameter name="name" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="set_no_display" symbol="xfce_menu_item_set_no_display">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="item" type="XfceMenuItem*"/>
-					<parameter name="no_display" type="gboolean"/>
-				</parameters>
-			</method>
-			<method name="set_path" symbol="xfce_menu_item_set_path">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="item" type="XfceMenuItem*"/>
-					<parameter name="path" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="set_requires_terminal" symbol="xfce_menu_item_set_requires_terminal">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="item" type="XfceMenuItem*"/>
-					<parameter name="requires_terminal" type="gboolean"/>
-				</parameters>
-			</method>
-			<method name="set_supports_startup_notification" symbol="xfce_menu_item_set_supports_startup_notification">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="item" type="XfceMenuItem*"/>
-					<parameter name="supports_startup_notification" type="gboolean"/>
-				</parameters>
-			</method>
-			<method name="set_try_exec" symbol="xfce_menu_item_set_try_exec">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="item" type="XfceMenuItem*"/>
-					<parameter name="try_exec" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="show_in_environment" symbol="xfce_menu_item_show_in_environment">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="item" type="XfceMenuItem*"/>
-				</parameters>
-			</method>
-			<method name="supports_startup_notification" symbol="xfce_menu_item_supports_startup_notification">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="item" type="XfceMenuItem*"/>
-				</parameters>
-			</method>
-			<method name="unref" symbol="xfce_menu_item_unref">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="item" type="XfceMenuItem*"/>
-				</parameters>
-			</method>
-			<property name="command" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="comment" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="desktop-id" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="filename" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="generic-name" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="icon-name" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="name" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="no-display" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="path" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="requires-terminal" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="supports-startup-notification" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="try-exec" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-		</object>
-		<object name="XfceMenuItemCache" parent="GObject" type-name="XfceMenuItemCache" get-type="xfce_menu_item_cache_get_type">
-			<method name="foreach" symbol="xfce_menu_item_cache_foreach">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="cache" type="XfceMenuItemCache*"/>
-					<parameter name="func" type="GHFunc"/>
-					<parameter name="user_data" type="gpointer"/>
-				</parameters>
-			</method>
-			<method name="get_default" symbol="xfce_menu_item_cache_get_default">
-				<return-type type="XfceMenuItemCache*"/>
-			</method>
-			<method name="invalidate" symbol="xfce_menu_item_cache_invalidate">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="cache" type="XfceMenuItemCache*"/>
-				</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">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="pool" type="XfceMenuItemPool*"/>
-					<parameter name="rule" type="XfceMenuStandardRules*"/>
-				</parameters>
-			</method>
-			<method name="foreach" symbol="xfce_menu_item_pool_foreach">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="pool" type="XfceMenuItemPool*"/>
-					<parameter name="func" type="GHFunc"/>
-					<parameter name="user_data" type="gpointer"/>
-				</parameters>
-			</method>
-			<method name="get_empty" symbol="xfce_menu_item_pool_get_empty">
-				<return-type type="gboolean"/>
-				<parameters>
-					<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>
-		</object>
-		<object name="XfceMenuLayout" parent="GObject" type-name="XfceMenuLayout" get-type="xfce_menu_layout_get_type">
-			<method name="add_filename" symbol="xfce_menu_layout_add_filename">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="layout" type="XfceMenuLayout*"/>
-					<parameter name="filename" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="add_menuname" symbol="xfce_menu_layout_add_menuname">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="layout" type="XfceMenuLayout*"/>
-					<parameter name="menuname" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="add_merge" symbol="xfce_menu_layout_add_merge">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="layout" type="XfceMenuLayout*"/>
-					<parameter name="type" type="XfceMenuLayoutMergeType"/>
-				</parameters>
-			</method>
-			<method name="add_separator" symbol="xfce_menu_layout_add_separator">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="layout" type="XfceMenuLayout*"/>
-				</parameters>
-			</method>
-			<method name="get_filename_used" symbol="xfce_menu_layout_get_filename_used">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="layout" type="XfceMenuLayout*"/>
-					<parameter name="filename" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="get_menuname_used" symbol="xfce_menu_layout_get_menuname_used">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="layout" type="XfceMenuLayout*"/>
-					<parameter name="menuname" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="get_nodes" symbol="xfce_menu_layout_get_nodes">
-				<return-type type="GSList*"/>
-				<parameters>
-					<parameter name="layout" type="XfceMenuLayout*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="xfce_menu_layout_new">
-				<return-type type="XfceMenuLayout*"/>
-			</constructor>
-		</object>
-		<object name="XfceMenuMove" parent="GObject" type-name="XfceMenuMove" get-type="xfce_menu_move_get_type">
-			<method name="get_new" symbol="xfce_menu_move_get_new">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="move" type="XfceMenuMove*"/>
-				</parameters>
-			</method>
-			<method name="get_old" symbol="xfce_menu_move_get_old">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="move" type="XfceMenuMove*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="xfce_menu_move_new">
-				<return-type type="XfceMenuMove*"/>
-			</constructor>
-			<method name="set_new" symbol="xfce_menu_move_set_new">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="move" type="XfceMenuMove*"/>
-					<parameter name="new" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="set_old" symbol="xfce_menu_move_set_old">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="move" type="XfceMenuMove*"/>
-					<parameter name="old" type="gchar*"/>
-				</parameters>
-			</method>
-			<property name="new" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="old" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-		</object>
-		<object name="XfceMenuNotRules" parent="XfceMenuStandardRules" type-name="XfceMenuNotRules" get-type="xfce_menu_not_rules_get_type">
-			<implements>
-				<interface name="XfceMenuRules"/>
-			</implements>
-			<constructor name="new" symbol="xfce_menu_not_rules_new">
-				<return-type type="XfceMenuNotRules*"/>
-			</constructor>
-		</object>
-		<object name="XfceMenuOrRules" parent="XfceMenuStandardRules" type-name="XfceMenuOrRules" get-type="xfce_menu_or_rules_get_type">
-			<implements>
-				<interface name="XfceMenuRules"/>
-			</implements>
-			<constructor name="new" symbol="xfce_menu_or_rules_new">
-				<return-type type="XfceMenuOrRules*"/>
-			</constructor>
-		</object>
-		<object name="XfceMenuSeparator" parent="GObject" type-name="XfceMenuSeparator" get-type="xfce_menu_separator_get_type">
-			<implements>
-				<interface name="XfceMenuElement"/>
-			</implements>
-			<method name="get_default" symbol="xfce_menu_separator_get_default">
-				<return-type type="XfceMenuSeparator*"/>
-			</method>
-		</object>
-		<object name="XfceMenuStandardRules" parent="GObject" type-name="XfceMenuStandardRules" get-type="xfce_menu_standard_rules_get_type">
-			<implements>
-				<interface name="XfceMenuRules"/>
-			</implements>
-			<method name="get_include" symbol="xfce_menu_standard_rules_get_include">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="rules" type="XfceMenuStandardRules*"/>
-				</parameters>
-			</method>
-			<method name="set_include" symbol="xfce_menu_standard_rules_set_include">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="rules" type="XfceMenuStandardRules*"/>
-					<parameter name="include" type="gboolean"/>
-				</parameters>
-			</method>
-			<property name="include" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-			<field name="rules" type="GList*"/>
-			<field name="filenames" type="GList*"/>
-			<field name="categories" type="GList*"/>
-			<field name="all" type="guint"/>
-			<field name="include" type="gboolean"/>
-		</object>
-		<interface name="XfceMenuElement" type-name="XfceMenuElement" get-type="xfce_menu_element_get_type">
-			<requires>
-				<interface name="GObject"/>
-			</requires>
-			<method name="get_icon_name" symbol="xfce_menu_element_get_icon_name">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="element" type="XfceMenuElement*"/>
-				</parameters>
-			</method>
-			<method name="get_name" symbol="xfce_menu_element_get_name">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="element" type="XfceMenuElement*"/>
-				</parameters>
-			</method>
-			<vfunc name="get_icon_name">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="element" type="XfceMenuElement*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="get_name">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="element" type="XfceMenuElement*"/>
-				</parameters>
-			</vfunc>
-		</interface>
-		<interface name="XfceMenuRules" type-name="XfceMenuRules" get-type="xfce_menu_rules_get_type">
-			<requires>
-				<interface name="GObject"/>
-			</requires>
-			<method name="add_all" symbol="xfce_menu_rules_add_all">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="rules" type="XfceMenuRules*"/>
-				</parameters>
-			</method>
-			<method name="add_category" symbol="xfce_menu_rules_add_category">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="rules" type="XfceMenuRules*"/>
-					<parameter name="category" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="add_filename" symbol="xfce_menu_rules_add_filename">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="rules" type="XfceMenuRules*"/>
-					<parameter name="filename" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="add_rules" symbol="xfce_menu_rules_add_rules">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="rules" type="XfceMenuRules*"/>
-					<parameter name="additional_rules" type="XfceMenuRules*"/>
-				</parameters>
-			</method>
-			<method name="match" symbol="xfce_menu_rules_match">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="rules" type="XfceMenuRules*"/>
-					<parameter name="item" type="XfceMenuItem*"/>
-				</parameters>
-			</method>
-			<vfunc name="add_all">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="rules" type="XfceMenuRules*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="add_category">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="rules" type="XfceMenuRules*"/>
-					<parameter name="category" type="gchar*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="add_filename">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="rules" type="XfceMenuRules*"/>
-					<parameter name="filename" type="gchar*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="add_rules">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="rules" type="XfceMenuRules*"/>
-					<parameter name="additional_rules" type="XfceMenuRules*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="match">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="rules" type="XfceMenuRules*"/>
-					<parameter name="item" type="XfceMenuItem*"/>
-				</parameters>
-			</vfunc>
-		</interface>
-	</namespace>
-</api>
diff --git a/packages/libxfce4menu-0.1/libxfce4menu-0.1.metadata b/packages/libxfce4menu-0.1/libxfce4menu-0.1.metadata
deleted file mode 100644
index efa372a..0000000
--- a/packages/libxfce4menu-0.1/libxfce4menu-0.1.metadata
+++ /dev/null
@@ -1,50 +0,0 @@
-Xfce cheader_filename="libxfce4menu/libxfce4menu.h"
-
-xfce_menu_init hidden="1"
-xfce_menu_shutdown hidden="1"
-xfce_menu_get_environment hidden="1"
-xfce_menu_set_environment hidden="1"
-xfce_menu_monitor_add_directory hidden="1"
-xfce_menu_monitor_add_file hidden="1"
-xfce_menu_monitor_add_item hidden="1"
-xfce_menu_monitor_get_flags hidden="1"
-xfce_menu_monitor_has_flags hidden="1"
-xfce_menu_monitor_remove_directory hidden="1"
-xfce_menu_monitor_remove_file hidden="1"
-xfce_menu_monitor_remove_item hidden="1"
-xfce_menu_monitor_set_flags hidden="1"
-xfce_menu_monitor_set_vtable hidden="1"
-
-XfceMenu:deleted hidden="1"
-XfceMenu:directory hidden="1"
-XfceMenu:filename hidden="1"
-XfceMenu:name hidden="1"
-XfceMenu:only-unallocated hidden="1"
-
-XfceMenuDirectory:comment hidden="1"
-XfceMenuDirectory:filename hidden="1"
-XfceMenuDirectory:icon hidden="1"
-XfceMenuDirectory:name hidden="1"
-XfceMenuDirectory:no-display hidden="1"
-
-XfceMenuItem:command hidden="1"
-XfceMenuItem:comment hidden="1"
-XfceMenuItem:desktop-id hidden="1"
-XfceMenuItem:filename hidden="1"
-XfceMenuItem:generic-name hidden="1"
-XfceMenuItem:icon-name hidden="1"
-XfceMenuItem:name hidden="1"
-XfceMenuItem:no-display hidden="1"
-XfceMenuItem:path hidden="1"
-XfceMenuItem:set-path hidden="1"
-XfceMenuItem:requires-terminal hidden="1"
-XfceMenuItem:supports-startup-notification hidden="1"
-XfceMenuItem:try-exec hidden="1"
-
-xfce_menu_item_ref hidden="1"
-xfce_menu_item_unref hidden="1"
-
-XfceMenuMove:new hidden="1"
-XfceMenuMove:old hidden="1"
-
-XfceMenuStandardRules:include hidden="1"
diff --git a/packages/libxfce4panel-1.0/libxfce4panel-1.0-custom.vala b/packages/libxfce4panel-1.0/libxfce4panel-1.0-custom.vala
new file mode 100644
index 0000000..6afdf7d
--- /dev/null
+++ b/packages/libxfce4panel-1.0/libxfce4panel-1.0-custom.vala
@@ -0,0 +1,6 @@
+namespace Xfce {
+	public interface PanelPluginProvider {
+	}
+	public unowned Gtk.Button panel_create_button ();
+	public unowned Gtk.ToggleButton panel_create_toggle_button ();
+}
diff --git a/packages/libxfce4panel-1.0/libxfce4panel-1.0.defines b/packages/libxfce4panel-1.0/libxfce4panel-1.0.defines
new file mode 100644
index 0000000..2d37f49
--- /dev/null
+++ b/packages/libxfce4panel-1.0/libxfce4panel-1.0.defines
@@ -0,0 +1 @@
+-DLIBXFCE4PANEL_INSIDE_LIBXFCE4PANEL_H -DXFCE_DISABLE_DEPRECATED
diff --git a/vapi/libxfcegui4-1.0.deps b/packages/libxfce4panel-1.0/libxfce4panel-1.0.deps
similarity index 100%
rename from vapi/libxfcegui4-1.0.deps
rename to packages/libxfce4panel-1.0/libxfce4panel-1.0.deps
diff --git a/packages/libxfce4panel-1.0/libxfce4panel-1.0.excludes b/packages/libxfce4panel-1.0/libxfce4panel-1.0.excludes
new file mode 100644
index 0000000..ffd034d
--- /dev/null
+++ b/packages/libxfce4panel-1.0/libxfce4panel-1.0.excludes
@@ -0,0 +1,5 @@
+include/xfce4/libxfce4panel-1.0/libxfce4panel/libxfce4panel-config.h
+include/xfce4/libxfce4panel-1.0/libxfce4panel/libxfce4panel-deprecated.h
+include/xfce4/libxfce4panel-1.0/libxfce4panel/libxfce4panel.h
+include/xfce4/libxfce4panel-1.0/libxfce4panel/xfce-panel-image.h
+include/xfce4/libxfce4panel-1.0/libxfce4panel/xfce-panel-plugin-provider.h
diff --git a/packages/libxfce4panel-1.0/libxfce4panel-1.0.files b/packages/libxfce4panel-1.0/libxfce4panel-1.0.files
new file mode 100644
index 0000000..87d1da6
--- /dev/null
+++ b/packages/libxfce4panel-1.0/libxfce4panel-1.0.files
@@ -0,0 +1,2 @@
+include/xfce4/libxfce4panel-1.0/libxfce4panel
+lib/libxfce4panel-1.0.so
diff --git a/packages/libxfce4panel-1.0/libxfce4panel-1.0.gi b/packages/libxfce4panel-1.0/libxfce4panel-1.0.gi
new file mode 100644
index 0000000..534b0d2
--- /dev/null
+++ b/packages/libxfce4panel-1.0/libxfce4panel-1.0.gi
@@ -0,0 +1,394 @@
+<?xml version="1.0"?>
+<api version="1.0">
+	<namespace name="Xfce">
+		<function name="panel_allow_customization" symbol="xfce_panel_allow_customization">
+			<return-type type="gboolean"/>
+		</function>
+		<function name="panel_create_button" symbol="xfce_panel_create_button">
+			<return-type type="GtkWidget*"/>
+		</function>
+		<function name="panel_create_toggle_button" symbol="xfce_panel_create_toggle_button">
+			<return-type type="GtkWidget*"/>
+		</function>
+		<callback name="XfcePanelPluginCheck">
+			<return-type type="gboolean"/>
+			<parameters>
+				<parameter name="screen" type="GdkScreen*"/>
+			</parameters>
+		</callback>
+		<callback name="XfcePanelPluginFunc">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="plugin" type="XfcePanelPlugin*"/>
+			</parameters>
+		</callback>
+		<callback name="XfcePanelPluginPreInit">
+			<return-type type="gboolean"/>
+			<parameters>
+				<parameter name="argc" type="gint"/>
+				<parameter name="argv" type="gchar**"/>
+			</parameters>
+		</callback>
+		<struct name="XfcePanelTypeModule">
+		</struct>
+		<enum name="XfceScreenPosition" type-name="XfceScreenPosition" get-type="xfce_screen_position_get_type">
+			<member name="XFCE_SCREEN_POSITION_NONE" value="0"/>
+			<member name="XFCE_SCREEN_POSITION_NW_H" value="1"/>
+			<member name="XFCE_SCREEN_POSITION_N" value="2"/>
+			<member name="XFCE_SCREEN_POSITION_NE_H" value="3"/>
+			<member name="XFCE_SCREEN_POSITION_NW_V" value="4"/>
+			<member name="XFCE_SCREEN_POSITION_W" value="5"/>
+			<member name="XFCE_SCREEN_POSITION_SW_V" value="6"/>
+			<member name="XFCE_SCREEN_POSITION_NE_V" value="7"/>
+			<member name="XFCE_SCREEN_POSITION_E" value="8"/>
+			<member name="XFCE_SCREEN_POSITION_SE_V" value="9"/>
+			<member name="XFCE_SCREEN_POSITION_SW_H" value="10"/>
+			<member name="XFCE_SCREEN_POSITION_S" value="11"/>
+			<member name="XFCE_SCREEN_POSITION_SE_H" value="12"/>
+			<member name="XFCE_SCREEN_POSITION_FLOATING_H" value="13"/>
+			<member name="XFCE_SCREEN_POSITION_FLOATING_V" value="14"/>
+		</enum>
+		<object name="XfceArrowButton" parent="GtkToggleButton" type-name="XfceArrowButton" get-type="xfce_arrow_button_get_type">
+			<implements>
+				<interface name="GtkActivatable"/>
+				<interface name="GtkBuildable"/>
+				<interface name="AtkImplementor"/>
+			</implements>
+			<method name="get_arrow_type" symbol="xfce_arrow_button_get_arrow_type">
+				<return-type type="GtkArrowType"/>
+				<parameters>
+					<parameter name="button" type="XfceArrowButton*"/>
+				</parameters>
+			</method>
+			<method name="get_blinking" symbol="xfce_arrow_button_get_blinking">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="button" type="XfceArrowButton*"/>
+				</parameters>
+			</method>
+			<constructor name="new" symbol="xfce_arrow_button_new">
+				<return-type type="GtkWidget*"/>
+				<parameters>
+					<parameter name="arrow_type" type="GtkArrowType"/>
+				</parameters>
+			</constructor>
+			<method name="set_arrow_type" symbol="xfce_arrow_button_set_arrow_type">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="button" type="XfceArrowButton*"/>
+					<parameter name="arrow_type" type="GtkArrowType"/>
+				</parameters>
+			</method>
+			<method name="set_blinking" symbol="xfce_arrow_button_set_blinking">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="button" type="XfceArrowButton*"/>
+					<parameter name="blinking" type="gboolean"/>
+				</parameters>
+			</method>
+			<property name="arrow-type" type="GtkArrowType" readable="1" writable="1" construct="0" construct-only="0"/>
+			<signal name="arrow-type-changed" when="LAST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="button" type="XfceArrowButton*"/>
+					<parameter name="type" type="GtkArrowType"/>
+				</parameters>
+			</signal>
+		</object>
+		<object name="XfceHVBox" parent="GtkBox" type-name="XfceHVBox" get-type="xfce_hvbox_get_type">
+			<implements>
+				<interface name="GtkBuildable"/>
+				<interface name="AtkImplementor"/>
+				<interface name="GtkOrientable"/>
+			</implements>
+			<method name="get_orientation" symbol="xfce_hvbox_get_orientation">
+				<return-type type="GtkOrientation"/>
+				<parameters>
+					<parameter name="hvbox" type="XfceHVBox*"/>
+				</parameters>
+			</method>
+			<constructor name="new" symbol="xfce_hvbox_new">
+				<return-type type="GtkWidget*"/>
+				<parameters>
+					<parameter name="orientation" type="GtkOrientation"/>
+					<parameter name="homogeneous" type="gboolean"/>
+					<parameter name="spacing" type="gint"/>
+				</parameters>
+			</constructor>
+			<method name="set_orientation" symbol="xfce_hvbox_set_orientation">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="hvbox" type="XfceHVBox*"/>
+					<parameter name="orientation" type="GtkOrientation"/>
+				</parameters>
+			</method>
+			<field name="orientation" type="GtkOrientation"/>
+		</object>
+		<object name="XfcePanelPlugin" parent="GtkEventBox" type-name="XfcePanelPlugin" get-type="xfce_panel_plugin_get_type">
+			<implements>
+				<interface name="GtkBuildable"/>
+				<interface name="AtkImplementor"/>
+				<interface name="XfcePanelPluginProvider"/>
+			</implements>
+			<method name="add_action_widget" symbol="xfce_panel_plugin_add_action_widget">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="plugin" type="XfcePanelPlugin*"/>
+					<parameter name="widget" type="GtkWidget*"/>
+				</parameters>
+			</method>
+			<method name="arrow_type" symbol="xfce_panel_plugin_arrow_type">
+				<return-type type="GtkArrowType"/>
+				<parameters>
+					<parameter name="plugin" type="XfcePanelPlugin*"/>
+				</parameters>
+			</method>
+			<method name="block_autohide" symbol="xfce_panel_plugin_block_autohide">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="plugin" type="XfcePanelPlugin*"/>
+					<parameter name="blocked" type="gboolean"/>
+				</parameters>
+			</method>
+			<method name="block_menu" symbol="xfce_panel_plugin_block_menu">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="plugin" type="XfcePanelPlugin*"/>
+				</parameters>
+			</method>
+			<method name="focus_widget" symbol="xfce_panel_plugin_focus_widget">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="plugin" type="XfcePanelPlugin*"/>
+					<parameter name="widget" type="GtkWidget*"/>
+				</parameters>
+			</method>
+			<method name="get_arguments" symbol="xfce_panel_plugin_get_arguments">
+				<return-type type="gchar**"/>
+				<parameters>
+					<parameter name="plugin" type="XfcePanelPlugin*"/>
+				</parameters>
+			</method>
+			<method name="get_comment" symbol="xfce_panel_plugin_get_comment">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="plugin" type="XfcePanelPlugin*"/>
+				</parameters>
+			</method>
+			<method name="get_display_name" symbol="xfce_panel_plugin_get_display_name">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="plugin" type="XfcePanelPlugin*"/>
+				</parameters>
+			</method>
+			<method name="get_expand" symbol="xfce_panel_plugin_get_expand">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="plugin" type="XfcePanelPlugin*"/>
+				</parameters>
+			</method>
+			<method name="get_name" symbol="xfce_panel_plugin_get_name">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="plugin" type="XfcePanelPlugin*"/>
+				</parameters>
+			</method>
+			<method name="get_orientation" symbol="xfce_panel_plugin_get_orientation">
+				<return-type type="GtkOrientation"/>
+				<parameters>
+					<parameter name="plugin" type="XfcePanelPlugin*"/>
+				</parameters>
+			</method>
+			<method name="get_property_base" symbol="xfce_panel_plugin_get_property_base">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="plugin" type="XfcePanelPlugin*"/>
+				</parameters>
+			</method>
+			<method name="get_screen_position" symbol="xfce_panel_plugin_get_screen_position">
+				<return-type type="XfceScreenPosition"/>
+				<parameters>
+					<parameter name="plugin" type="XfcePanelPlugin*"/>
+				</parameters>
+			</method>
+			<method name="get_size" symbol="xfce_panel_plugin_get_size">
+				<return-type type="gint"/>
+				<parameters>
+					<parameter name="plugin" type="XfcePanelPlugin*"/>
+				</parameters>
+			</method>
+			<method name="get_unique_id" symbol="xfce_panel_plugin_get_unique_id">
+				<return-type type="gint"/>
+				<parameters>
+					<parameter name="plugin" type="XfcePanelPlugin*"/>
+				</parameters>
+			</method>
+			<method name="lookup_rc_file" symbol="xfce_panel_plugin_lookup_rc_file">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="plugin" type="XfcePanelPlugin*"/>
+				</parameters>
+			</method>
+			<method name="menu_insert_item" symbol="xfce_panel_plugin_menu_insert_item">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="plugin" type="XfcePanelPlugin*"/>
+					<parameter name="item" type="GtkMenuItem*"/>
+				</parameters>
+			</method>
+			<method name="menu_show_about" symbol="xfce_panel_plugin_menu_show_about">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="plugin" type="XfcePanelPlugin*"/>
+				</parameters>
+			</method>
+			<method name="menu_show_configure" symbol="xfce_panel_plugin_menu_show_configure">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="plugin" type="XfcePanelPlugin*"/>
+				</parameters>
+			</method>
+			<method name="position_menu" symbol="xfce_panel_plugin_position_menu">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="menu" type="GtkMenu*"/>
+					<parameter name="x" type="gint*"/>
+					<parameter name="y" type="gint*"/>
+					<parameter name="push_in" type="gboolean*"/>
+					<parameter name="panel_plugin" type="gpointer"/>
+				</parameters>
+			</method>
+			<method name="position_widget" symbol="xfce_panel_plugin_position_widget">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="plugin" type="XfcePanelPlugin*"/>
+					<parameter name="menu_widget" type="GtkWidget*"/>
+					<parameter name="attach_widget" type="GtkWidget*"/>
+					<parameter name="x" type="gint*"/>
+					<parameter name="y" type="gint*"/>
+				</parameters>
+			</method>
+			<method name="register_menu" symbol="xfce_panel_plugin_register_menu">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="plugin" type="XfcePanelPlugin*"/>
+					<parameter name="menu" type="GtkMenu*"/>
+				</parameters>
+			</method>
+			<method name="save_location" symbol="xfce_panel_plugin_save_location">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="plugin" type="XfcePanelPlugin*"/>
+					<parameter name="create" type="gboolean"/>
+				</parameters>
+			</method>
+			<method name="set_expand" symbol="xfce_panel_plugin_set_expand">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="plugin" type="XfcePanelPlugin*"/>
+					<parameter name="expand" type="gboolean"/>
+				</parameters>
+			</method>
+			<method name="take_window" symbol="xfce_panel_plugin_take_window">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="plugin" type="XfcePanelPlugin*"/>
+					<parameter name="window" type="GtkWindow*"/>
+				</parameters>
+			</method>
+			<method name="unblock_menu" symbol="xfce_panel_plugin_unblock_menu">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="plugin" type="XfcePanelPlugin*"/>
+				</parameters>
+			</method>
+			<property name="arguments" type="GStrv*" readable="1" writable="1" construct="0" construct-only="1"/>
+			<property name="comment" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
+			<property name="display-name" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
+			<property name="expand" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="name" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
+			<property name="orientation" type="GtkOrientation" readable="1" writable="0" construct="0" construct-only="0"/>
+			<property name="screen-position" type="XfceScreenPosition" readable="1" writable="0" construct="0" construct-only="0"/>
+			<property name="size" type="gint" readable="1" writable="0" construct="0" construct-only="0"/>
+			<property name="unique-id" type="gint" readable="1" writable="1" construct="0" construct-only="1"/>
+			<signal name="about" when="LAST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="plugin" type="XfcePanelPlugin*"/>
+				</parameters>
+			</signal>
+			<signal name="configure-plugin" when="LAST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="plugin" type="XfcePanelPlugin*"/>
+				</parameters>
+			</signal>
+			<signal name="free-data" when="LAST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="plugin" type="XfcePanelPlugin*"/>
+				</parameters>
+			</signal>
+			<signal name="orientation-changed" when="LAST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="plugin" type="XfcePanelPlugin*"/>
+					<parameter name="orientation" type="GtkOrientation"/>
+				</parameters>
+			</signal>
+			<signal name="remote-event" when="LAST">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="plugin" type="XfcePanelPlugin*"/>
+					<parameter name="name" type="char*"/>
+					<parameter name="value" type="GValue*"/>
+				</parameters>
+			</signal>
+			<signal name="removed" when="LAST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="plugin" type="XfcePanelPlugin*"/>
+				</parameters>
+			</signal>
+			<signal name="save" when="LAST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="plugin" type="XfcePanelPlugin*"/>
+				</parameters>
+			</signal>
+			<signal name="screen-position-changed" when="LAST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="plugin" type="XfcePanelPlugin*"/>
+					<parameter name="position" type="XfceScreenPosition"/>
+				</parameters>
+			</signal>
+			<signal name="size-changed" when="LAST">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="plugin" type="XfcePanelPlugin*"/>
+					<parameter name="size" type="gint"/>
+				</parameters>
+			</signal>
+			<vfunc name="construct">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="plugin" type="XfcePanelPlugin*"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="reserved1">
+				<return-type type="void"/>
+			</vfunc>
+			<vfunc name="reserved2">
+				<return-type type="void"/>
+			</vfunc>
+			<vfunc name="reserved3">
+				<return-type type="void"/>
+			</vfunc>
+			<vfunc name="reserved4">
+				<return-type type="void"/>
+			</vfunc>
+		</object>
+		<constant name="XFCE_PANEL_PLUGIN_CHANNEL_NAME" type="char*" value="xfce4-panel"/>
+	</namespace>
+</api>
diff --git a/packages/libxfce4panel-1.0/libxfce4panel-1.0.metadata b/packages/libxfce4panel-1.0/libxfce4panel-1.0.metadata
new file mode 100644
index 0000000..be136a3
--- /dev/null
+++ b/packages/libxfce4panel-1.0/libxfce4panel-1.0.metadata
@@ -0,0 +1,15 @@
+Xfce cheader_filename="libxfce4panel/libxfce4panel.h"
+
+xfce_panel_create_button hidden="1"
+xfce_panel_create_toggle_button hidden="1"
+
+xfce_panel_plugin_reserved1 hidden="1"
+xfce_panel_plugin_reserved2 hidden="1"
+xfce_panel_plugin_reserved3 hidden="1"
+xfce_panel_plugin_reserved4 hidden="1"
+
+ScaledImageClass hidden="1"
+G_PARAM_STATIC_STRINGS hidden="1"
+PANEL_PARAM_READABLE hidden="1"
+PANEL_PARAM_READWRITE hidden="1"
+PANEL_PARAM_WRITABLE hidden="1"
diff --git a/packages/libxfce4menu-0.1/libxfce4menu-0.1.namespace b/packages/libxfce4panel-1.0/libxfce4panel-1.0.namespace
similarity index 100%
rename from packages/libxfce4menu-0.1/libxfce4menu-0.1.namespace
rename to packages/libxfce4panel-1.0/libxfce4panel-1.0.namespace
diff --git a/packages/libxfce4ui-1/libxfce4ui-1.defines b/packages/libxfce4ui-1/libxfce4ui-1.defines
new file mode 100644
index 0000000..30dbd62
--- /dev/null
+++ b/packages/libxfce4ui-1/libxfce4ui-1.defines
@@ -0,0 +1 @@
+-DLIBXFCE4UI_INSIDE_LIBXFCE4UI_H -DXFCE_DISABLE_DEPRECATED
diff --git a/packages/libxfcegui4-1.0/libxfcegui4-1.0.deps b/packages/libxfce4ui-1/libxfce4ui-1.deps
similarity index 100%
copy from packages/libxfcegui4-1.0/libxfcegui4-1.0.deps
copy to packages/libxfce4ui-1/libxfce4ui-1.deps
diff --git a/packages/libxfce4ui-1/libxfce4ui-1.excludes b/packages/libxfce4ui-1/libxfce4ui-1.excludes
new file mode 100644
index 0000000..b943ec0
--- /dev/null
+++ b/packages/libxfce4ui-1/libxfce4ui-1.excludes
@@ -0,0 +1 @@
+include/xfce4/libxfce4ui-1/libxfce4ui/libxfce4ui.h
diff --git a/packages/libxfce4ui-1/libxfce4ui-1.files b/packages/libxfce4ui-1/libxfce4ui-1.files
new file mode 100644
index 0000000..e4e31eb
--- /dev/null
+++ b/packages/libxfce4ui-1/libxfce4ui-1.files
@@ -0,0 +1,2 @@
+include/xfce4/libxfce4ui-1/libxfce4ui
+lib/libxfce4ui-1.so
diff --git a/packages/libxfce4ui-1/libxfce4ui-1.gi b/packages/libxfce4ui-1/libxfce4ui-1.gi
new file mode 100644
index 0000000..e136ef7
--- /dev/null
+++ b/packages/libxfce4ui-1/libxfce4ui-1.gi
@@ -0,0 +1,401 @@
+<?xml version="1.0"?>
+<api version="1.0">
+	<namespace name="Xfce">
+		<function name="dialog_confirm" symbol="xfce_dialog_confirm">
+			<return-type type="gboolean"/>
+			<parameters>
+				<parameter name="parent" type="GtkWindow*"/>
+				<parameter name="stock_id" type="gchar*"/>
+				<parameter name="confirm_label" type="gchar*"/>
+				<parameter name="secondary_text" type="gchar*"/>
+				<parameter name="primary_format" type="gchar*"/>
+			</parameters>
+		</function>
+		<function name="dialog_show_error" symbol="xfce_dialog_show_error">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="parent" type="GtkWindow*"/>
+				<parameter name="error" type="GError*"/>
+				<parameter name="primary_format" type="gchar*"/>
+			</parameters>
+		</function>
+		<function name="dialog_show_info" symbol="xfce_dialog_show_info">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="parent" type="GtkWindow*"/>
+				<parameter name="secondary_text" type="gchar*"/>
+				<parameter name="primary_format" type="gchar*"/>
+			</parameters>
+		</function>
+		<function name="dialog_show_warning" symbol="xfce_dialog_show_warning">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="parent" type="GtkWindow*"/>
+				<parameter name="secondary_text" type="gchar*"/>
+				<parameter name="primary_format" type="gchar*"/>
+			</parameters>
+		</function>
+		<function name="gdk_screen_get_active" symbol="xfce_gdk_screen_get_active">
+			<return-type type="GdkScreen*"/>
+			<parameters>
+				<parameter name="monitor_return" type="gint*"/>
+			</parameters>
+		</function>
+		<function name="gtk_button_new_mixed" symbol="xfce_gtk_button_new_mixed">
+			<return-type type="GtkWidget*"/>
+			<parameters>
+				<parameter name="stock_id" type="gchar*"/>
+				<parameter name="label" type="gchar*"/>
+			</parameters>
+		</function>
+		<function name="gtk_frame_box_new" symbol="xfce_gtk_frame_box_new">
+			<return-type type="GtkWidget*"/>
+			<parameters>
+				<parameter name="label" type="gchar*"/>
+				<parameter name="container_return" type="GtkWidget**"/>
+			</parameters>
+		</function>
+		<function name="gtk_frame_box_new_with_content" symbol="xfce_gtk_frame_box_new_with_content">
+			<return-type type="GtkWidget*"/>
+			<parameters>
+				<parameter name="label" type="gchar*"/>
+				<parameter name="content" type="GtkWidget*"/>
+			</parameters>
+		</function>
+		<function name="gtk_window_center_on_active_screen" symbol="xfce_gtk_window_center_on_active_screen">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="window" type="GtkWindow*"/>
+			</parameters>
+		</function>
+		<function name="libxfce4ui_check_version" symbol="libxfce4ui_check_version">
+			<return-type type="gchar*"/>
+			<parameters>
+				<parameter name="required_major" type="guint"/>
+				<parameter name="required_minor" type="guint"/>
+				<parameter name="required_micro" type="guint"/>
+			</parameters>
+		</function>
+		<function name="message_dialog" symbol="xfce_message_dialog">
+			<return-type type="gint"/>
+			<parameters>
+				<parameter name="parent" type="GtkWindow*"/>
+				<parameter name="title" type="gchar*"/>
+				<parameter name="stock_id" type="gchar*"/>
+				<parameter name="primary_text" type="gchar*"/>
+				<parameter name="secondary_text" type="gchar*"/>
+				<parameter name="first_button_text" type="gchar*"/>
+			</parameters>
+		</function>
+		<function name="message_dialog_new" symbol="xfce_message_dialog_new">
+			<return-type type="GtkWidget*"/>
+			<parameters>
+				<parameter name="parent" type="GtkWindow*"/>
+				<parameter name="title" type="gchar*"/>
+				<parameter name="stock_id" type="gchar*"/>
+				<parameter name="primary_text" type="gchar*"/>
+				<parameter name="secondary_text" type="gchar*"/>
+				<parameter name="first_button_text" type="gchar*"/>
+			</parameters>
+		</function>
+		<function name="message_dialog_new_valist" symbol="xfce_message_dialog_new_valist">
+			<return-type type="GtkWidget*"/>
+			<parameters>
+				<parameter name="parent" type="GtkWindow*"/>
+				<parameter name="title" type="gchar*"/>
+				<parameter name="icon_stock_id" type="gchar*"/>
+				<parameter name="primary_text" type="gchar*"/>
+				<parameter name="secondary_text" type="gchar*"/>
+				<parameter name="first_button_text" type="gchar*"/>
+				<parameter name="args" type="va_list"/>
+			</parameters>
+		</function>
+		<function name="spawn_command_line_on_screen" symbol="xfce_spawn_command_line_on_screen">
+			<return-type type="gboolean"/>
+			<parameters>
+				<parameter name="screen" type="GdkScreen*"/>
+				<parameter name="command_line" type="gchar*"/>
+				<parameter name="in_terminal" type="gboolean"/>
+				<parameter name="startup_notify" type="gboolean"/>
+				<parameter name="error" type="GError**"/>
+			</parameters>
+		</function>
+		<function name="spawn_on_screen" symbol="xfce_spawn_on_screen">
+			<return-type type="gboolean"/>
+			<parameters>
+				<parameter name="screen" type="GdkScreen*"/>
+				<parameter name="working_directory" type="gchar*"/>
+				<parameter name="argv" type="gchar**"/>
+				<parameter name="envp" type="gchar**"/>
+				<parameter name="flags" type="GSpawnFlags"/>
+				<parameter name="startup_notify" type="gboolean"/>
+				<parameter name="startup_timestamp" type="guint32"/>
+				<parameter name="startup_icon_name" type="gchar*"/>
+				<parameter name="error" type="GError**"/>
+			</parameters>
+		</function>
+		<function name="spawn_on_screen_with_child_watch" symbol="xfce_spawn_on_screen_with_child_watch">
+			<return-type type="gboolean"/>
+			<parameters>
+				<parameter name="screen" type="GdkScreen*"/>
+				<parameter name="working_directory" type="gchar*"/>
+				<parameter name="argv" type="gchar**"/>
+				<parameter name="envp" type="gchar**"/>
+				<parameter name="flags" type="GSpawnFlags"/>
+				<parameter name="startup_notify" type="gboolean"/>
+				<parameter name="startup_timestamp" type="guint32"/>
+				<parameter name="startup_icon_name" type="gchar*"/>
+				<parameter name="child_watch_closure" type="GClosure*"/>
+				<parameter name="error" type="GError**"/>
+			</parameters>
+		</function>
+		<enum name="XfceSMClientPriority">
+			<member name="XFCE_SM_CLIENT_PRIORITY_HIGHEST" value="0"/>
+			<member name="XFCE_SM_CLIENT_PRIORITY_WM" value="15"/>
+			<member name="XFCE_SM_CLIENT_PRIORITY_CORE" value="25"/>
+			<member name="XFCE_SM_CLIENT_PRIORITY_DESKTOP" value="35"/>
+			<member name="XFCE_SM_CLIENT_PRIORITY_DEFAULT" value="50"/>
+			<member name="XFCE_SM_CLIENT_PRIORITY_LOWEST" value="255"/>
+		</enum>
+		<enum name="XfceSMClientRestartStyle" type-name="XfceSMClientRestartStyle" get-type="xfce_sm_client_restart_style_get_type">
+			<member name="XFCE_SM_CLIENT_RESTART_NORMAL" value="0"/>
+			<member name="XFCE_SM_CLIENT_RESTART_IMMEDIATELY" value="1"/>
+		</enum>
+		<enum name="XfceSMClientShutdownHint" type-name="XfceSMClientShutdownHint" get-type="xfce_sm_client_shutdown_hint_get_type">
+			<member name="XFCE_SM_CLIENT_SHUTDOWN_HINT_ASK" value="0"/>
+			<member name="XFCE_SM_CLIENT_SHUTDOWN_HINT_LOGOUT" value="1"/>
+			<member name="XFCE_SM_CLIENT_SHUTDOWN_HINT_HALT" value="2"/>
+			<member name="XFCE_SM_CLIENT_SHUTDOWN_HINT_REBOOT" value="3"/>
+		</enum>
+		<object name="XfceSMClient" parent="GObject" type-name="XfceSMClient" get-type="xfce_sm_client_get_type">
+			<method name="connect" symbol="xfce_sm_client_connect">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="sm_client" type="XfceSMClient*"/>
+					<parameter name="error" type="GError**"/>
+				</parameters>
+			</method>
+			<method name="disconnect" symbol="xfce_sm_client_disconnect">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="sm_client" type="XfceSMClient*"/>
+				</parameters>
+			</method>
+			<method name="get" symbol="xfce_sm_client_get">
+				<return-type type="XfceSMClient*"/>
+			</method>
+			<method name="get_client_id" symbol="xfce_sm_client_get_client_id">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="sm_client" type="XfceSMClient*"/>
+				</parameters>
+			</method>
+			<method name="get_current_directory" symbol="xfce_sm_client_get_current_directory">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="sm_client" type="XfceSMClient*"/>
+				</parameters>
+			</method>
+			<method name="get_full" symbol="xfce_sm_client_get_full">
+				<return-type type="XfceSMClient*"/>
+				<parameters>
+					<parameter name="restart_style" type="XfceSMClientRestartStyle"/>
+					<parameter name="priority" type="guchar"/>
+					<parameter name="resumed_client_id" type="gchar*"/>
+					<parameter name="current_directory" type="gchar*"/>
+					<parameter name="restart_command" type="gchar**"/>
+					<parameter name="desktop_file" type="gchar*"/>
+				</parameters>
+			</method>
+			<method name="get_option_group" symbol="xfce_sm_client_get_option_group">
+				<return-type type="GOptionGroup*"/>
+				<parameters>
+					<parameter name="argc" type="gint"/>
+					<parameter name="argv" type="gchar**"/>
+				</parameters>
+			</method>
+			<method name="get_priority" symbol="xfce_sm_client_get_priority">
+				<return-type type="guint8"/>
+				<parameters>
+					<parameter name="sm_client" type="XfceSMClient*"/>
+				</parameters>
+			</method>
+			<method name="get_restart_command" symbol="xfce_sm_client_get_restart_command">
+				<return-type type="gchar**"/>
+				<parameters>
+					<parameter name="sm_client" type="XfceSMClient*"/>
+				</parameters>
+			</method>
+			<method name="get_restart_style" symbol="xfce_sm_client_get_restart_style">
+				<return-type type="XfceSMClientRestartStyle"/>
+				<parameters>
+					<parameter name="sm_client" type="XfceSMClient*"/>
+				</parameters>
+			</method>
+			<method name="get_state_file" symbol="xfce_sm_client_get_state_file">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="sm_client" type="XfceSMClient*"/>
+				</parameters>
+			</method>
+			<method name="get_with_argv" symbol="xfce_sm_client_get_with_argv">
+				<return-type type="XfceSMClient*"/>
+				<parameters>
+					<parameter name="argc" type="gint"/>
+					<parameter name="argv" type="gchar**"/>
+					<parameter name="restart_style" type="XfceSMClientRestartStyle"/>
+					<parameter name="priority" type="guchar"/>
+				</parameters>
+			</method>
+			<method name="is_connected" symbol="xfce_sm_client_is_connected">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="sm_client" type="XfceSMClient*"/>
+				</parameters>
+			</method>
+			<method name="is_resumed" symbol="xfce_sm_client_is_resumed">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="sm_client" type="XfceSMClient*"/>
+				</parameters>
+			</method>
+			<method name="request_shutdown" symbol="xfce_sm_client_request_shutdown">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="sm_client" type="XfceSMClient*"/>
+					<parameter name="shutdown_hint" type="XfceSMClientShutdownHint"/>
+				</parameters>
+			</method>
+			<method name="set_current_directory" symbol="xfce_sm_client_set_current_directory">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="sm_client" type="XfceSMClient*"/>
+					<parameter name="current_directory" type="gchar*"/>
+				</parameters>
+			</method>
+			<method name="set_desktop_file" symbol="xfce_sm_client_set_desktop_file">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="sm_client" type="XfceSMClient*"/>
+					<parameter name="desktop_file" type="gchar*"/>
+				</parameters>
+			</method>
+			<method name="set_priority" symbol="xfce_sm_client_set_priority">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="sm_client" type="XfceSMClient*"/>
+					<parameter name="priority" type="guint8"/>
+				</parameters>
+			</method>
+			<method name="set_restart_command" symbol="xfce_sm_client_set_restart_command">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="sm_client" type="XfceSMClient*"/>
+					<parameter name="restart_command" type="gchar**"/>
+				</parameters>
+			</method>
+			<method name="set_restart_style" symbol="xfce_sm_client_set_restart_style">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="sm_client" type="XfceSMClient*"/>
+					<parameter name="restart_style" type="XfceSMClientRestartStyle"/>
+				</parameters>
+			</method>
+			<property name="argc" type="gint" readable="0" writable="1" construct="0" construct-only="1"/>
+			<property name="argv" type="GStrv*" readable="0" writable="1" construct="0" construct-only="1"/>
+			<property name="client-id" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
+			<property name="current-directory" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="desktop-file" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="priority" type="guchar" readable="1" writable="1" construct="1" construct-only="0"/>
+			<property name="restart-command" type="GStrv*" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="restart-style" type="XfceSMClientRestartStyle" readable="1" writable="1" construct="1" construct-only="0"/>
+			<property name="resumed" type="gboolean" readable="1" writable="0" construct="0" construct-only="0"/>
+			<signal name="quit" when="LAST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="object" type="XfceSMClient*"/>
+				</parameters>
+			</signal>
+			<signal name="quit-cancelled" when="LAST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="object" type="XfceSMClient*"/>
+				</parameters>
+			</signal>
+			<signal name="quit-requested" when="LAST">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="object" type="XfceSMClient*"/>
+				</parameters>
+			</signal>
+			<signal name="save-state" when="LAST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="object" type="XfceSMClient*"/>
+					<parameter name="p0" type="gboolean"/>
+				</parameters>
+			</signal>
+			<signal name="save-state-extended" when="LAST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="object" type="XfceSMClient*"/>
+				</parameters>
+			</signal>
+		</object>
+		<object name="XfceTitledDialog" parent="GtkDialog" type-name="XfceTitledDialog" get-type="xfce_titled_dialog_get_type">
+			<implements>
+				<interface name="GtkBuildable"/>
+				<interface name="AtkImplementor"/>
+			</implements>
+			<method name="get_subtitle" symbol="xfce_titled_dialog_get_subtitle">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="titled_dialog" type="XfceTitledDialog*"/>
+				</parameters>
+			</method>
+			<constructor name="new" symbol="xfce_titled_dialog_new">
+				<return-type type="GtkWidget*"/>
+			</constructor>
+			<constructor name="new_with_buttons" symbol="xfce_titled_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>
+			<method name="set_subtitle" symbol="xfce_titled_dialog_set_subtitle">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="titled_dialog" type="XfceTitledDialog*"/>
+					<parameter name="subtitle" type="gchar*"/>
+				</parameters>
+			</method>
+			<property name="subtitle" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+			<vfunc name="reserved0">
+				<return-type type="void"/>
+			</vfunc>
+			<vfunc name="reserved1">
+				<return-type type="void"/>
+			</vfunc>
+			<vfunc name="reserved2">
+				<return-type type="void"/>
+			</vfunc>
+			<vfunc name="reserved3">
+				<return-type type="void"/>
+			</vfunc>
+			<vfunc name="reserved4">
+				<return-type type="void"/>
+			</vfunc>
+			<vfunc name="reserved5">
+				<return-type type="void"/>
+			</vfunc>
+		</object>
+		<constant name="LIBXFCE4UI_MAJOR_VERSION" type="int" value="4"/>
+		<constant name="LIBXFCE4UI_MICRO_VERSION" type="int" value="1"/>
+		<constant name="LIBXFCE4UI_MINOR_VERSION" type="int" value="7"/>
+		<constant name="XFCE_BUTTON_TYPE_MIXED" type="char*" value="button-mixed"/>
+		<constant name="XFCE_BUTTON_TYPE_PIXBUF" type="char*" value="button-pixbuf"/>
+	</namespace>
+</api>
diff --git a/packages/libxfce4ui-1/libxfce4ui-1.metadata b/packages/libxfce4ui-1/libxfce4ui-1.metadata
new file mode 100644
index 0000000..806207b
--- /dev/null
+++ b/packages/libxfce4ui-1/libxfce4ui-1.metadata
@@ -0,0 +1,3 @@
+Xfce cheader_filename="libxfce4ui/libxfce4ui.h"
+
+xfce_titled_dialog_reserved* hidden="1"
diff --git a/packages/libxfcegui4-1.0/libxfcegui4-1.0.namespace b/packages/libxfce4ui-1/libxfce4ui-1.namespace
similarity index 100%
rename from packages/libxfcegui4-1.0/libxfcegui4-1.0.namespace
rename to packages/libxfce4ui-1/libxfce4ui-1.namespace
diff --git a/packages/libxfce4util-1.0/libxfce4util-1.0-custom.vala b/packages/libxfce4util-1.0/libxfce4util-1.0-custom.vala
index d16d57f..0161b32 100644
--- a/packages/libxfce4util-1.0/libxfce4util-1.0-custom.vala
+++ b/packages/libxfce4util-1.0/libxfce4util-1.0-custom.vala
@@ -39,7 +39,7 @@ 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 weak string get_license_text (Xfce.LicenseTextType license_type);
 	public static void textdomain (string package, string localedir, string? encoding = null);
 
 }
diff --git a/packages/libxfcegui4-1.0/libxfcegui4-1.0-custom.vala b/packages/libxfcegui4-1.0/libxfcegui4-1.0-custom.vala
deleted file mode 100644
index 4522996..0000000
--- a/packages/libxfcegui4-1.0/libxfcegui4-1.0-custom.vala
+++ /dev/null
@@ -1,74 +0,0 @@
-namespace Xfce {
-
-	/* dialogs.h */
-	[Compact]
-	public class Dialog {
-		[CCode (cname = "xfce_confirm")]
-		public static bool confirm (string text, string stock_id, string? action);
-		[CCode (cname = "xfce_err")]
-		public static void error (string format);
-		[CCode (cname = "xfce_info")]
-		public static void info (string format);
-		[CCode (cname = "xfce_warn")]
-		public static void warning (string format);
-		/*
-		[CCode (cname = "xfce_message_dialog")]
-		public static int message (Gtk.Window parent, string title, string icon_id, string primary_text, string secondary_text, ...);
-		[CCode (cname = "xfce_message_dialog_new")]
-		public static unowned Gtk.Widget message_new (Gtk.Window parent, string title, string icon_id, string primary_text, string secondary_text, ...);
-		*/
-	}
-
-	/* icons.h */
-	[Compact]
-	public class Icon {
-		[CCode (cname = "xfce_inline_icon_at_size")]
-		public static Gdk.Pixbuf inline_at_size (string data, int width, int height);
-		[CCode (cname = "xfce_themed_icon_load")]
-		public static Gdk.Pixbuf load (string name, int size);
-		[CCode (cname = "xfce_themed_icon_lookup")]
-		public static string lookup (string name, int size);
-	}
-
-	/* xfce-exec.h */
-	[Compact]
-	public class Exec {
-		[CCode (cname = "xfce_exec")]
-		public static bool exec (string cmd, bool in_terminal, bool use_sn) throws GLib.Error;
-		[CCode (cname = "xfce_exec_with_envp")]
-		public static bool exec_with_envp (string cmd, bool in_terminal, bool use_sn, string[] envp) throws GLib.Error;
-	}
-
-	/* xfce-gdk-extensions.h xfce-gtk-extensions.h */
-	[Compact]
-	public class Extensions {
-		[CCode (cname = "xfce_gdk_display_get_fullname")]
-		public static string gdk_display_get_fullname (Gdk.Display display);
-		/* TODO verify unowned */
-		[CCode (cname = "xfce_gdk_display_locate_monitor_with_pointer")]
-		public static unowned Gdk.Screen gdk_display_locate_monitor_with_pointer (Gdk.Display? display, out int? monitor_return);
-		[CCode (cname = "xfce_gdk_screen_get_fullname")]
-		public static string gdk_screen_get_fullname (Gdk.Screen screen);
-		[CCode (cname = "xfce_gdk_spawn_command_line_on_screen")]
-		public static bool gdk_spawn_command_line_on_screen (Gdk.Screen screen, string command_line) throws GLib.Error;
-		[CCode (cname = "xfce_gdk_spawn_on_screen")]
-		public static bool gdk_spawn_on_screen (Gdk.Screen screen, string? working_directory, string[] argv, string[]? envp, GLib.SpawnFlags flags, GLib.SpawnChildSetupFunc child_setup, out int? child_pid) throws GLib.Error;
-		[CCode (cname = "xfce_gdk_spawn_on_screen_with_pipes")]
-		public static bool gdk_spawn_on_screen_with_pipes (Gdk.Screen screen, string? working_directory, string[] argv, string[]? envp, GLib.SpawnFlags flags, GLib.SpawnChildSetupFunc child_setup, out int? child_pid, out int? standard_input, out int? standard_output, out int? standard_error) throws GLib.Error;
-		[CCode (cname = "xfce_gtk_window_center_on_monitor")]
-		public static void gtk_window_center_on_monitor (Gtk.Window window, Gdk.Screen screen, int monitor);
-		[CCode (cname = "xfce_gtk_window_center_on_monitor_with_pointer")]
-		public static void gtk_window_center_on_monitor_with_pointer (Gtk.Window window);
-	}
-
-	/* xfce-widget-helpers.h */
-	[Compact]
-	public class WidgetHelpers {
-		/* TODO verify unowned */
-		[CCode (cname = "xfce_create_framebox")]
-		public static unowned Gtk.Widget create_framebox (string title, out unowned Gtk.Widget frame_bin);
-		[CCode (cname = "xfce_create_framebox_with_content")]
-		public static unowned Gtk.Widget create_framebox_with_content (string title, Gtk.Widget content);
-	}
-
-}
diff --git a/packages/libxfcegui4-1.0/libxfcegui4-1.0.defines b/packages/libxfcegui4-1.0/libxfcegui4-1.0.defines
deleted file mode 100644
index b14a833..0000000
--- a/packages/libxfcegui4-1.0/libxfcegui4-1.0.defines
+++ /dev/null
@@ -1 +0,0 @@
--DXFCE_DISABLE_DEPRECATED
diff --git a/packages/libxfcegui4-1.0/libxfcegui4-1.0.files b/packages/libxfcegui4-1.0/libxfcegui4-1.0.files
deleted file mode 100644
index d2465ca..0000000
--- a/packages/libxfcegui4-1.0/libxfcegui4-1.0.files
+++ /dev/null
@@ -1,3 +0,0 @@
-include/xfce4/libxfcegui4/xfce-appmenuitem.h
-include/xfce4/libxfcegui4/xfce-titled-dialog.h
-lib/libxfcegui4.so
diff --git a/packages/libxfcegui4-1.0/libxfcegui4-1.0.gi b/packages/libxfcegui4-1.0/libxfcegui4-1.0.gi
deleted file mode 100644
index 5526728..0000000
--- a/packages/libxfcegui4-1.0/libxfcegui4-1.0.gi
+++ /dev/null
@@ -1,179 +0,0 @@
-<?xml version="1.0"?>
-<api version="1.0">
-	<namespace name="Xfce">
-		<struct name="XfceAppMenuItemPriv">
-		</struct>
-		<object name="XfceAppMenuItem" parent="GtkImageMenuItem" type-name="XfceAppMenuItem" get-type="xfce_app_menu_item_get_type">
-			<implements>
-				<interface name="GtkBuildable"/>
-				<interface name="AtkImplementor"/>
-			</implements>
-			<method name="get_command" symbol="xfce_app_menu_item_get_command">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="app_menu_item" type="XfceAppMenuItem*"/>
-				</parameters>
-			</method>
-			<method name="get_icon_name" symbol="xfce_app_menu_item_get_icon_name">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="app_menu_item" type="XfceAppMenuItem*"/>
-				</parameters>
-			</method>
-			<method name="get_name" symbol="xfce_app_menu_item_get_name">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="app_menu_item" type="XfceAppMenuItem*"/>
-				</parameters>
-			</method>
-			<method name="get_needs_term" symbol="xfce_app_menu_item_get_needs_term">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="app_menu_item" type="XfceAppMenuItem*"/>
-				</parameters>
-			</method>
-			<method name="get_startup_notification" symbol="xfce_app_menu_item_get_startup_notification">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="app_menu_item" type="XfceAppMenuItem*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="xfce_app_menu_item_new">
-				<return-type type="GtkWidget*"/>
-			</constructor>
-			<constructor name="new_from_desktop_entry" symbol="xfce_app_menu_item_new_from_desktop_entry">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="entry" type="XfceDesktopEntry*"/>
-					<parameter name="show_icon" type="gboolean"/>
-				</parameters>
-			</constructor>
-			<constructor name="new_full" symbol="xfce_app_menu_item_new_full">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="label" type="gchar*"/>
-					<parameter name="command" type="gchar*"/>
-					<parameter name="icon_filename" type="gchar*"/>
-					<parameter name="needs_term" type="gboolean"/>
-					<parameter name="snotify" type="gboolean"/>
-				</parameters>
-			</constructor>
-			<constructor name="new_with_command" symbol="xfce_app_menu_item_new_with_command">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="label" type="gchar*"/>
-					<parameter name="command" type="gchar*"/>
-				</parameters>
-			</constructor>
-			<constructor name="new_with_label" symbol="xfce_app_menu_item_new_with_label">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="label" type="gchar*"/>
-				</parameters>
-			</constructor>
-			<constructor name="new_with_mnemonic" symbol="xfce_app_menu_item_new_with_mnemonic">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="label" type="gchar*"/>
-				</parameters>
-			</constructor>
-			<method name="set_command" symbol="xfce_app_menu_item_set_command">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="app_menu_item" type="XfceAppMenuItem*"/>
-					<parameter name="command" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="set_icon_name" symbol="xfce_app_menu_item_set_icon_name">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="app_menu_item" type="XfceAppMenuItem*"/>
-					<parameter name="filename" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="set_icon_theme_name" symbol="xfce_app_menu_item_set_icon_theme_name">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="theme_name" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="set_name" symbol="xfce_app_menu_item_set_name">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="app_menu_item" type="XfceAppMenuItem*"/>
-					<parameter name="name" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="set_needs_term" symbol="xfce_app_menu_item_set_needs_term">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="app_menu_item" type="XfceAppMenuItem*"/>
-					<parameter name="needs_term" type="gboolean"/>
-				</parameters>
-			</method>
-			<method name="set_startup_notification" symbol="xfce_app_menu_item_set_startup_notification">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="app_menu_item" type="XfceAppMenuItem*"/>
-					<parameter name="snotify" type="gboolean"/>
-				</parameters>
-			</method>
-			<property name="command" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="icon-name" type="char*" 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="needs-term" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="snotify" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="use-underline" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-		</object>
-		<object name="XfceTitledDialog" parent="GtkDialog" type-name="XfceTitledDialog" get-type="xfce_titled_dialog_get_type">
-			<implements>
-				<interface name="GtkBuildable"/>
-				<interface name="AtkImplementor"/>
-			</implements>
-			<method name="get_subtitle" symbol="xfce_titled_dialog_get_subtitle">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="titled_dialog" type="XfceTitledDialog*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="xfce_titled_dialog_new">
-				<return-type type="GtkWidget*"/>
-			</constructor>
-			<constructor name="new_with_buttons" symbol="xfce_titled_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>
-			<method name="set_subtitle" symbol="xfce_titled_dialog_set_subtitle">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="titled_dialog" type="XfceTitledDialog*"/>
-					<parameter name="subtitle" type="gchar*"/>
-				</parameters>
-			</method>
-			<property name="subtitle" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-			<vfunc name="reserved0">
-				<return-type type="void"/>
-			</vfunc>
-			<vfunc name="reserved1">
-				<return-type type="void"/>
-			</vfunc>
-			<vfunc name="reserved2">
-				<return-type type="void"/>
-			</vfunc>
-			<vfunc name="reserved3">
-				<return-type type="void"/>
-			</vfunc>
-			<vfunc name="reserved4">
-				<return-type type="void"/>
-			</vfunc>
-			<vfunc name="reserved5">
-				<return-type type="void"/>
-			</vfunc>
-		</object>
-	</namespace>
-</api>
diff --git a/packages/libxfcegui4-1.0/libxfcegui4-1.0.metadata b/packages/libxfcegui4-1.0/libxfcegui4-1.0.metadata
deleted file mode 100644
index ca72d91..0000000
--- a/packages/libxfcegui4-1.0/libxfcegui4-1.0.metadata
+++ /dev/null
@@ -1,25 +0,0 @@
-Xfce cheader_filename="libxfcegui4/libxfcegui4.h"
-
-xfce_titled_dialog_reserved0 hidden="1"
-xfce_titled_dialog_reserved1 hidden="1"
-xfce_titled_dialog_reserved2 hidden="1"
-xfce_titled_dialog_reserved3 hidden="1"
-xfce_titled_dialog_reserved4 hidden="1"
-xfce_titled_dialog_reserved5 hidden="1"
-xfce_titled_dialog_get_subtitle hidden="1"
-xfce_titled_dialog_set_subtitle hidden="1"
-xfce_titled_dialog_new_with_buttons.title nullable="1"
-xfce_titled_dialog_new_with_buttons.parent nullable="1"
-
-XfceAppMenuItemPriv hidden="1"
-xfce_app_menu_item_new_from_desktop_entry hidden="1"
-xfce_app_menu_item_get_command hidden="1"
-xfce_app_menu_item_set_command hidden="1"
-xfce_app_menu_item_get_icon_name hidden="1"
-xfce_app_menu_item_set_icon_name hidden="1"
-xfce_app_menu_item_get_name hidden="1"
-xfce_app_menu_item_set_name hidden="1"
-xfce_app_menu_item_get_needs_term hidden="1"
-xfce_app_menu_item_set_needs_term hidden="1"
-xfce_app_menu_item_get_startup_notification hidden="1"
-xfce_app_menu_item_set_startup_notification hidden="1"
diff --git a/packages/libxfconf-0/libxfconf-0.gi b/packages/libxfconf-0/libxfconf-0.gi
index bbee775..c5a42e7 100644
--- a/packages/libxfconf-0/libxfconf-0.gi
+++ b/packages/libxfconf-0/libxfconf-0.gi
@@ -344,6 +344,7 @@
 				</parameters>
 			</method>
 			<property name="channel-name" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
+			<property name="is-singleton" type="gboolean" readable="1" writable="1" construct="0" construct-only="1"/>
 			<property name="property-base" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
 			<signal name="property-changed" when="LAST">
 				<return-type type="void"/>
diff --git a/tests/exo-0.3.vala b/tests/exo-1.vala
similarity index 100%
rename from tests/exo-0.3.vala
rename to tests/exo-1.vala
diff --git a/tests/libxfce4menu-0.1.vala b/tests/libxfce4menu-0.1.vala
deleted file mode 100644
index e6fcf0d..0000000
--- a/tests/libxfce4menu-0.1.vala
+++ /dev/null
@@ -1,97 +0,0 @@
-using Gtk;
-using Xfce;
-
-public class ButtonMenu : Gtk.Button {
-
-	private Gtk.Menu menu = null;
-
-	construct {
-		this.label = "Show Menu";
-		this.clicked.connect (() => {
-				menu.popup (null, null, null, 0, Gtk.get_current_event_time ());
-				});
-
-		init_menu ();
-	}
-
-	private void init_menu () {
-		Xfce.Menu root_menu;
-
-		/* Build a root menu */
-		try {
-			root_menu = Xfce.Menu.get_root ();
-		} catch (Error ex) {
-			error ("Unable to build a root menu");
-			return;
-		}
-
-		/* Create the gtk menu */
-		menu = new Gtk.Menu ();
-		create_menu_items (menu, root_menu);
-		menu.show_all ();
-	}
-
-	private void create_menu_items (Gtk.Menu gtk_menu, Xfce.Menu xfce_menu) {
-		unowned SList<Xfce.MenuItem> items;
-		Gtk.MenuItem mi = null;
-
-		/* Retrieves menu items */
-		if (xfce_menu.has_layout ()) {
-			items = xfce_menu.get_layout_elements ();
-		} else {
-			items = xfce_menu.get_items ();
-		}
-
-		/* Create gtk menu items */
-		foreach (Xfce.MenuItem item in items) {
-			if (item is Xfce.MenuItem) {
-				mi = new Gtk.MenuItem.with_label (item.get_name ());
-				mi.set_data ("command", item.get_command());
-				mi.activate.connect ((mi) => {
-						debug ("execute `%s'", (string)mi.get_data ("command"));
-						});
-			}
-			else if (item is Xfce.MenuSeparator) {
-				mi = new Gtk.SeparatorMenuItem ();
-			}
-			else if (item is Xfce.Menu) {
-				Xfce.Menu xfce_submenu = (Xfce.Menu)item;
-				if (xfce_submenu.get_items () == null)
-					continue;
-
-				mi = new Gtk.MenuItem.with_label (item.get_name ());
-
-				Gtk.Menu gtk_submenu = new Gtk.Menu ();
-				create_menu_items (gtk_submenu, xfce_submenu);
-				mi.set_submenu (gtk_submenu);
-			}
-			gtk_menu.add (mi);
-		}
-	}
-}
-
-public class GtkSample : Gtk.Window {
-
-	construct {
-		this.title = "Xfce4 Menu";
-		this.destroy.connect (() => { Gtk.main_quit (); });
-
-		var button = new ButtonMenu ();
-		this.add (button);
-	}
-
-	static int main (string[] args) {
-		Gtk.init (ref args);
-		Xfce.menu_init ("XFCE");
-
-		var sample = new GtkSample ();
-		sample.show_all ();
-
-		Gtk.main ();
-
-		Xfce.menu_shutdown ();
-
-		return 0;
-	}
-}
-
diff --git a/tests/libxfcegui4-1.0.vala b/tests/libxfcegui4-1.0.vala
deleted file mode 100644
index aac28f2..0000000
--- a/tests/libxfcegui4-1.0.vala
+++ /dev/null
@@ -1,27 +0,0 @@
-using Xfce;
-
-public class Libxfce4guiTests : Object {
-
-	public void test_dialogs () {
-		bool res = Xfce.Dialog.confirm ("To be or not to be?", Gtk.STOCK_YES, null);
-		message ("confirm: %d", (int)res);
-		Xfce.Dialog.info ("Info");
-		Xfce.Dialog.warning ("Warning");
-		Xfce.Dialog.error ("Error");
-
-		var dialog = new Xfce.TitledDialog.with_buttons ("Libxfce4guiTests", null, 0, "gtk-ok", 0);
-		dialog.subtitle = "Test XfceTitledDialog";
-		dialog.run ();
-	}
-
-}
-
-static int main (string[] args) {
-	Gtk.init (ref args);
-
-	var tests = new Libxfce4guiTests ();
-	tests.test_dialogs ();
-
-	return 0;
-}
-
diff --git a/vapi/exo-0.3.deps b/vapi/exo-0.3.deps
deleted file mode 100644
index 4dc3754..0000000
--- a/vapi/exo-0.3.deps
+++ /dev/null
@@ -1,7 +0,0 @@
-atk
-gio-2.0
-cairo
-pango
-gdk-pixbuf-2.0
-gdk-2.0
-gtk+-2.0
diff --git a/packages/libxfcegui4-1.0/libxfcegui4-1.0.deps b/vapi/exo-1.deps
similarity index 100%
copy from packages/libxfcegui4-1.0/libxfcegui4-1.0.deps
copy to vapi/exo-1.deps
diff --git a/vapi/exo-0.3.vapi b/vapi/exo-1.vapi
similarity index 88%
rename from vapi/exo-0.3.vapi
rename to vapi/exo-1.vapi
index 4c32a4a..9b6635b 100644
--- a/vapi/exo-0.3.vapi
+++ b/vapi/exo-1.vapi
@@ -1,4 +1,4 @@
-/* exo-0.3.vapi generated by vapigen, do not modify. */
+/* exo-1.vapi generated by vapigen, 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);
@@ -27,6 +27,8 @@ namespace Exo {
 		[NoAccessorMethod]
 		public bool follow_state { get; set construct; }
 		[NoAccessorMethod]
+		public GLib.Icon gicon { owned get; set; }
+		[NoAccessorMethod]
 		public string icon { owned get; set; }
 		[NoAccessorMethod]
 		public int size { get; set construct; }
@@ -56,15 +58,15 @@ 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 (int idx);
 		public void set_active_iter (Gtk.TreeIter iter);
 		public void set_model (Gtk.TreeModel model);
 		public void set_orientation (Gtk.Orientation orientation);
@@ -82,13 +84,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 {
+	public class IconView : Gtk.Container, Gtk.CellLayout, Atk.Implementor, Gtk.Buildable {
+		[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 +123,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 ();
@@ -184,49 +186,43 @@ namespace Exo {
 		public virtual signal bool start_interactive_search ();
 		public virtual signal void toggle_cursor_item ();
 	}
-	[Compact]
-	[CCode (cheader_filename = "exo/exo.h")]
-	public class Md5 {
-		[CCode (cname = "exo_str_get_md5_str")]
-		public static string str_get_md5_str (string contents);
-	}
-	[Compact]
 	[CCode (cheader_filename = "exo/exo.h")]
-	public class Md5Digest {
-		[CCode (array_length = false)]
-		public weak uchar[] digest;
-		public unowned Exo.Md5Digest dup ();
-		public static bool equal (void* digest1, void* digest2);
-		public static uint hash (void* digest);
-		[CCode (cname = "exo_md5_str_to_digest")]
-		public static Exo.Md5Digest md5_str_to_digest (string str_digest);
-		[CCode (cname = "exo_str_get_md5_digest")]
-		public static Exo.Md5Digest str_get_md5_digest (string contents);
-		public unowned string to_str ();
-	}
-	[Compact]
-	[CCode (cheader_filename = "exo/exo.h")]
-	public class MountPoint {
-		public weak string device;
-		public Exo.MountPointFlags flags;
-		public weak string folder;
-		public weak string fstype;
-		public unowned Exo.MountPoint dup ();
-		public static unowned GLib.SList list_active () throws GLib.Error;
-		public static unowned GLib.SList list_configured () throws GLib.Error;
-		public static unowned GLib.SList list_matched (Exo.MountPointMatchMask mask, string device, string folder, string fstype) throws GLib.Error;
+	public class Job : GLib.Object {
+		public void cancel ();
+		public void emit (uint signal_id, GLib.Quark signal_detail);
+		[NoWrapper]
+		public virtual bool execute () throws GLib.Error;
+		public unowned GLib.Cancellable get_cancellable ();
+		public void info_message (string format);
+		public bool is_cancelled ();
+		public unowned Exo.Job launch ();
+		public void percent (double percent);
+		public bool send_to_mainloop (GLib.SourceFunc func, GLib.DestroyNotify destroy_notify);
+		public bool set_error_if_cancelled () throws GLib.Error;
+		public virtual signal void error (void* error);
+		public virtual signal void finished ();
+		public virtual signal void info_message_received (string message);
+		public virtual signal void percent_progress (double percent);
 	}
 	[Compact]
 	[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);
 	}
+	[CCode (cheader_filename = "exo/exo.h")]
+	public class SimpleJob : Exo.Job {
+		public static unowned Exo.Job launch (Exo.SimpleJobFunc func, uint n_param_values);
+	}
+	[Compact]
+	[CCode (cheader_filename = "exo/exo.h")]
+	public class SimpleJobClass {
+	}
 	[Compact]
 	[CCode (cheader_filename = "exo/exo.h")]
 	public class String {
@@ -234,10 +230,6 @@ namespace Exo {
 		public static string dup_strftime (string format, void* tm);
 		[CCode (cname = "exo_str_elide_underscores")]
 		public static string elide_underscores (string text);
-		[CCode (cname = "exo_intern_string")]
-		public static unowned string intern (string str);
-		[CCode (cname = "exo_intern_static_string")]
-		public static unowned string intern_static (string str);
 		[CCode (cname = "exo_str_is_equal")]
 		public static bool is_equal (string? a, string? b);
 		[CCode (cname = "exo_strndupv")]
@@ -246,11 +238,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)]
@@ -265,6 +257,8 @@ namespace Exo {
 	}
 	[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 +273,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 +291,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,29 +310,22 @@ 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; }
 		public uint single_click_timeout { get; set; }
 	}
-	[Compact]
-	[CCode (cheader_filename = "exo/exo.h")]
-	public class Url {
-		public static void about_dialog_hook (Gtk.AboutDialog about_dialog, string link);
-		public static bool show (string url, string? envp) throws Exo.UrlError;
-		public static bool show_on_screen (string url, string? envp, Gdk.Screen screen) throws Exo.UrlError;
-	}
 	[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);
@@ -353,6 +338,7 @@ namespace Exo {
 		[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 ();
 	}
@@ -370,19 +356,6 @@ namespace Exo {
 		ROWS,
 		COLS
 	}
-	[CCode (cprefix = "EXO_MOUNT_POINT_", cheader_filename = "exo/exo.h")]
-	[Flags]
-	public enum MountPointFlags {
-		READ_ONLY
-	}
-	[CCode (cprefix = "EXO_MOUNT_POINT_MATCH_", has_type_id = "0", cheader_filename = "exo/exo.h")]
-	public enum MountPointMatchMask {
-		ACTIVE,
-		CONFIGURED,
-		DEVICE,
-		FOLDER,
-		FSTYPE
-	}
 	[CCode (cprefix = "EXO_TOOLBARS_MODEL_", cheader_filename = "exo/exo.h")]
 	[Flags]
 	public enum ToolbarsModelFlags {
@@ -390,10 +363,6 @@ namespace Exo {
 		ACCEPT_ITEMS_ONLY,
 		OVERRIDE_STYLE
 	}
-	[CCode (cprefix = "EXO_URL_ERROR_", cheader_filename = "exo/exo.h")]
-	public errordomain UrlError {
-		NOT_SUPPORTED,
-	}
 	[CCode (cheader_filename = "exo/exo.h")]
 	public delegate bool BindingTransform (GLib.Value src_value, GLib.Value dst_value);
 	[CCode (cheader_filename = "exo/exo.h")]
@@ -402,6 +371,8 @@ namespace Exo {
 	public delegate bool IconViewSearchEqualFunc (Gtk.TreeModel model, int column, string key, Gtk.TreeIter iter, void* search_data);
 	[CCode (cheader_filename = "exo/exo.h")]
 	public delegate void IconViewSearchPositionFunc (Exo.IconView icon_view, Gtk.Widget search_dialog);
+	[CCode (cheader_filename = "exo/exo.h", has_target = false)]
+	public delegate bool SimpleJobFunc (Exo.Job job, GLib.ValueArray param_values, GLib.Error error);
 	[CCode (cheader_filename = "exo/exo.h")]
 	public const string TOOLBARS_ITEM_TYPE;
 }
diff --git a/vapi/libxfce4menu-0.1.vapi b/vapi/libxfce4menu-0.1.vapi
deleted file mode 100644
index 4bf7a55..0000000
--- a/vapi/libxfce4menu-0.1.vapi
+++ /dev/null
@@ -1,266 +0,0 @@
-/* libxfce4menu-0.1.vapi generated by vapigen, 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 {
-		public void add_menu (Xfce.Menu submenu);
-		public unowned GLib.SList get_app_dirs ();
-		public bool get_deleted ();
-		public unowned Xfce.MenuDirectory get_directory ();
-		public unowned GLib.SList get_directory_dirs ();
-		public unowned string get_filename ();
-		public unowned Xfce.MenuItemPool get_item_pool ();
-		public unowned GLib.SList get_items ();
-		public unowned GLib.SList get_layout_elements ();
-		public unowned GLib.SList get_legacy_dirs ();
-		public unowned Xfce.Menu get_menu_with_name (string name);
-		public unowned GLib.SList get_menus ();
-		public bool get_only_unallocated ();
-		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);
-		public void set_name (string name);
-		public void set_only_unallocated (bool only_unallocated);
-	}
-	[CCode (cheader_filename = "libxfce4menu/libxfce4menu.h")]
-	public class MenuAndRules : Xfce.MenuStandardRules, Xfce.MenuRules {
-		[CCode (has_construct_function = false)]
-		public MenuAndRules ();
-	}
-	[Compact]
-	[CCode (cheader_filename = "libxfce4menu/libxfce4menu.h")]
-	public class MenuAndRulesClass {
-	}
-	[Compact]
-	[CCode (cheader_filename = "libxfce4menu/libxfce4menu.h")]
-	public class MenuClass {
-	}
-	[CCode (cheader_filename = "libxfce4menu/libxfce4menu.h")]
-	public class MenuDirectory : GLib.Object {
-		public unowned string get_comment ();
-		public unowned string get_filename ();
-		public bool get_hidden ();
-		public unowned string get_icon ();
-		public unowned string get_name ();
-		public bool get_no_display ();
-		public void set_comment (string comment);
-		public void set_filename (string name);
-		public void set_icon (string icon);
-		public void set_name (string name);
-		public void set_no_display (bool no_display);
-		public bool show_in_environment ();
-	}
-	[Compact]
-	[CCode (cheader_filename = "libxfce4menu/libxfce4menu.h")]
-	public class MenuDirectoryClass {
-	}
-	[CCode (cheader_filename = "libxfce4menu/libxfce4menu.h")]
-	public class MenuItem : GLib.Object, Xfce.MenuElement {
-		public void decrement_allocated ();
-		public int get_allocated ();
-		public unowned GLib.List get_categories ();
-		public unowned string get_command ();
-		public unowned string get_comment ();
-		public unowned string get_desktop_id ();
-		public unowned string get_filename ();
-		public unowned string get_generic_name ();
-		public bool get_no_display ();
-		public unowned string get_path ();
-		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);
-		public void set_command (string command);
-		public void set_comment (string comment);
-		public void set_desktop_id (string desktop_id);
-		public void set_filename (string filename);
-		public void set_generic_name (string generic_name);
-		public void set_icon_name (string icon_name);
-		public void set_name (string name);
-		public void set_no_display (bool no_display);
-		public void set_path (string path);
-		public void set_requires_terminal (bool requires_terminal);
-		public void set_supports_startup_notification (bool supports_startup_notification);
-		public void set_try_exec (string try_exec);
-		public bool show_in_environment ();
-		public bool supports_startup_notification ();
-	}
-	[CCode (cheader_filename = "libxfce4menu/libxfce4menu.h")]
-	public class MenuItemCache : GLib.Object {
-		public void @foreach (GLib.HFunc func);
-		public static unowned Xfce.MenuItemCache get_default ();
-		public void invalidate ();
-		public unowned Xfce.MenuItem lookup (string filename, string desktop_id);
-	}
-	[Compact]
-	[CCode (cheader_filename = "libxfce4menu/libxfce4menu.h")]
-	public class MenuItemCacheClass {
-	}
-	[Compact]
-	[CCode (cheader_filename = "libxfce4menu/libxfce4menu.h")]
-	public class MenuItemClass {
-	}
-	[CCode (cheader_filename = "libxfce4menu/libxfce4menu.h")]
-	public class MenuItemPool : GLib.Object {
-		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")]
-	public class MenuItemPoolClass {
-	}
-	[CCode (cheader_filename = "libxfce4menu/libxfce4menu.h")]
-	public class MenuLayout : GLib.Object {
-		public void add_filename (string filename);
-		public void add_menuname (string menuname);
-		public void add_merge (Xfce.MenuLayoutMergeType type);
-		public void add_separator ();
-		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")]
-	public class MenuLayoutClass {
-	}
-	[Compact]
-	[CCode (cheader_filename = "libxfce4menu/libxfce4menu.h")]
-	public class MenuLayoutNode {
-		public unowned string get_filename ();
-		public unowned string get_menuname ();
-		public Xfce.MenuLayoutMergeType get_merge_type ();
-	}
-	[Compact]
-	[CCode (cheader_filename = "libxfce4menu/libxfce4menu.h")]
-	public class MenuMonitor {
-		public void* add_directory (string directory);
-		public void* add_file (string filename);
-		public void* add_item (Xfce.MenuItem item);
-		public static Xfce.MenuMonitorFlags get_flags ();
-		public static bool has_flags (Xfce.MenuMonitorFlags flags);
-		public void remove_directory (string directory);
-		public void remove_file (string filename);
-		public void remove_item (Xfce.MenuItem item);
-		public static void set_flags (Xfce.MenuMonitorFlags flags);
-		public static void set_vtable (Xfce.MenuMonitorVTable vtable);
-	}
-	[Compact]
-	[CCode (cheader_filename = "libxfce4menu/libxfce4menu.h")]
-	public class MenuMonitorVTable {
-		public weak GLib.Callback monitor_directory;
-		public weak GLib.Callback monitor_file;
-		public weak GLib.Callback remove_monitor;
-	}
-	[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 void set_new (string @new);
-		public void set_old (string old);
-	}
-	[Compact]
-	[CCode (cheader_filename = "libxfce4menu/libxfce4menu.h")]
-	public class MenuMoveClass {
-	}
-	[CCode (cheader_filename = "libxfce4menu/libxfce4menu.h")]
-	public class MenuNotRules : Xfce.MenuStandardRules, Xfce.MenuRules {
-		[CCode (has_construct_function = false)]
-		public MenuNotRules ();
-	}
-	[Compact]
-	[CCode (cheader_filename = "libxfce4menu/libxfce4menu.h")]
-	public class MenuNotRulesClass {
-	}
-	[CCode (cheader_filename = "libxfce4menu/libxfce4menu.h")]
-	public class MenuOrRules : Xfce.MenuStandardRules, Xfce.MenuRules {
-		[CCode (has_construct_function = false)]
-		public MenuOrRules ();
-	}
-	[Compact]
-	[CCode (cheader_filename = "libxfce4menu/libxfce4menu.h")]
-	public class MenuOrRulesClass {
-	}
-	[CCode (cheader_filename = "libxfce4menu/libxfce4menu.h")]
-	public class MenuSeparator : GLib.Object, Xfce.MenuElement {
-		public static unowned Xfce.MenuSeparator get_default ();
-	}
-	[Compact]
-	[CCode (cheader_filename = "libxfce4menu/libxfce4menu.h")]
-	public class MenuSeparatorClass {
-	}
-	[CCode (cheader_filename = "libxfce4menu/libxfce4menu.h")]
-	public class MenuStandardRules : GLib.Object, Xfce.MenuRules {
-		public uint all;
-		public weak GLib.List categories;
-		public weak GLib.List filenames;
-		public bool include;
-		public weak GLib.List rules;
-		public bool get_include ();
-		public void set_include (bool include);
-	}
-	[Compact]
-	[CCode (cheader_filename = "libxfce4menu/libxfce4menu.h")]
-	public class MenuStandardRulesClass {
-	}
-	[CCode (cheader_filename = "libxfce4menu/libxfce4menu.h")]
-	public interface MenuElement : GLib.Object {
-		public abstract unowned string get_icon_name ();
-		public abstract unowned string get_name ();
-	}
-	[CCode (cheader_filename = "libxfce4menu/libxfce4menu.h")]
-	public interface MenuRules : GLib.Object {
-		public abstract void add_all ();
-		public abstract void add_category (string category);
-		public abstract void add_filename (string filename);
-		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")]
-	public enum MenuLayoutMergeType {
-		MENUS,
-		FILES,
-		ALL
-	}
-	[CCode (cprefix = "XFCE_MENU_LAYOUT_NODE_", has_type_id = "0", cheader_filename = "libxfce4menu/libxfce4menu.h")]
-	public enum MenuLayoutNodeType {
-		INVALID,
-		FILENAME,
-		MENUNAME,
-		SEPARATOR,
-		MERGE
-	}
-	[CCode (cprefix = "XFCE_MENU_MONITOR_", has_type_id = "0", cheader_filename = "libxfce4menu/libxfce4menu.h")]
-	public enum MenuMonitorFlags {
-		DIRECTORIES,
-		MENU_FILES,
-		DIRECTORY_FILES,
-		DESKTOP_FILES
-	}
-	[CCode (cheader_filename = "libxfce4menu/libxfce4menu.h")]
-	public static unowned string menu_get_environment ();
-	[CCode (cheader_filename = "libxfce4menu/libxfce4menu.h")]
-	public static void menu_init (string env);
-	[CCode (cheader_filename = "libxfce4menu/libxfce4menu.h")]
-	public static void menu_set_environment (string env);
-	[CCode (cheader_filename = "libxfce4menu/libxfce4menu.h")]
-	public static void menu_shutdown ();
-}
diff --git a/vapi/libxfce4panel-1.0.deps b/vapi/libxfce4panel-1.0.deps
index 2ebda27..b47d055 100644
--- a/vapi/libxfce4panel-1.0.deps
+++ b/vapi/libxfce4panel-1.0.deps
@@ -6,4 +6,3 @@ gdk-pixbuf-2.0
 gdk-2.0
 gtk+-2.0
 libxfce4util-1.0
-libxfcegui4-1.0
diff --git a/vapi/libxfce4panel-1.0.vapi b/vapi/libxfce4panel-1.0.vapi
index 0a68e17..be4bba5 100644
--- a/vapi/libxfce4panel-1.0.vapi
+++ b/vapi/libxfce4panel-1.0.vapi
@@ -1,143 +1,114 @@
-/*
- *  xfce4-vala - Vala bindings for Xfce
- *  Copyright (c) 2009  Mike Massonnet <mmassonnet at xfce.org>
- *
- *  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
- */
+/* libxfce4panel-1.0.vapi generated by vapigen, do not modify. */
 
-[CCode (cheader_filename = "libxfce4panel/libxfce4panel.h", cprefix = "Xfce", lower_case_cprefix = "xfce_")]
+[CCode (cprefix = "Xfce", lower_case_cprefix = "xfce_")]
 namespace Xfce {
-	public static int PanelPluginRegisterExternal ([CCode (array_length_pos = 0)] ref unowned string[] argv, PanelPluginFunc register) {
-		return PanelPluginRegisterExternalFull (ref argv, register, null, null);
-	}
-	public static int PanelPluginRegisterExternalFull ([CCode (array_length_pos = 0)] ref unowned string[] argv, PanelPluginFunc register, PanelPluginPreInit? preinit, PanelPluginCheck? check) {
-		if (preinit != null) {
-			if (!preinit (argv)) {
-				return 3;
-			}
-		}
-		Gtk.init (ref argv);
-		if (check != null) {
-			if (!check (Gdk.Screen.get_default ())) {
-				return 2;
-			}
-		}
-		var panel_plugin = new Xfce.ExternalPanelPlugin (argv, register);
-		if (panel_plugin == null)
-			return 1;
-		GLib.Signal.connect_after (panel_plugin, "destroy", () => { Gtk.main_quit (); }, null);
-		panel_plugin.show ();
-		Gtk.main ();
-		return 0;
-	}
-	/*
-	TODO:
-	- PanelPluginRegisterInternal
-	*/
-
-	public class ExternalPanelPlugin : Gtk.Plug, PanelPlugin {
-		public ExternalPanelPlugin ([CCode (array_length_pos = 0)] string[] argv, PanelPluginFunc register);
+	[CCode (cheader_filename = "libxfce4panel/libxfce4panel.h")]
+	public class ArrowButton : Gtk.ToggleButton, Gtk.Activatable, Gtk.Buildable, Atk.Implementor {
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public ArrowButton (Gtk.ArrowType arrow_type);
+		public Gtk.ArrowType get_arrow_type ();
+		public bool get_blinking ();
+		public void set_arrow_type (Gtk.ArrowType arrow_type);
+		public void set_blinking (bool blinking);
+		public Gtk.ArrowType arrow_type { get; set; }
+		public virtual signal void arrow_type_changed (Gtk.ArrowType type);
 	}
-	public class InternalPanelPlugin : Gtk.EventBox, PanelPlugin {
-		public InternalPanelPlugin (string name, string id, string display_name, int size, ScreenPosition screen_position, PanelPluginFunc register);
+	[CCode (cheader_filename = "libxfce4panel/libxfce4panel.h")]
+	public class HVBox : Gtk.Box, Gtk.Buildable, Atk.Implementor, Gtk.Orientable {
+		public Gtk.Orientation orientation;
+		[CCode (cname = "xfce_hvbox_new", type = "GtkWidget*", has_construct_function = false)]
+		public HVBox (Gtk.Orientation orientation, bool homogeneous, int spacing);
+		[CCode (cname = "xfce_hvbox_get_orientation")]
+		public Gtk.Orientation get_orientation ();
+		[CCode (cname = "xfce_hvbox_set_orientation")]
+		public void set_orientation (Gtk.Orientation orientation);
 	}
-
-	[CCode (has_target = false)]
-	public delegate void PanelPluginFunc (PanelPlugin panel_plugin);
-	[CCode (has_target = false)]
-	public delegate bool PanelPluginCheck (Gdk.Screen screen);
-	[CCode (has_target = false)]
-	public delegate bool PanelPluginPreInit ([CCode (array_length_pos = 0)] string[] argv);
-
-	public interface PanelPlugin : Gtk.Container {
-		public string display_name { get; }
+	[CCode (cheader_filename = "libxfce4panel/libxfce4panel.h")]
+	public class PanelPlugin : Gtk.EventBox, Gtk.Buildable, Atk.Implementor, Xfce.PanelPluginProvider {
+		public void add_action_widget (Gtk.Widget widget);
+		public Gtk.ArrowType arrow_type ();
+		public void block_autohide (bool blocked);
+		public void block_menu ();
+		[NoWrapper]
+		public virtual void @construct ();
+		public void focus_widget (Gtk.Widget widget);
+		public unowned string get_arguments ();
+		public unowned string get_comment ();
+		public unowned string get_display_name ();
+		public bool get_expand ();
+		public Gtk.Orientation get_orientation ();
+		public unowned string get_property_base ();
+		public Xfce.ScreenPosition get_screen_position ();
+		public int get_size ();
+		public int get_unique_id ();
+		public unowned string lookup_rc_file ();
+		public void menu_insert_item (Gtk.MenuItem item);
+		public void menu_show_about ();
+		public void menu_show_configure ();
+		public static void position_menu (Gtk.Menu menu, int x, int y, bool push_in, void* panel_plugin);
+		public void position_widget (Gtk.Widget menu_widget, Gtk.Widget attach_widget, int x, int y);
+		public void register_menu (Gtk.Menu menu);
+		public unowned string save_location (bool create);
+		public void set_expand (bool expand);
+		public void take_window (Gtk.Window window);
+		public void unblock_menu ();
+		[CCode (array_length = false, array_null_terminated = true)]
+		public string[] arguments { get; construct; }
+		public string comment { get; construct; }
+		public string display_name { get; construct; }
 		public bool expand { get; set; }
-		public string id { get; }
-		public string name { get; }
-		public ScreenPosition screen_position { get; }
+		public string name { get; construct; }
+		public Gtk.Orientation orientation { get; }
+		public Xfce.ScreenPosition screen_position { get; }
 		public int size { get; }
+		public int unique_id { get; construct; }
 		public virtual signal void about ();
 		public virtual signal void configure_plugin ();
 		public virtual signal void free_data ();
 		public virtual signal void orientation_changed (Gtk.Orientation orientation);
+		public virtual signal bool remote_event (string name, GLib.Value value);
+		public virtual signal void removed ();
 		public virtual signal void save ();
-		public virtual signal void screen_position_changed (ScreenPosition screen_position);
+		public virtual signal void screen_position_changed (Xfce.ScreenPosition position);
 		public virtual signal bool size_changed (int size);
-		public string get_name ();
-		public string get_id ();
-		public string get_display_name ();
-		public int get_size ();
-		public ScreenPosition get_screen_position ();
-		public void set_expand (bool expand);
-		public bool get_expand ();
-		public Gtk.Orientation get_orientation ();
-		public void add_action_widget (Gtk.Widget widget);
-		public void menu_insert_item (Gtk.MenuItem item);
-		public void menu_show_about ();
-		public void menu_show_configure ();
-		public void block_menu ();
-		public void unblock_menu ();
-		public void register_menu (Gtk.Menu menu);
-		public string lookup_rc_file ();
-		public string save_location (bool create);
-		public void focus_widget (Gtk.Widget widget);
-		public void set_panel_hidden (bool hidden);
 	}
-
-	public class ArrowButton : Gtk.ToggleButton {
-		public Gtk.ArrowType arrow_type { get; set; }
-		public virtual signal void arrow_type_changed (Gtk.ArrowType type);
-		public ArrowButton (Gtk.ArrowType type);
-		public void set_arrow_type (Gtk.ArrowType type);
-		public Gtk.ArrowType get_arrow_type ();
+	[Compact]
+	[CCode (cheader_filename = "libxfce4panel/libxfce4panel.h")]
+	public class PanelTypeModule {
 	}
-	public class HVBox : Gtk.Box {
-		[CCode (cname = "xfce_hvbox_new")]
-		public HVBox (Gtk.Orientation orientation, bool homogeneous, int spacing);
-		[CCode (cname = "xfce_hvbox_set_orientation")]
-		public void set_orientation (Gtk.Orientation orientation);
+	[CCode (cheader_filename = "libxfce4panel/libxfce4panel.h")]
+	public interface PanelPluginProvider {
 	}
-
-	public static Gtk.Button create_panel_button ();
-	public static Gtk.ToggleButton create_panel_toggle_button ();
-	public static bool allow_panel_customization ();
-
-	[CCode (has_type_id = false)]
+	[CCode (cprefix = "XFCE_SCREEN_POSITION_", cheader_filename = "libxfce4panel/libxfce4panel.h")]
 	public enum ScreenPosition {
 		NONE,
-		NW_H,          /* North West Horizontal */
-		N,             /* North                 */
-		NE_H,          /* North East Horizontal */
-		NW_V,          /* North West Vertical   */
-		W,             /* West                  */
-		SW_V,          /* South West Vertical   */
-		NE_V,          /* North East Vertical   */
-		E,             /* East                  */
-		SE_V,          /* South East Vertical   */
-		SW_H,          /* South West Horizontal */
-		S,             /* South                 */
-		SE_H,          /* South East Horizontal */
-		FLOATING_H,    /* Floating Horizontal */
-		FLOATING_V     /* Floating Vertical */
-	}
-
-	[CCode (has_type_id = false)]
-	public enum HandleStyle {
-		NONE,
-		BOTH,
-		START,
-		END
+		NW_H,
+		N,
+		NE_H,
+		NW_V,
+		W,
+		SW_V,
+		NE_V,
+		E,
+		SE_V,
+		SW_H,
+		S,
+		SE_H,
+		FLOATING_H,
+		FLOATING_V
 	}
+	[CCode (cheader_filename = "libxfce4panel/libxfce4panel.h", has_target = false)]
+	public delegate bool PanelPluginCheck (Gdk.Screen screen);
+	[CCode (cheader_filename = "libxfce4panel/libxfce4panel.h", has_target = false)]
+	public delegate void PanelPluginFunc (Xfce.PanelPlugin plugin);
+	[CCode (cheader_filename = "libxfce4panel/libxfce4panel.h", has_target = false)]
+	public delegate bool PanelPluginPreInit (int argc, string argv);
+	[CCode (cheader_filename = "libxfce4panel/libxfce4panel.h")]
+	public const string PANEL_PLUGIN_CHANNEL_NAME;
+	[CCode (cheader_filename = "libxfce4panel/libxfce4panel.h")]
+	public static bool panel_allow_customization ();
+	[CCode (cheader_filename = "libxfce4panel/libxfce4panel.h")]
+	public static unowned Gtk.Button panel_create_button ();
+	[CCode (cheader_filename = "libxfce4panel/libxfce4panel.h")]
+	public static unowned Gtk.ToggleButton panel_create_toggle_button ();
 }
diff --git a/packages/libxfcegui4-1.0/libxfcegui4-1.0.deps b/vapi/libxfce4ui-1.deps
similarity index 100%
rename from packages/libxfcegui4-1.0/libxfcegui4-1.0.deps
rename to vapi/libxfce4ui-1.deps
diff --git a/vapi/libxfce4ui-1.vapi b/vapi/libxfce4ui-1.vapi
new file mode 100644
index 0000000..a9bde3b
--- /dev/null
+++ b/vapi/libxfce4ui-1.vapi
@@ -0,0 +1,119 @@
+/* libxfce4ui-1.vapi generated by vapigen, do not modify. */
+
+[CCode (cprefix = "Xfce", lower_case_cprefix = "xfce_")]
+namespace Xfce {
+	[CCode (cheader_filename = "libxfce4ui/libxfce4ui.h")]
+	public class SMClient : GLib.Object {
+		public bool connect () throws GLib.Error;
+		public void disconnect ();
+		public static unowned Xfce.SMClient @get ();
+		public unowned string get_client_id ();
+		public unowned string get_current_directory ();
+		public static unowned Xfce.SMClient get_full (Xfce.SMClientRestartStyle restart_style, uchar priority, string resumed_client_id, string current_directory, string restart_command, string desktop_file);
+		public static unowned GLib.OptionGroup get_option_group (int argc, string argv);
+		public uchar get_priority ();
+		public unowned string get_restart_command ();
+		public Xfce.SMClientRestartStyle get_restart_style ();
+		public unowned string get_state_file ();
+		public static unowned Xfce.SMClient get_with_argv (int argc, string argv, Xfce.SMClientRestartStyle restart_style, uchar priority);
+		public bool is_connected ();
+		public bool is_resumed ();
+		public void request_shutdown (Xfce.SMClientShutdownHint shutdown_hint);
+		public void set_current_directory (string current_directory);
+		public void set_desktop_file (string desktop_file);
+		public void set_priority (uchar priority);
+		public void set_restart_command (string restart_command);
+		public void set_restart_style (Xfce.SMClientRestartStyle restart_style);
+		public int argc { construct; }
+		[CCode (array_length = false, array_null_terminated = true)]
+		public string[] argv { construct; }
+		public string client_id { get; construct; }
+		public string current_directory { get; set; }
+		[NoAccessorMethod]
+		public string desktop_file { owned get; set; }
+		public uchar priority { get; set construct; }
+		[CCode (array_length = false, array_null_terminated = true)]
+		public string[] restart_command { get; set; }
+		public Xfce.SMClientRestartStyle restart_style { get; set construct; }
+		[NoAccessorMethod]
+		public bool resumed { get; }
+		public virtual signal void quit ();
+		public virtual signal void quit_cancelled ();
+		public virtual signal bool quit_requested ();
+		public virtual signal void save_state (bool p0);
+		public virtual signal void save_state_extended ();
+	}
+	[CCode (cheader_filename = "libxfce4ui/libxfce4ui.h")]
+	public class TitledDialog : Gtk.Dialog, Gtk.Buildable, Atk.Implementor {
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public TitledDialog ();
+		public unowned string get_subtitle ();
+		public void set_subtitle (string subtitle);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public TitledDialog.with_buttons (string title, Gtk.Window parent, Gtk.DialogFlags flags, ...);
+		public string subtitle { get; set; }
+	}
+	[CCode (cprefix = "XFCE_SM_CLIENT_PRIORITY_", has_type_id = "0", cheader_filename = "libxfce4ui/libxfce4ui.h")]
+	public enum SMClientPriority {
+		HIGHEST,
+		WM,
+		CORE,
+		DESKTOP,
+		DEFAULT,
+		LOWEST
+	}
+	[CCode (cprefix = "XFCE_SM_CLIENT_RESTART_", cheader_filename = "libxfce4ui/libxfce4ui.h")]
+	public enum SMClientRestartStyle {
+		NORMAL,
+		IMMEDIATELY
+	}
+	[CCode (cprefix = "XFCE_SM_CLIENT_SHUTDOWN_HINT_", cheader_filename = "libxfce4ui/libxfce4ui.h")]
+	public enum SMClientShutdownHint {
+		ASK,
+		LOGOUT,
+		HALT,
+		REBOOT
+	}
+	[CCode (cheader_filename = "libxfce4ui/libxfce4ui.h")]
+	public const string BUTTON_TYPE_MIXED;
+	[CCode (cheader_filename = "libxfce4ui/libxfce4ui.h")]
+	public const string BUTTON_TYPE_PIXBUF;
+	[CCode (cheader_filename = "libxfce4ui/libxfce4ui.h")]
+	public const int LIBXFCE4UI_MAJOR_VERSION;
+	[CCode (cheader_filename = "libxfce4ui/libxfce4ui.h")]
+	public const int LIBXFCE4UI_MICRO_VERSION;
+	[CCode (cheader_filename = "libxfce4ui/libxfce4ui.h")]
+	public const int LIBXFCE4UI_MINOR_VERSION;
+	[CCode (cheader_filename = "libxfce4ui/libxfce4ui.h")]
+	public static bool dialog_confirm (Gtk.Window parent, string stock_id, string confirm_label, string secondary_text, string primary_format);
+	[CCode (cheader_filename = "libxfce4ui/libxfce4ui.h")]
+	public static void dialog_show_error (Gtk.Window parent, GLib.Error error, string primary_format);
+	[CCode (cheader_filename = "libxfce4ui/libxfce4ui.h")]
+	public static void dialog_show_info (Gtk.Window parent, string secondary_text, string primary_format);
+	[CCode (cheader_filename = "libxfce4ui/libxfce4ui.h")]
+	public static void dialog_show_warning (Gtk.Window parent, string secondary_text, string primary_format);
+	[CCode (cheader_filename = "libxfce4ui/libxfce4ui.h")]
+	public static unowned Gdk.Screen gdk_screen_get_active (int monitor_return);
+	[CCode (cheader_filename = "libxfce4ui/libxfce4ui.h")]
+	public static unowned Gtk.Widget gtk_button_new_mixed (string stock_id, string label);
+	[CCode (cheader_filename = "libxfce4ui/libxfce4ui.h")]
+	public static unowned Gtk.Widget gtk_frame_box_new (string label, out unowned Gtk.Widget container_return);
+	[CCode (cheader_filename = "libxfce4ui/libxfce4ui.h")]
+	public static unowned Gtk.Widget gtk_frame_box_new_with_content (string label, Gtk.Widget content);
+	[CCode (cheader_filename = "libxfce4ui/libxfce4ui.h")]
+	public static void gtk_window_center_on_active_screen (Gtk.Window window);
+	[CCode (cname = "libxfce4ui_check_version", cheader_filename = "libxfce4ui/libxfce4ui.h")]
+	public static unowned string libxfce4ui_check_version (uint required_major, uint required_minor, uint required_micro);
+	[CCode (cheader_filename = "libxfce4ui/libxfce4ui.h")]
+	public static int message_dialog (Gtk.Window parent, string title, string stock_id, string primary_text, string secondary_text, ...);
+	[CCode (cheader_filename = "libxfce4ui/libxfce4ui.h")]
+	public static unowned Gtk.Widget message_dialog_new (Gtk.Window parent, string title, string stock_id, string primary_text, string secondary_text, ...);
+	[CCode (cheader_filename = "libxfce4ui/libxfce4ui.h")]
+	public static unowned Gtk.Widget message_dialog_new_valist (Gtk.Window parent, string title, string icon_stock_id, string primary_text, string secondary_text, string first_button_text, void* args);
+	[CCode (cheader_filename = "libxfce4ui/libxfce4ui.h")]
+	public static bool spawn_command_line_on_screen (Gdk.Screen screen, string command_line, bool in_terminal, bool startup_notify) throws GLib.Error;
+	[CCode (cheader_filename = "libxfce4ui/libxfce4ui.h")]
+	public static bool spawn_on_screen (Gdk.Screen screen, string working_directory, string argv, string envp, GLib.SpawnFlags flags, bool startup_notify, uint32 startup_timestamp, string startup_icon_name) throws GLib.Error;
+	[CCode (cheader_filename = "libxfce4ui/libxfce4ui.h")]
+	public static bool spawn_on_screen_with_child_watch (Gdk.Screen screen, string working_directory, string argv, string envp, GLib.SpawnFlags flags, bool startup_notify, uint32 startup_timestamp, string startup_icon_name, GLib.Closure child_watch_closure) throws GLib.Error;
+}
diff --git a/vapi/libxfce4util-1.0.vapi b/vapi/libxfce4util-1.0.vapi
index 78075bc..0cd8993 100644
--- a/vapi/libxfce4util-1.0.vapi
+++ b/vapi/libxfce4util-1.0.vapi
@@ -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);
@@ -76,7 +76,7 @@ namespace Xfce {
 		THEMES
 	}
 	[CCode (cheader_filename = "libxfce4util/libxfce4util.h")]
-	public static unowned string get_license_text (Xfce.LicenseTextType type);
+	public static unowned string get_license_text (Xfce.LicenseTextType license_type);
 	[CCode (cname = "xfce_version_string", cheader_filename = "libxfce4util/libxfce4util.h")]
 	public static unowned string get_version_string ();
 	[CCode (cheader_filename = "libxfce4util/libxfce4util.h")]
diff --git a/vapi/libxfcegui4-1.0.vapi b/vapi/libxfcegui4-1.0.vapi
deleted file mode 100644
index 8cde8bc..0000000
--- a/vapi/libxfcegui4-1.0.vapi
+++ /dev/null
@@ -1,94 +0,0 @@
-/* libxfcegui4-1.0.vapi generated by vapigen, 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);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public AppMenuItem ();
-		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);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public AppMenuItem.with_label (string label);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public AppMenuItem.with_mnemonic (string label);
-		public string command { get; set; }
-		public string icon_name { get; set; }
-		[NoAccessorMethod]
-		public string label { owned get; set; }
-		public bool needs_term { get; set; }
-		[NoAccessorMethod]
-		public bool snotify { get; set; }
-		[NoAccessorMethod]
-		public bool use_underline { get; set; }
-	}
-	[Compact]
-	[CCode (cheader_filename = "libxfcegui4/libxfcegui4.h")]
-	public class Dialog {
-		[CCode (cname = "xfce_confirm")]
-		public static bool confirm (string text, string stock_id, string? action);
-		[CCode (cname = "xfce_err")]
-		public static void error (string format);
-		[CCode (cname = "xfce_info")]
-		public static void info (string format);
-		[CCode (cname = "xfce_warn")]
-		public static void warning (string format);
-	}
-	[Compact]
-	[CCode (cheader_filename = "libxfcegui4/libxfcegui4.h")]
-	public class Exec {
-		[CCode (cname = "xfce_exec")]
-		public static bool exec (string cmd, bool in_terminal, bool use_sn) throws GLib.Error;
-		[CCode (cname = "xfce_exec_with_envp")]
-		public static bool exec_with_envp (string cmd, bool in_terminal, bool use_sn, string[] envp) throws GLib.Error;
-	}
-	[Compact]
-	[CCode (cheader_filename = "libxfcegui4/libxfcegui4.h")]
-	public class Extensions {
-		[CCode (cname = "xfce_gdk_display_get_fullname")]
-		public static string gdk_display_get_fullname (Gdk.Display display);
-		[CCode (cname = "xfce_gdk_display_locate_monitor_with_pointer")]
-		public static unowned Gdk.Screen gdk_display_locate_monitor_with_pointer (Gdk.Display? display, out int? monitor_return);
-		[CCode (cname = "xfce_gdk_screen_get_fullname")]
-		public static string gdk_screen_get_fullname (Gdk.Screen screen);
-		[CCode (cname = "xfce_gdk_spawn_command_line_on_screen")]
-		public static bool gdk_spawn_command_line_on_screen (Gdk.Screen screen, string command_line) throws GLib.Error;
-		[CCode (cname = "xfce_gdk_spawn_on_screen")]
-		public static bool gdk_spawn_on_screen (Gdk.Screen screen, string? working_directory, string[] argv, string[]? envp, GLib.SpawnFlags flags, GLib.SpawnChildSetupFunc child_setup, out int? child_pid) throws GLib.Error;
-		[CCode (cname = "xfce_gdk_spawn_on_screen_with_pipes")]
-		public static bool gdk_spawn_on_screen_with_pipes (Gdk.Screen screen, string? working_directory, string[] argv, string[]? envp, GLib.SpawnFlags flags, GLib.SpawnChildSetupFunc child_setup, out int? child_pid, out int? standard_input, out int? standard_output, out int? standard_error) throws GLib.Error;
-		[CCode (cname = "xfce_gtk_window_center_on_monitor")]
-		public static void gtk_window_center_on_monitor (Gtk.Window window, Gdk.Screen screen, int monitor);
-		[CCode (cname = "xfce_gtk_window_center_on_monitor_with_pointer")]
-		public static void gtk_window_center_on_monitor_with_pointer (Gtk.Window window);
-	}
-	[Compact]
-	[CCode (cheader_filename = "libxfcegui4/libxfcegui4.h")]
-	public class Icon {
-		[CCode (cname = "xfce_inline_icon_at_size")]
-		public static Gdk.Pixbuf inline_at_size (string data, int width, int height);
-		[CCode (cname = "xfce_themed_icon_load")]
-		public static Gdk.Pixbuf load (string name, int size);
-		[CCode (cname = "xfce_themed_icon_lookup")]
-		public static string lookup (string name, int size);
-	}
-	[CCode (cheader_filename = "libxfcegui4/libxfcegui4.h")]
-	public class TitledDialog : Gtk.Dialog, Gtk.Buildable, Atk.Implementor {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public TitledDialog ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public TitledDialog.with_buttons (string? title, Gtk.Window? parent, Gtk.DialogFlags flags, ...);
-		public string subtitle { get; set; }
-	}
-	[Compact]
-	[CCode (cheader_filename = "libxfcegui4/libxfcegui4.h")]
-	public class WidgetHelpers {
-		[CCode (cname = "xfce_create_framebox")]
-		public static unowned Gtk.Widget create_framebox (string title, out unowned Gtk.Widget frame_bin);
-		[CCode (cname = "xfce_create_framebox_with_content")]
-		public static unowned Gtk.Widget create_framebox_with_content (string title, Gtk.Widget content);
-	}
-}
diff --git a/vapi/libxfconf-0.vapi b/vapi/libxfconf-0.vapi
index 497debe..a699cfd 100644
--- a/vapi/libxfconf-0.vapi
+++ b/vapi/libxfconf-0.vapi
@@ -4,6 +4,8 @@
 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, ...);
@@ -42,6 +42,8 @@ namespace Xfconf {
 		public bool set_uint64 (string property, uint64 value);
 		[CCode (has_construct_function = false)]
 		public Channel.with_property_base (string channel_name, string property_base);
+		[NoAccessorMethod]
+		public bool is_singleton { get; construct; }
 		public virtual signal void property_changed (string p0, GLib.Value p1);
 	}
 	[Compact]



More information about the Xfce4-commits mailing list