Updating branch refs/heads/master to 5a5072f3779a6f55580c0c390690f2662f14e3a3 (commit) from f68ba578500ee4783c5a69ced4ac9c3c94684f24 (commit)
commit 5a5072f3779a6f55580c0c390690f2662f14e3a3 Author: Azamat H. Hackimov <azamat.hacki...@gmail.com> Date: Sat Feb 19 04:08:14 2011 +0500 Switch to libxfce4ui, updated dependencies. Based on patch taken from Gentoo Portage tree (xfce4-xkb-plugin-0.5.3.3-libxfce4ui.patch) configure.in.in | 14 +++++++------- panel-plugin/Makefile.am | 4 ++-- panel-plugin/xfce4-xkb-plugin.h | 2 +- panel-plugin/xkb-settings-dialog.c | 30 +++++++++++++++--------------- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/configure.in.in b/configure.in.in index b02bdb2..b2c632a 100644 --- a/configure.in.in +++ b/configure.in.in @@ -10,14 +10,14 @@ dnl *** Version information *** dnl *************************** m4_define([xkb_version_major], [0]) m4_define([xkb_version_minor], [5]) -m4_define([xkb_version_micro], [3]) -m4_define([xkb_version_nano], [3]) +m4_define([xkb_version_micro], [4]) +m4_define([xkb_version_nano], [0]) m4_define([xkb_version], [xkb_version_major().xkb_version_minor().xkb_version_micro()ifelse(xkb_version_nano(), [], [], .[xkb_version_nano()])]) dnl *************************** dnl *** Initialize autoconf *** dnl *************************** -AC_COPYRIGHT([Copyright (c) 2006-2007 +AC_COPYRIGHT([Copyright (c) 2006-2011 The Xfce development team. All rights reserved.]) AC_INIT([xfce4-xkb-plugin], [xkb_version], [http://bugzilla.xfce.org/], [xfce4-xkb-plugin]) AC_PREREQ([2.50]) @@ -62,10 +62,10 @@ dnl *********************************** dnl *** Check for required packages *** dnl *********************************** XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0]) -XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.90.2]) -XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.90.2]) -XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.20]) -XDT_CHECK_PACKAGE([LIBXKLAVIER], [libxklavier], [3.2]) +XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.8.0]) +XDT_CHECK_PACKAGE([LIBXFCE4GUI], [libxfce4ui-1], [4.8.0]) +XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.8.0]) +XDT_CHECK_PACKAGE([LIBXKLAVIER], [libxklavier], [5.0]) XDT_CHECK_PACKAGE([LIBRSVG], [librsvg-2.0], [2.18]) XDT_CHECK_PACKAGE([LIBWNCK], [libwnck-1.0], [2.12]) diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am index 730e20c..5a14fa3 100644 --- a/panel-plugin/Makefile.am +++ b/panel-plugin/Makefile.am @@ -23,7 +23,7 @@ xfce4_xkb_plugin_SOURCES = \ xfce4_xkb_plugin_CFLAGS = \ @LIBXFCE4PANEL_CFLAGS@ \ @GTK_CFLAGS@ \ - @LIBXFCEGUI4_CFLAGS@ \ + @@LIBXFCE4UI_CFLAGS@ \ @LIBXFCE4UTIL_CFLAGS@ \ @LIBXKLAVIER_CFLAGS@ \ @LIBRSVG_CFLAGS@ \ @@ -36,7 +36,7 @@ xfce4_xkb_plugin_CFLAGS = \ xfce4_xkb_plugin_LDADD = \ @LIBXFCE4PANEL_LIBS@ \ @GTK_LIBS@ \ - @LIBXFCEGUI4_LIBS@ \ + @@LIBXFCE4UI_LIBS@ \ @LIBXFCE4UTIL_LIBS@ \ @LIBXKLAVIER_LIBS@ \ @LIBWNCK_LIBS@ \ diff --git a/panel-plugin/xfce4-xkb-plugin.h b/panel-plugin/xfce4-xkb-plugin.h index c99ebee..ddbaa46 100644 --- a/panel-plugin/xfce4-xkb-plugin.h +++ b/panel-plugin/xfce4-xkb-plugin.h @@ -29,7 +29,7 @@ #include "xkb-config.h" #include <libxfce4util/libxfce4util.h> -#include <libxfcegui4/libxfcegui4.h> +#include <libxfce4ui/libxfce4ui.h> #include <libxfce4panel/xfce-panel-plugin.h> #include <X11/Xlib.h> diff --git a/panel-plugin/xkb-settings-dialog.c b/panel-plugin/xkb-settings-dialog.c index 178ec5f..da1ddba 100644 --- a/panel-plugin/xkb-settings-dialog.c +++ b/panel-plugin/xkb-settings-dialog.c @@ -32,7 +32,7 @@ #include <gtk/gtk.h> #include <libxfce4panel/xfce-panel-plugin.h> -#include <libxfcegui4/libxfcegui4.h> +#include <libxfce4ui/libxfce4ui.h> #include "xfce4-xkb-plugin.h" #include "xfce4-xkb-plugin-private.h" @@ -447,7 +447,7 @@ xfce_xkb_configure (XfcePanelPlugin *plugin, t_xkb *xkb) { GtkWidget *display_type_optmenu, *group_policy_combo; - GtkWidget *vbox, *display_type_frame, *group_policy_frame; + GtkWidget *vbox, *display_type_frame, *group_policy_frame, *bin; GtkCellRenderer *renderer, *renderer2; @@ -480,14 +480,14 @@ xfce_xkb_configure (XfcePanelPlugin *plugin, gtk_container_add (GTK_CONTAINER (vbox), vbox1); gtk_widget_show (vbox1); - frame = xfce_framebox_new (_("Keyboard model:"), TRUE); + frame = xfce_gtk_frame_box_new (_("Keyboard model:"), &bin); gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE); - gtk_widget_show (frame); + gtk_widget_show ((frame)); gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0); xkb->kbd_model_combo = gtk_combo_box_new_with_model (GTK_TREE_MODEL (xkb->combo_store)); gtk_widget_set_size_request (xkb->kbd_model_combo, 230, -1); - xfce_framebox_add (XFCE_FRAMEBOX (frame), xkb->kbd_model_combo); + gtk_container_add (GTK_CONTAINER (bin), xkb->kbd_model_combo); gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (xkb->kbd_model_combo), renderer, TRUE); gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (xkb->kbd_model_combo), renderer, "text", 0); @@ -505,14 +505,14 @@ xfce_xkb_configure (XfcePanelPlugin *plugin, g_signal_connect (xkb->kbd_model_combo, "query-tooltip", G_CALLBACK (xkb_settings_config_modification_disabled_tooltip), xkb); /* toggle layout option */ - frame = xfce_framebox_new (_("Change layout option:"), TRUE); + frame = xfce_gtk_frame_box_new (_("Change layout option:"), &bin); gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE); gtk_widget_show (frame); gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0); xkb->toggle_options_combo = gtk_combo_box_new_with_model (GTK_TREE_MODEL (xkb->toggle_options_store)); gtk_widget_set_size_request (xkb->toggle_options_combo, 230, -1); - xfce_framebox_add (XFCE_FRAMEBOX (frame), xkb->toggle_options_combo); + gtk_container_add (GTK_CONTAINER (bin), xkb->toggle_options_combo); gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (xkb->toggle_options_combo), renderer, TRUE); gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (xkb->toggle_options_combo), renderer, "text", 0); xkb_settings_add_toggle_options_to_list (NULL, NULL, xkb); @@ -531,14 +531,14 @@ xfce_xkb_configure (XfcePanelPlugin *plugin, g_signal_connect (xkb->toggle_options_combo, "query-tooltip", G_CALLBACK (xkb_settings_config_modification_disabled_tooltip), xkb); /* compose key position option */ - frame = xfce_framebox_new (_("Compose key position:"), TRUE); + frame = xfce_gtk_frame_box_new (_("Compose key position:"), &bin); gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE); gtk_widget_show (frame); gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0); xkb->compose_key_options_combo = gtk_combo_box_new_with_model (GTK_TREE_MODEL (xkb->compose_key_options_store)); gtk_widget_set_size_request (xkb->compose_key_options_combo, 230, -1); - xfce_framebox_add (XFCE_FRAMEBOX (frame), xkb->compose_key_options_combo); + gtk_container_add (GTK_CONTAINER (bin), xkb->compose_key_options_combo); gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (xkb->compose_key_options_combo), renderer, TRUE); gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (xkb->compose_key_options_combo), renderer, "text", 0); xkb_settings_add_compose_key_position_options_to_list (NULL, NULL, xkb); @@ -558,13 +558,13 @@ xfce_xkb_configure (XfcePanelPlugin *plugin, /* the actual layouts */ - frame = xfce_framebox_new (_("Keyboard layouts:"), TRUE); + frame = xfce_gtk_frame_box_new (_("Keyboard layouts:"), &bin); gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE); gtk_widget_show (frame); gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0); hbox = gtk_hbox_new (FALSE, 5); - xfce_framebox_add (XFCE_FRAMEBOX (frame), hbox); + gtk_container_add (GTK_CONTAINER (bin), hbox); gtk_widget_show (hbox); // TreeView @@ -630,7 +630,7 @@ xfce_xkb_configure (XfcePanelPlugin *plugin, xkb_settings_edit_layout_btn_show (GTK_TREE_VIEW (xkb->layout_tree_view), xkb); /*****/ - display_type_frame = xfce_framebox_new (_("Show layout as:"), TRUE); + display_type_frame = xfce_gtk_frame_box_new (_("Show layout as:"), &bin); gtk_widget_show (display_type_frame); gtk_box_pack_start (GTK_BOX (vbox), display_type_frame, TRUE, TRUE, 2); @@ -638,9 +638,9 @@ xfce_xkb_configure (XfcePanelPlugin *plugin, gtk_combo_box_append_text (GTK_COMBO_BOX (display_type_optmenu), _("image")); gtk_combo_box_append_text (GTK_COMBO_BOX (display_type_optmenu), _("text")); gtk_widget_set_size_request (display_type_optmenu, 230, -1); - xfce_framebox_add (XFCE_FRAMEBOX (display_type_frame), display_type_optmenu); + gtk_container_add (GTK_CONTAINER (bin), display_type_optmenu); - group_policy_frame = xfce_framebox_new (_("Manage layout:"), TRUE); + group_policy_frame = xfce_gtk_frame_box_new (_("Manage layout:"), &bin); gtk_widget_show (group_policy_frame); gtk_box_pack_start (GTK_BOX (vbox), group_policy_frame, TRUE, TRUE, 2); @@ -649,7 +649,7 @@ xfce_xkb_configure (XfcePanelPlugin *plugin, gtk_combo_box_append_text (GTK_COMBO_BOX (group_policy_combo), _("per window")); gtk_combo_box_append_text (GTK_COMBO_BOX (group_policy_combo), _("per application")); gtk_widget_set_size_request (group_policy_combo, 230, -1); - xfce_framebox_add (XFCE_FRAMEBOX (group_policy_frame), group_policy_combo); + gtk_container_add (GTK_CONTAINER (bin), group_policy_combo); gtk_widget_show (group_policy_combo); gtk_widget_show_all (vbox); _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits