Updating branch refs/heads/master
to 1e0602f93fefb64ec9005c08fe6db1c870599a1d (commit)
from 8488138d57aa9e49248e7f3dba492c68baf10ab8 (commit)
commit 1e0602f93fefb64ec9005c08fe6db1c870599a1d
Author: Romain Bouvier <skun...@archlinux.fr>
Date: Sun Jun 6 15:35:43 2010 +0200
Port xfmpc to libxfce4ui
configure.in.in | 4 +-
src/Makefile.am | 6 +-
src/preferences-dialog.vala | 6 +-
src/song-dialog.vala | 2 +-
.../{libxfcegui4-1.0.deps => libxfce4ui-1.deps} | 0
third-party/libxfce4ui-1.vapi | 119 ++++++++++++++++++++
third-party/libxfcegui4-1.0.vapi | 94 ---------------
7 files changed, 128 insertions(+), 103 deletions(-)
diff --git a/configure.in.in b/configure.in.in
index 1b7e52d..4003642 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -52,9 +52,9 @@ dnl ***********************************
dnl *** Check for required packages ***
dnl ***********************************
XDT_CHECK_LIBX11_REQUIRE()
-XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.12.0])
+XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.14.0])
XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.12.0])
-XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.4.0])
+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.7.0])
XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.4.0])
XDT_CHECK_PACKAGE([LIBMPD], [libmpd], [0.15.0])
diff --git a/src/Makefile.am b/src/Makefile.am
index dc9ba31..4603ac0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -26,7 +26,7 @@ xfmpc_VALAFLAGS =
\
--header=xfmpc.h \
--vapidir=. \
--vapidir=$(top_srcdir)/third-party \
- --pkg=libxfcegui4-1.0 \
+ --pkg=libxfce4ui-1 \
--pkg=config \
--pkg=mpdclient \
--pkg=xfce-arrow-button
@@ -35,7 +35,7 @@ xfmpc_CFLAGS =
\
@GTHREAD_CFLAGS@ \
@LIBX11_CFLAGS@ \
@GTK_CFLAGS@ \
- @LIBXFCEGUI4_CFLAGS@ \
+ @LIBXFCE4UI_CFLAGS@ \
@LIBXFCE4UTIL_CFLAGS@ \
@LIBMPD_CFLAGS@
@@ -43,7 +43,7 @@ xfmpc_LDADD =
\
@GTHREAD_LIBS@ \
@LIBX11_LIBS@ \
@GTK_LIBS@ \
- @LIBXFCEGUI4_LIBS@ \
+ @LIBXFCE4UI_LIBS@ \
@LIBXFCE4UTIL_LIBS@ \
@LIBMPD_LIBS@
diff --git a/src/preferences-dialog.vala b/src/preferences-dialog.vala
index 108bd7c..4d3bd74 100644
--- a/src/preferences-dialog.vala
+++ b/src/preferences-dialog.vala
@@ -57,7 +57,7 @@ namespace Xfmpc {
notebook.append_page (vbox, label);
var vbox2 = new Gtk.VBox (false, 6);
- var frame =
Xfce.WidgetHelpers.create_framebox_with_content (_("Connection"), vbox2);
+ var frame = Xfce.gtk_frame_box_new_with_content
(_("Connection"), vbox2);
vbox.pack_start (frame, false, false, 0);
this.entry_use_defaults = new
Gtk.CheckButton.with_mnemonic (_("Use _default system settings"));
@@ -111,7 +111,7 @@ namespace Xfmpc {
notebook.append_page (vbox, label);
vbox2 = new Gtk.VBox (false, 6);
- frame = Xfce.WidgetHelpers.create_framebox_with_content
(_("Statusbar"), vbox2);
+ frame = Xfce.gtk_frame_box_new_with_content
(_("Statusbar"), vbox2);
vbox.pack_start (frame, false, false, 0);
this.show_statusbar = new Gtk.CheckButton.with_mnemonic
(_("Show _stastusbar"));
@@ -120,7 +120,7 @@ namespace Xfmpc {
vbox2.pack_start (this.show_statusbar, false, false, 0);
vbox2 = new Gtk.VBox (false, 6);
- frame = Xfce.WidgetHelpers.create_framebox_with_content
(_("Song Format"), vbox2);
+ frame = Xfce.gtk_frame_box_new_with_content (_("Song
Format"), vbox2);
vbox.pack_start (frame, false, false, 0);
hbox = new Gtk.HBox (false, 2);
diff --git a/src/song-dialog.vala b/src/song-dialog.vala
index c08c0b4..0b08f0a 100644
--- a/src/song-dialog.vala
+++ b/src/song-dialog.vala
@@ -40,7 +40,7 @@ namespace Xfmpc {
this.vbox.set_spacing (0);
var vbox2 = new Gtk.VBox (false, 0);
- var frame =
Xfce.WidgetHelpers.create_framebox_with_content ("", vbox2);
+ var frame = Xfce.gtk_frame_box_new_with_content ("",
vbox2);
var attrs = new Pango.AttrList ();
attrs.insert (Pango.attr_weight_new
(Pango.Weight.BOLD));
diff --git a/third-party/libxfcegui4-1.0.deps b/third-party/libxfce4ui-1.deps
similarity index 100%
rename from third-party/libxfcegui4-1.0.deps
rename to third-party/libxfce4ui-1.deps
diff --git a/third-party/libxfce4ui-1.vapi b/third-party/libxfce4ui-1.vapi
new file mode 100644
index 0000000..a9bde3b
--- /dev/null
+++ b/third-party/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/third-party/libxfcegui4-1.0.vapi b/third-party/libxfcegui4-1.0.vapi
deleted file mode 100644
index 8cde8bc..0000000
--- a/third-party/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);
- }
-}
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
