Updating branch refs/heads/master
         to b9c2e7759780f00cef19e6cc165a86c1d9cb1a2c (commit)
       from 8b753d260ba02953a54c59fd88cc949ab3041af1 (commit)

commit b9c2e7759780f00cef19e6cc165a86c1d9cb1a2c
Author: Mike Massonnet <[email protected]>
Date:   Mon Jan 25 09:56:40 2010 +0100

    Copy vapi files from xfce4-vala inside the source tree

 Makefile.am                       |    1 +
 configure.in.in                   |    1 -
 src/Makefile.am                   |    1 +
 third-party/libxfce4util-1.0.vapi |   84 +++++++++++++++++++++++++++++++++
 third-party/libxfcegui4-1.0.deps  |    8 +++
 third-party/libxfcegui4-1.0.vapi  |   94 +++++++++++++++++++++++++++++++++++++
 6 files changed, 188 insertions(+), 1 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 7447e8e..b7ea308 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,6 +10,7 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
 EXTRA_DIST =                                                           \
+       third-party                                                     \
        AUTHORS                                                         \
        ChangeLog                                                       \
        ChangeLog.pre-r7517                                             \
diff --git a/configure.in.in b/configure.in.in
index 73a1578..b0c4e3e 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -66,7 +66,6 @@ if test "x$USE_MAINTAINER_MODE" = "xyes" ; then
        if test "x$VALAC" = "x" ; then
                AC_MSG_ERROR([Cannot find the "valac" compiler in your PATH])
        fi
-       XDT_CHECK_PACKAGE([XFCE4VALA], [xfce4-vala], [4.6])
 fi
 
 dnl ******************************
diff --git a/src/Makefile.am b/src/Makefile.am
index ad9eec8..dc9ba31 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -25,6 +25,7 @@ xfmpc_SOURCES =                                               
                \
 xfmpc_VALAFLAGS =                                                      \
        --header=xfmpc.h                                                \
        --vapidir=.                                                     \
+       --vapidir=$(top_srcdir)/third-party                             \
        --pkg=libxfcegui4-1.0                                           \
        --pkg=config                                                    \
        --pkg=mpdclient                                                 \
diff --git a/third-party/libxfce4util-1.0.vapi 
b/third-party/libxfce4util-1.0.vapi
new file mode 100644
index 0000000..0cd8993
--- /dev/null
+++ b/third-party/libxfce4util-1.0.vapi
@@ -0,0 +1,84 @@
+/* libxfce4util-1.0.vapi generated by vapigen, do not modify. */
+
+[CCode (cprefix = "Xfce", lower_case_cprefix = "xfce_")]
+namespace Xfce {
+       [Compact]
+       [CCode (cheader_filename = "libxfce4util/libxfce4util.h")]
+       public class Kiosk {
+               [CCode (has_construct_function = false)]
+               public Kiosk (string module);
+               public bool query (string capability);
+       }
+       [Compact]
+       [CCode (cheader_filename = "libxfce4util/libxfce4util.h")]
+       public class PosixSignalHandler {
+               [CCode (cheader_filename = "libxfce4util/libxfce4util.h")]
+               public delegate void Callback (int @signal);
+               public static bool init () throws GLib.Error;
+               public static void restore_handler (int @signal);
+               public static bool set_handler (int @signal, 
Xfce.PosixSignalHandler.Callback handler) throws GLib.Error;
+               public static void shutdown ();
+       }
+       [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 ();
+               [CCode (cname = "xfce_rc_config_open", has_construct_function = 
false)]
+               public Rc.from_resource (Xfce.ResourceType type, string 
resource, bool readonly);
+               public unowned string get_entries (string group);
+               public unowned string get_group ();
+               public unowned string get_groups ();
+               public unowned string get_locale ();
+               public bool has_entry (string key);
+               public bool has_group (string group);
+               public bool is_dirty ();
+               public bool is_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);
+               public int read_int_entry (string key, int fallback);
+               public unowned string read_list_entry (string key, string 
delimiter);
+               public void rollback ();
+               public void set_group (string group);
+               public void write_bool_entry (string key, bool value);
+               public void write_entry (string key, string value);
+               public void write_int_entry (string key, int value);
+               public void write_list_entry (string key, string value, string 
separator);
+       }
+       [Compact]
+       [CCode (cheader_filename = "libxfce4util/libxfce4util.h")]
+       public class Resource {
+               [CCode (array_length = false)]
+               public static string[] dirs (Xfce.ResourceType type);
+               public static unowned string lookup (Xfce.ResourceType type, 
string filename);
+               [CCode (array_length = false)]
+               public static string[] lookup_all (Xfce.ResourceType type, 
string filename);
+               [CCode (array_length = false)]
+               public static string[] match (Xfce.ResourceType type, string 
pattern, bool unique);
+               public static unowned string save_location (Xfce.ResourceType 
type, string relpath, bool create);
+       }
+       [CCode (cprefix = "XFCE_LICENSE_TEXT_", cheader_filename = 
"libxfce4util/libxfce4util.h")]
+       public enum LicenseTextType {
+               BSD,
+               GPL,
+               LGPL
+       }
+       [CCode (cprefix = "XFCE_RESOURCE_", cheader_filename = 
"libxfce4util/libxfce4util.h")]
+       public enum ResourceType {
+               DATA,
+               CONFIG,
+               CACHE,
+               ICONS,
+               THEMES
+       }
+       [CCode (cheader_filename = "libxfce4util/libxfce4util.h")]
+       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")]
+       public static void textdomain (string package, string localedir, 
string? encoding = null);
+}
diff --git a/third-party/libxfcegui4-1.0.deps b/third-party/libxfcegui4-1.0.deps
new file mode 100644
index 0000000..b47d055
--- /dev/null
+++ b/third-party/libxfcegui4-1.0.deps
@@ -0,0 +1,8 @@
+atk
+gio-2.0
+cairo
+pango
+gdk-pixbuf-2.0
+gdk-2.0
+gtk+-2.0
+libxfce4util-1.0
diff --git a/third-party/libxfcegui4-1.0.vapi b/third-party/libxfcegui4-1.0.vapi
new file mode 100644
index 0000000..8cde8bc
--- /dev/null
+++ b/third-party/libxfcegui4-1.0.vapi
@@ -0,0 +1,94 @@
+/* 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);
+       }
+}
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits

Reply via email to