[Xfce4-commits] <xfce4-vala:master> Update libxfce4ui-1 package

[Mike Massonnet]

Updating branch refs/heads/master
         to 842ab66e440d28121d72247ff4534520d144f21a (commit)
       from 0d4edc991e9c8905627e2241d9f067d590dd94e3 (commit)

commit 842ab66e440d28121d72247ff4534520d144f21a
Author: Mike Massonnet <mmassonnet at gmail.com>
Date:   Sun Oct 21 03:15:09 2012 +0200

    Update libxfce4ui-1 package

 packages/libxfce4ui-1/libxfce4ui-1.defines  |    2 +-
 packages/libxfce4ui-1/libxfce4ui-1.deps     |    2 +-
 packages/libxfce4ui-1/libxfce4ui-1.excludes |    1 -
 packages/libxfce4ui-1/libxfce4ui-1.gi       |   15 ++++++++++++---
 vapi/libxfce4ui-1.vapi                      |    8 +++++---
 5 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/packages/libxfce4ui-1/libxfce4ui-1.defines b/packages/libxfce4ui-1/libxfce4ui-1.defines
index 30dbd62..c2e1547 100644
--- a/packages/libxfce4ui-1/libxfce4ui-1.defines
+++ b/packages/libxfce4ui-1/libxfce4ui-1.defines
@@ -1 +1 @@
--DLIBXFCE4UI_INSIDE_LIBXFCE4UI_H -DXFCE_DISABLE_DEPRECATED
+-DLIBXFCE4UI_COMPILATION
diff --git a/packages/libxfce4ui-1/libxfce4ui-1.deps b/packages/libxfce4ui-1/libxfce4ui-1.deps
index b47d055..ca81f3e 100644
--- a/packages/libxfce4ui-1/libxfce4ui-1.deps
+++ b/packages/libxfce4ui-1/libxfce4ui-1.deps
@@ -1,3 +1,4 @@
+libxfce4util-1.0
 atk
 gio-2.0
 cairo
@@ -5,4 +6,3 @@ pango
 gdk-pixbuf-2.0
 gdk-2.0
 gtk+-2.0
-libxfce4util-1.0
diff --git a/packages/libxfce4ui-1/libxfce4ui-1.excludes b/packages/libxfce4ui-1/libxfce4ui-1.excludes
index b943ec0..e69de29 100644
--- a/packages/libxfce4ui-1/libxfce4ui-1.excludes
+++ b/packages/libxfce4ui-1/libxfce4ui-1.excludes
@@ -1 +0,0 @@
-include/xfce4/libxfce4ui-1/libxfce4ui/libxfce4ui.h
diff --git a/packages/libxfce4ui-1/libxfce4ui-1.gi b/packages/libxfce4ui-1/libxfce4ui-1.gi
index 296d53d..d1e888c 100644
--- a/packages/libxfce4ui-1/libxfce4ui-1.gi
+++ b/packages/libxfce4ui-1/libxfce4ui-1.gi
@@ -19,6 +19,15 @@
 				<parameter name="primary_format" type="gchar*"/>
 			</parameters>
 		</function>
+		<function name="dialog_show_help" symbol="xfce_dialog_show_help">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="parent" type="GtkWindow*"/>
+				<parameter name="application" type="gchar*"/>
+				<parameter name="page" type="gchar*"/>
+				<parameter name="offset" type="gchar*"/>
+			</parameters>
+		</function>
 		<function name="dialog_show_info" symbol="xfce_dialog_show_info">
 			<return-type type="void"/>
 			<parameters>
@@ -157,11 +166,11 @@
 			<member name="XFCE_SM_CLIENT_PRIORITY_DEFAULT" value="50"/>
 			<member name="XFCE_SM_CLIENT_PRIORITY_LOWEST" value="255"/>
 		</enum>
-		<enum name="XfceSMClientRestartStyle">
+		<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">
+		<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"/>
@@ -393,7 +402,7 @@
 		</object>
 		<constant name="LIBXFCE4UI_MAJOR_VERSION" type="int" value="4"/>
 		<constant name="LIBXFCE4UI_MICRO_VERSION" type="int" value="0"/>
-		<constant name="LIBXFCE4UI_MINOR_VERSION" type="int" value="8"/>
+		<constant name="LIBXFCE4UI_MINOR_VERSION" type="int" value="10"/>
 		<constant name="XFCE_BUTTON_TYPE_MIXED" type="char*" value="button-mixed"/>
 		<constant name="XFCE_BUTTON_TYPE_PIXBUF" type="char*" value="button-pixbuf"/>
 	</namespace>
diff --git a/vapi/libxfce4ui-1.vapi b/vapi/libxfce4ui-1.vapi
index b06ae28..43f7c41 100644
--- a/vapi/libxfce4ui-1.vapi
+++ b/vapi/libxfce4ui-1.vapi
@@ -1,4 +1,4 @@
-/* libxfce4ui-1.vapi generated by vapigen-0.16, do not modify. */
+/* libxfce4ui-1.vapi generated by vapigen, do not modify. */
 
 namespace Xfce {
 	[CCode (cheader_filename = "libxfce4ui/libxfce4ui.h")]
@@ -63,12 +63,12 @@ namespace Xfce {
 		DEFAULT,
 		LOWEST
 	}
-	[CCode (cheader_filename = "libxfce4ui/libxfce4ui.h", cprefix = "XFCE_SM_CLIENT_RESTART_", has_type_id = false)]
+	[CCode (cheader_filename = "libxfce4ui/libxfce4ui.h", cprefix = "XFCE_SM_CLIENT_RESTART_")]
 	public enum SMClientRestartStyle {
 		NORMAL,
 		IMMEDIATELY
 	}
-	[CCode (cheader_filename = "libxfce4ui/libxfce4ui.h", cprefix = "XFCE_SM_CLIENT_SHUTDOWN_HINT_", has_type_id = false)]
+	[CCode (cheader_filename = "libxfce4ui/libxfce4ui.h", cprefix = "XFCE_SM_CLIENT_SHUTDOWN_HINT_")]
 	public enum SMClientShutdownHint {
 		ASK,
 		LOGOUT,
@@ -90,6 +90,8 @@ namespace Xfce {
 	[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_help (Gtk.Window parent, string application, string page, string offset);
+	[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);