Hello community, here is the log from the commit of package xfce4-panel-plugins for openSUSE:11.3 checked in at Fri Dec 16 17:11:37 CET 2011.
-------- --- old-versions/11.3/all/xfce4-panel-plugins/xfce4-panel-plugins.changes 2010-05-07 11:41:05.000000000 +0200 +++ 11.3/xfce4-panel-plugins/xfce4-panel-plugins.changes 2011-12-13 13:59:23.000000000 +0100 @@ -1,0 +2,20 @@ +Tue Dec 13 00:17:06 UTC 2011 - [email protected] + +- update to version 0.5.4.2 + - text size on icon is now adjustable + - new flag: Cambodia + - Bosnian flag renamed from bs to ba + - code cleanup + - fixing memory leaks (bnc#734851) + - scrolling the plugin button cycle through layouts + - remove unnedeed g_strdup as g_strconcat already allocates memory + - switch to libxfce4ui, updated dependencies + - compilation with libxklavier 5.0 API + - prevent crashing when removing from panel + - new flag of Georgia + - new flag of Serbia, removed flag of Yugoslavia as obsoleted +- dropped all patches, all fixes have been integrated upstream +- added xfce4-xkb-plugin-0.5.4.2.patch in order to build against the + Xfce 4.6 stack + +------------------------------------------------------------------- Package does not exist at destination yet. Using Fallback old-versions/11.3/all/xfce4-panel-plugins Destination is old-versions/11.3/UPDATES/all/xfce4-panel-plugins calling whatdependson for 11.3-i586 Old: ---- xfce4-xkb-plugin-0.5.3.3-11.2.patch xfce4-xkb-plugin-0.5.3.3-11.3.patch xfce4-xkb-plugin-0.5.3.3.tar.bz2 New: ---- xfce4-xkb-plugin-0.5.4.2.patch xfce4-xkb-plugin-0.5.4.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfce4-panel-plugins.spec ++++++ --- /var/tmp/diff_new_pack.7HDF4x/_old 2011-12-16 17:07:34.000000000 +0100 +++ /var/tmp/diff_new_pack.7HDF4x/_new 2011-12-16 17:07:34.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package xfce4-panel-plugins (Version 4.6.3) +# spec file for package xfce4-panel-plugins # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,7 +23,7 @@ Name: xfce4-panel-plugins Url: http://goodies.xfce.org/projects/panel-plugins/start Version: %{panel_version} -Release: 2 +Release: 11.<RELEASE2> License: GPLv2+ Summary: Plugins for the Xfce panel Group: System/GUI/XFCE @@ -79,7 +79,7 @@ %define weather_version 0.7.3 %define xfapplet_version 0.1.0 %define xmms_version 0.5.2 -%define xkb_version 0.5.3.3 +%define xkb_version 0.5.4.2 %define xfmedia_remote_version 0.2.2 %ifarch s390 s390x %define plugins_arch %{nil} @@ -140,8 +140,7 @@ Patch8: xfce4-weather-plugin-%{weather_version}.patch Patch9: xfce4-eyes-plugin-%{eyes_version}.patch Patch10: xfce4-mount-plugin-%{mount_version}.patch -Patch11: xfce4-xkb-plugin-%{xkb_version}-11.2.patch -Patch12: xfce4-xkb-plugin-%{xkb_version}-11.3.patch +Patch11: xfce4-xkb-plugin-%{xkb_version}.patch Patch20: xfce4-fix-warnings.patch @@ -163,12 +162,7 @@ %patch8 %patch9 %patch10 -%if 0%{?suse_version} >= 1120 %patch11 -%endif -%if 0%{?suse_version} >= 1130 -%patch12 -%endif %patch20 -p1 mv governor-plugin-%{governor_version} xfce4-governor-plugin-%{governor_version} mv xfmedia-remote-plugin-%{xfmedia_remote_version} xfce4-xfmedia-remote-plugin-%{xfmedia_remote_version} @@ -178,6 +172,11 @@ # disable as-needed to fix build export SUSE_ASNEEDED=0 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" +( + cd xfce4-xkb-plugin-%{xkb_version} + mkdir m4 + xdt-autogen +) for name in %{plugins} ; do cd xfce4-$name-plugin-* if [ ! -f configure ] ; then @@ -233,7 +232,7 @@ %package -n xfce4-panel-plugin-battery License: GPLv2+ Version: %{battery_version} -Release: 21 +Release: 11.<RELEASE2> Summary: Plugins for the Xfce panel Group: System/GUI/XFCE Requires: xfce4-panel >= %{panel_version} @@ -252,7 +251,7 @@ %package -n xfce4-panel-plugin-cddrive License: GPLv2+ Version: %{cddrive_version} -Release: 13 +Release: 11.<RELEASE2> Summary: Plugin for the Xfce panel Group: System/GUI/XFCE Requires: xfce4-panel >= %{panel_version} @@ -270,7 +269,7 @@ %package -n xfce4-panel-plugin-cellmodem License: GPLv2+ Version: %{cellmodem_version} -Release: 18 +Release: 11.<RELEASE2> Summary: Plugins for the Xfce panel Group: System/GUI/XFCE Requires: xfce4-panel >= %{panel_version} @@ -289,7 +288,7 @@ %package -n xfce4-panel-plugin-clipman License: GPLv2+ Version: %{clipman_version} -Release: 2 +Release: 11.<RELEASE2> Summary: Plugins for the Xfce panel Group: System/GUI/XFCE Requires: xfce4-panel >= %{panel_version} @@ -308,7 +307,7 @@ %package -n xfce4-panel-plugin-cpufreq License: GPLv2+ Version: %{cpufreq_version} -Release: 18 +Release: 11.<RELEASE2> Summary: Plugins for the Xfce panel Group: System/GUI/XFCE Requires: xfce4-panel >= %{panel_version} @@ -327,7 +326,7 @@ %package -n xfce4-panel-plugin-cpugraph License: GPLv2+ Version: %{cpugraph_version} -Release: 7 +Release: 11.<RELEASE2> Summary: Plugins for the Xfce panel Group: System/GUI/XFCE Requires: xfce4-panel >= %{panel_version} @@ -346,7 +345,7 @@ %package -n xfce4-panel-plugin-datetime License: GPLv2+ Version: %{datetime_version} -Release: 7 +Release: 11.<RELEASE2> Summary: Plugins for the Xfce panel Group: System/GUI/XFCE Requires: xfce4-panel >= %{panel_version} @@ -365,7 +364,7 @@ %package -n xfce4-panel-plugin-diskperf License: GPLv2+ Version: %{diskperf_version} -Release: 21 +Release: 11.<RELEASE2> Summary: Plugins for the Xfce panel Group: System/GUI/XFCE Requires: xfce4-panel >= %{panel_version} @@ -384,7 +383,7 @@ %package -n xfce4-panel-plugin-eyes License: GPLv2+ Version: %{eyes_version} -Release: 21 +Release: 11.<RELEASE2> Summary: Plugins for the Xfce panel Group: System/GUI/XFCE Requires: xfce4-panel >= %{panel_version} @@ -403,7 +402,7 @@ %package -n xfce4-panel-plugin-fsguard License: GPLv2+ Version: %{fsguard_version} -Release: 7 +Release: 11.<RELEASE2> Summary: Plugins for the Xfce panel Group: System/GUI/XFCE Requires: xfce4-panel >= %{panel_version} @@ -422,7 +421,7 @@ %package -n xfce4-panel-plugin-genmon License: GPLv2+ Version: %{genmon_version} -Release: 18 +Release: 11.<RELEASE2> Summary: Plugins for the Xfce panel Group: System/GUI/XFCE Requires: xfce4-panel >= %{panel_version} @@ -443,7 +442,7 @@ %package -n xfce4-panel-plugin-mailwatch License: GPLv2+ Version: %{mailwatch_version} -Release: 18 +Release: 11.<RELEASE2> Summary: Plugins for the Xfce panel Group: System/GUI/XFCE Requires: xfce4-panel >= %{panel_version} @@ -462,7 +461,7 @@ %package -n xfce4-panel-plugin-mount License: GPLv2+ Version: %{mount_version} -Release: 7 +Release: 11.<RELEASE2> Summary: Plugins for the Xfce panel Group: System/GUI/XFCE Requires: xfce4-panel >= %{panel_version} @@ -481,7 +480,7 @@ %package -n xfce4-panel-plugin-mpc License: GPLv2+ Version: %{mpc_version} -Release: 2 +Release: 11.<RELEASE2> Summary: Plugins for the Xfce panel Group: System/GUI/XFCE Requires: xfce4-panel >= %{panel_version} @@ -500,7 +499,7 @@ %package -n xfce4-panel-plugin-netload License: GPLv2+ Version: %{netload_version} -Release: 21 +Release: 11.<RELEASE2> Summary: Plugins for the Xfce panel Group: System/GUI/XFCE Requires: xfce4-panel >= %{panel_version} @@ -521,7 +520,7 @@ %package -n xfce4-panel-plugin-notes License: GPLv2+ Version: %{notes_version} -Release: 2 +Release: 11.<RELEASE2> Summary: Plugins for the Xfce panel Group: System/GUI/XFCE Requires: xfce4-panel >= %{panel_version} @@ -542,7 +541,7 @@ %package -n xfce4-panel-plugin-places License: GPLv2+ Version: %{places_version} -Release: 6 +Release: 11.<RELEASE2> Summary: Plugins for the Xfce panel Group: System/GUI/XFCE Requires: xfce4-panel >= %{panel_version} @@ -561,7 +560,7 @@ %package -n xfce4-panel-plugin-quicklauncher License: GPLv2+ Version: %{quicklauncher_version} -Release: 18 +Release: 11.<RELEASE2> Summary: Plugins for the Xfce panel Group: System/GUI/XFCE Requires: xfce4-panel >= %{panel_version} @@ -580,7 +579,7 @@ %package -n xfce4-panel-plugin-radio License: GPLv2+ Version: %{radio_version} -Release: 7 +Release: 11.<RELEASE2> Summary: Plugins for the Xfce panel Group: System/GUI/XFCE Requires: xfce4-panel >= %{panel_version} @@ -599,7 +598,7 @@ %package -n xfce4-panel-plugin-screenshooter License: GPLv2+ Version: %{screenshooter_version} -Release: 6 +Release: 11.<RELEASE2> Summary: Plugins for the Xfce panel Group: System/GUI/XFCE Requires: xfce4-panel >= %{panel_version} @@ -620,7 +619,7 @@ %package -n xfce4-panel-plugin-sensors License: GPLv2+ Version: %{sensors_version} -Release: 7 +Release: 11.<RELEASE2> Summary: Plugins for the Xfce panel Group: System/GUI/XFCE Requires: xfce4-panel >= %{panel_version} @@ -641,7 +640,7 @@ %package -n xfce4-panel-plugin-smartbookmark License: GPLv2+ Version: %{smartbookmark_version} -Release: 18 +Release: 11.<RELEASE2> Summary: Plugins for the Xfce panel Group: System/GUI/XFCE Requires: xfce4-panel >= %{panel_version} @@ -660,7 +659,7 @@ %package -n xfce4-panel-plugin-smartpm License: GPLv2+ Version: %{smartpm_version} -Release: 18 +Release: 11.<RELEASE2> Summary: Plugins for the Xfce panel Group: System/GUI/XFCE Requires: xfce4-panel >= %{panel_version} @@ -679,7 +678,7 @@ %package -n xfce4-panel-plugin-systemload License: GPLv2+ Version: %{systemload_version} -Release: 21 +Release: 11.<RELEASE2> Summary: Plugins for the Xfce panel Group: System/GUI/XFCE Requires: xfce4-panel >= %{panel_version} @@ -698,7 +697,7 @@ %package -n xfce4-panel-plugin-timeout License: GPLv2+ Version: %{timeout_version} -Release: 18 +Release: 11.<RELEASE2> Summary: Plugins for the Xfce panel Group: System/GUI/XFCE Requires: xfce4-panel >= %{panel_version} @@ -717,7 +716,7 @@ %package -n xfce4-panel-plugin-timer License: GPLv2+ Version: %{timer_version} -Release: 7 +Release: 11.<RELEASE2> Summary: Plugins for the Xfce panel Group: System/GUI/XFCE Requires: xfce4-panel >= %{panel_version} @@ -736,7 +735,7 @@ %package -n xfce4-panel-plugin-verve License: GPLv2+ Version: %{verve_version} -Release: 7 +Release: 11.<RELEASE2> Summary: Plugins for the Xfce panel Group: System/GUI/XFCE Requires: xfce4-panel >= %{panel_version} @@ -755,7 +754,7 @@ %package -n xfce4-panel-plugin-wavelan License: GPLv2+ Version: %{wavelan_version} -Release: 7 +Release: 11.<RELEASE2> Summary: Plugins for the Xfce panel Group: System/GUI/XFCE Requires: xfce4-panel >= %{panel_version} @@ -774,7 +773,7 @@ %package -n xfce4-panel-plugin-weather License: GPLv2+ Version: %{weather_version} -Release: 6 +Release: 11.<RELEASE2> Summary: Plugins for the Xfce panel Group: System/GUI/XFCE Requires: xfce4-panel >= %{panel_version} @@ -793,7 +792,7 @@ %package -n xfce4-panel-plugin-xfapplet License: GPLv2+ Version: %{xfapplet_version} -Release: 18 +Release: 11.<RELEASE2> Summary: Plugins for the Xfce panel Group: System/GUI/XFCE Requires: gnome-applets @@ -813,7 +812,7 @@ %package -n xfce4-panel-plugin-xmms License: GPLv2+ Version: %{xmms_version} -Release: 7 +Release: 11.<RELEASE2> Summary: Plugins for the Xfce panel Group: System/GUI/XFCE Requires: xfce4-panel >= %{panel_version} @@ -832,7 +831,7 @@ %package -n xfce4-panel-plugin-xkb License: GPLv2+ Version: %{xkb_version} -Release: 7 +Release: 0.<RELEASE2> Summary: Plugins for the Xfce panel Group: System/GUI/XFCE Requires: xfce4-panel >= %{panel_version} @@ -851,7 +850,7 @@ %package -n xfce4-panel-plugin-governor License: GPLv2+ Version: %{governor_version} -Release: 13 +Release: 11.<RELEASE2> Summary: Plugin for the Xfce panel Group: System/GUI/XFCE Requires: xfce4-panel >= %{panel_version} @@ -870,7 +869,7 @@ %package -n xfce4-panel-plugin-xfmedia-remote License: GPLv2+ Version: %{xfmedia_remote_version} -Release: 13 +Release: 11.<RELEASE2> Summary: Plugins for the Xfce panel Group: System/GUI/XFCE Requires: xfce4-panel >= %{panel_version} ++++++ xfce4-xkb-plugin-0.5.3.3-11.2.patch -> xfce4-xkb-plugin-0.5.4.2.patch ++++++ --- old-versions/11.3/all/xfce4-panel-plugins/xfce4-xkb-plugin-0.5.3.3-11.2.patch 2010-02-02 19:51:08.000000000 +0100 +++ 11.3/xfce4-panel-plugins/xfce4-xkb-plugin-0.5.4.2.patch 2011-12-13 13:59:24.000000000 +0100 @@ -1,22 +1,171 @@ -Index: xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-config.c -=================================================================== ---- xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-config.c.orig -+++ xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-config.c -@@ -150,7 +150,7 @@ xkb_config_initialize_xkb_options (t_xkb - config->application_map = g_hash_table_new (g_direct_hash, NULL); - - registry = xkl_config_registry_get_instance (config->engine); -- xkl_config_registry_load (registry); -+ xkl_config_registry_load (registry, FALSE); - - config_item = xkl_config_item_new (); - -@@ -547,7 +547,7 @@ xkb_config_get_xkl_registry () - if (!config) return NULL; - - registry = xkl_config_registry_get_instance (config->engine); -- xkl_config_registry_load (registry); -+ xkl_config_registry_load (registry, FALSE); +diff -urNp xfce4-xkb-plugin-0.5.4.2.orig/configure.in xfce4-xkb-plugin-0.5.4.2/configure.in +--- xfce4-xkb-plugin-0.5.4.2.orig/configure.in 2011-10-15 14:49:25.000000000 +0200 ++++ xfce4-xkb-plugin-0.5.4.2/configure.in 2011-12-13 11:12:25.915013963 +0100 +@@ -69,10 +69,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.8.0]) +-XDT_CHECK_PACKAGE([LIBXFCE4UI], [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([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([LIBRSVG], [librsvg-2.0], [2.18]) + XDT_CHECK_PACKAGE([LIBWNCK], [libwnck-1.0], [2.12]) - return registry; - } +diff -urNp xfce4-xkb-plugin-0.5.4.2.orig/panel-plugin/Makefile.am xfce4-xkb-plugin-0.5.4.2/panel-plugin/Makefile.am +--- xfce4-xkb-plugin-0.5.4.2.orig/panel-plugin/Makefile.am 2011-10-15 14:41:34.000000000 +0200 ++++ xfce4-xkb-plugin-0.5.4.2/panel-plugin/Makefile.am 2011-12-13 11:12:25.915013963 +0100 +@@ -23,7 +23,7 @@ xfce4_xkb_plugin_SOURCES = \ + xfce4_xkb_plugin_CFLAGS = \ + @LIBXFCE4PANEL_CFLAGS@ \ + @GTK_CFLAGS@ \ +- @LIBXFCE4UI_CFLAGS@ \ ++ @LIBXFCEGUI4_CFLAGS@ \ + @LIBXFCE4UTIL_CFLAGS@ \ + @LIBXKLAVIER_CFLAGS@ \ + @LIBRSVG_CFLAGS@ \ +@@ -36,7 +36,7 @@ xfce4_xkb_plugin_CFLAGS = \ + xfce4_xkb_plugin_LDADD = \ + @LIBXFCE4PANEL_LIBS@ \ + @GTK_LIBS@ \ +- @LIBXFCE4UI_LIBS@ \ ++ @LIBXFCEGUI4_LIBS@ \ + @LIBXFCE4UTIL_LIBS@ \ + @LIBXKLAVIER_LIBS@ \ + @LIBWNCK_LIBS@ \ +diff -urNp xfce4-xkb-plugin-0.5.4.2.orig/panel-plugin/xfce4-xkb-plugin.h xfce4-xkb-plugin-0.5.4.2/panel-plugin/xfce4-xkb-plugin.h +--- xfce4-xkb-plugin-0.5.4.2.orig/panel-plugin/xfce4-xkb-plugin.h 2011-10-15 14:41:34.000000000 +0200 ++++ xfce4-xkb-plugin-0.5.4.2/panel-plugin/xfce4-xkb-plugin.h 2011-12-13 11:12:25.915013963 +0100 +@@ -29,7 +29,7 @@ + #include "xkb-config.h" + + #include <libxfce4util/libxfce4util.h> +-#include <libxfce4ui/libxfce4ui.h> ++#include <libxfcegui4/libxfcegui4.h> + #include <libxfce4panel/xfce-panel-plugin.h> + + #include <X11/Xlib.h> +diff -urNp xfce4-xkb-plugin-0.5.4.2.orig/panel-plugin/xkb-settings-dialog.c xfce4-xkb-plugin-0.5.4.2/panel-plugin/xkb-settings-dialog.c +--- xfce4-xkb-plugin-0.5.4.2.orig/panel-plugin/xkb-settings-dialog.c 2011-10-15 14:41:34.000000000 +0200 ++++ xfce4-xkb-plugin-0.5.4.2/panel-plugin/xkb-settings-dialog.c 2011-12-13 11:12:25.916013963 +0100 +@@ -32,7 +32,7 @@ + #include <gtk/gtk.h> + + #include <libxfce4panel/xfce-panel-plugin.h> +-#include <libxfce4ui/libxfce4ui.h> ++#include <libxfcegui4/libxfcegui4.h> + + #include "xfce4-xkb-plugin.h" + #include "xfce4-xkb-plugin-private.h" +@@ -494,7 +494,8 @@ xfce_xkb_configure (XfcePanelPlugin *plu + t_xkb *xkb) + { + GtkWidget *display_type_optmenu, *group_policy_combo; +- GtkWidget *vbox, *display_type_frame, *group_policy_frame, *bin; ++ GtkWidget *vbox, *display_type_frame, *group_policy_frame; ++ + + GtkCellRenderer *renderer, *renderer2; + GtkWidget *vbox1, *vbox2, *hbox, *frame; +@@ -526,14 +527,14 @@ xfce_xkb_configure (XfcePanelPlugin *plu + gtk_container_add (GTK_CONTAINER (vbox), vbox1); + gtk_widget_show (vbox1); + +- frame = xfce_gtk_frame_box_new (_("Keyboard model:"), &bin); ++ frame = xfce_framebox_new (_("Keyboard model:"), TRUE); + 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); +- gtk_container_add (GTK_CONTAINER (bin), xkb->kbd_model_combo); ++ xfce_framebox_add (XFCE_FRAMEBOX (frame), 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); + +@@ -551,14 +552,14 @@ xfce_xkb_configure (XfcePanelPlugin *plu + g_signal_connect (xkb->kbd_model_combo, "query-tooltip", G_CALLBACK (xkb_settings_config_modification_disabled_tooltip), xkb); + + /* toggle layout option */ +- frame = xfce_gtk_frame_box_new (_("Change layout option:"), &bin); ++ frame = xfce_framebox_new (_("Change layout option:"), TRUE); + 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); +- gtk_container_add (GTK_CONTAINER (bin), xkb->toggle_options_combo); ++ xfce_framebox_add (XFCE_FRAMEBOX (frame), 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); +@@ -577,14 +578,14 @@ xfce_xkb_configure (XfcePanelPlugin *plu + g_signal_connect (xkb->toggle_options_combo, "query-tooltip", G_CALLBACK (xkb_settings_config_modification_disabled_tooltip), xkb); + + /* compose key position option */ +- frame = xfce_gtk_frame_box_new (_("Compose key position:"), &bin); ++ frame = xfce_framebox_new (_("Compose key position:"), TRUE); + 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); +- gtk_container_add (GTK_CONTAINER (bin), xkb->compose_key_options_combo); ++ xfce_framebox_add (XFCE_FRAMEBOX (frame), 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); +@@ -604,13 +605,13 @@ xfce_xkb_configure (XfcePanelPlugin *plu + + + /* the actual layouts */ +- frame = xfce_gtk_frame_box_new (_("Keyboard layouts:"), &bin); ++ frame = xfce_framebox_new (_("Keyboard layouts:"), TRUE); + 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); +- gtk_container_add (GTK_CONTAINER (bin), hbox); ++ xfce_framebox_add (XFCE_FRAMEBOX (frame), hbox); + gtk_widget_show (hbox); + + // TreeView +@@ -676,7 +677,7 @@ xfce_xkb_configure (XfcePanelPlugin *plu + xkb_settings_edit_layout_btn_show (GTK_TREE_VIEW (xkb->layout_tree_view), xkb); + + /*****/ +- display_type_frame = xfce_gtk_frame_box_new (_("Show layout as:"), &bin); ++ display_type_frame = xfce_framebox_new (_("Show layout as:"), TRUE); + gtk_widget_show (display_type_frame); + gtk_box_pack_start (GTK_BOX (vbox), display_type_frame, TRUE, TRUE, 2); + +@@ -684,9 +685,9 @@ xfce_xkb_configure (XfcePanelPlugin *plu + 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); +- gtk_container_add (GTK_CONTAINER (bin), display_type_optmenu); ++ xfce_framebox_add (XFCE_FRAMEBOX (display_type_frame), display_type_optmenu); + +- group_policy_frame = xfce_gtk_frame_box_new (_("Manage layout:"), &bin); ++ group_policy_frame = xfce_framebox_new (_("Manage layout:"), TRUE); + gtk_widget_show (group_policy_frame); + gtk_box_pack_start (GTK_BOX (vbox), group_policy_frame, TRUE, TRUE, 2); + +@@ -695,7 +696,7 @@ xfce_xkb_configure (XfcePanelPlugin *plu + 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); +- gtk_container_add (GTK_CONTAINER (bin), group_policy_combo); ++ xfce_framebox_add (XFCE_FRAMEBOX (group_policy_frame), group_policy_combo); + gtk_widget_show (group_policy_combo); + + gtk_widget_show_all (vbox); ++++++ xfce4-xkb-plugin-0.5.3.3.tar.bz2 -> xfce4-xkb-plugin-0.5.4.2.tar.bz2 ++++++ ++++ 51051 lines of diff (skipped) continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
