Hello community, here is the log from the commit of package gnome-settings-daemon for openSUSE:Factory checked in at Fri Jul 31 19:33:48 CEST 2009. -------- --- GNOME/gnome-settings-daemon/gnome-settings-daemon.changes 2009-06-11 15:52:31.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-settings-daemon/gnome-settings-daemon.changes 2009-07-29 17:33:09.000000000 +0200 @@ -1,0 +2,63 @@ +Tue Jul 28 18:02:32 CEST 2009 - lmedinas@gmail.com + +- Update to version 2.27.5: + + Only use applicable configurations for switching with the + XF86Display hotkey + + Only use applicable configurations when auto-configuring + outputs during hotplug + + Really lay out displays from left to right when using the + XF86Display hotkey + + For the XF86Display hotkey, preserve the cycle order when + sanitizing the configurations + + Remove last libglade dependency + + Improved low disk space warning (bgo#573980) + + Fix compiler warnings + + Translation updates. +- Remove libglade2-devel BuildRequires. + +------------------------------------------------------------------- +Mon Jul 20 12:50:35 CEST 2009 - vuntz@novell.com + +- Update to version 2.27.4: + + Remove screensaver plugin, it's autostarted now + + Don't take too long in RANDR D-Bus method implementation + + Add support for Synaptics touchpads + + Don't spawn more than one syncdaemon + + Depend on gnome-desktop >= 2.26.3 + + Update gnome-volume-control code from master + + Fix order of arguments to strstr + + Depend on libxklavier 4.0 + + Remove libglade dependency from media-keys and keyboard plugins + + Updated translations. +- Respin gnome-settings-daemon-system-proxy-configuration.diff. +- Update gnome-settings-daemon-try-harder-gdm-layout.patch for + libxklavier API change. + +------------------------------------------------------------------- +Mon Jun 15 18:45:21 CEST 2009 - vuntz@novell.com + +- Update to version 2.27.3: + + Make the RANDR tray icon's per-monitor labels explicitly black + (bgo#556050) + + Include config.h so that the notifications code in housekeeping + plugin can actually be built (bgo#584217) + + Use "screen reader" instead of "screenreader" in schema + (bgo#572911) + + Lots of RANDR fixes and improvements + + Nicer handling of broken XKB configuration in gconf + (bgo#585259) + + Make 'locate pointer' deal with wm/cm changes (bgo#585209) + + Be more careful when comparing two key structs (bgo#580616) + + Updated translations. +- Drop gnome-settings-daemon-filter-invalid-xkb.patch: fixed + upstream. +- Add gnome-settings-daemon-activate-xkb-with-broken.patch to fix a + minor bug in xkb handling on login, with broken config. +- Update gnome-settings-daemon-try-harder-gdm-layout.patch to also + make sure a keybinding to switch layouts is available, and to not + add the gdm layout if we already have a variant for the layout. +- Comment out + gnome-settings-daemon-bnc461755-randr-rotate-wacom.diff: it needs + to be rebased. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- gnome-settings-daemon-2.27.1.tar.bz2 gnome-settings-daemon-filter-invalid-xkb.patch New: ---- gnome-settings-daemon-2.27.5.tar.bz2 gnome-settings-daemon-activate-xkb-with-broken.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-settings-daemon.spec ++++++ --- /var/tmp/diff_new_pack.Es56f9/_old 2009-07-31 19:33:27.000000000 +0200 +++ /var/tmp/diff_new_pack.Es56f9/_new 2009-07-31 19:33:27.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package gnome-settings-daemon (Version 2.27.1) +# spec file for package gnome-settings-daemon (Version 2.27.5) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -25,7 +25,6 @@ BuildRequires: gnome-desktop-devel BuildRequires: gnome-patch-translation BuildRequires: intltool -BuildRequires: libglade2-devel BuildRequires: libgnomekbd-devel BuildRequires: libnotify-devel BuildRequires: libpulse-devel @@ -33,8 +32,8 @@ BuildRequires: xorg-x11 License: GPL v2 or later Group: System/GUI/GNOME -Version: 2.27.1 -Release: 3 +Version: 2.27.5 +Release: 1 Summary: Settings daemon for the GNOME desktop Source: %{_name}-%{version}.tar.bz2 # PATCH-FEATURE-OPENSUSE gnome-settings-daemon-system-proxy-configuration.diff @@ -45,12 +44,12 @@ Patch8: gnome-settings-daemon-apport-monitor.patch # PATCH-FEATURE-UPSTREAM gnome-settings-daemon-bnc462640-mute-action.patch bnc462640 bgo572365 vuntz@novell.com -- Mute button should always mute sound instead of toggling mute status Patch10: gnome-settings-daemon-bnc462640-mute-action.patch -# PATCH-FEATURE-OPENSUSE gnome-settings-daemon-bnc461755-randr-rotate-wacom.diff bnc461755 federico@novell.com - Add the option of rotating a Wacom tablet when rotating the monitor with RANDR +# PATCH-NEEDS-REBASE gnome-settings-daemon-bnc461755-randr-rotate-wacom.diff bnc461755 federico@novell.com - Add the option of rotating a Wacom tablet when rotating the monitor with RANDR (was PATCH-FEATURE-OPENSUSE) Patch11: gnome-settings-daemon-bnc461755-randr-rotate-wacom.diff +# PATCH-FIX-UPSTREAM gnome-settings-daemon-activate-xkb-with-broken.patch bgo585868 vuntz@novell.com -- Make sure we activate the right layout when broken layouts are in gconf +Patch12: gnome-settings-daemon-activate-xkb-with-broken.patch # PATCH-FIX-UPSTREAM # gnome-settings-daemon-try-harder-gdm-layout.patch bgo585290 vuntz@novell.com -- Try harder to use the keyboard layout passed from GDM -Patch12: gnome-settings-daemon-try-harder-gdm-layout.patch -# PATCH-FIX-UPSTREAM gnome-settings-daemon-filter-invalid-xkb.patch bgo585259 vuntz@novell.com -- Filter invalid xkb layouts from the gconf config (usually added by old gdm) -Patch13: gnome-settings-daemon-filter-invalid-xkb.patch +Patch13: gnome-settings-daemon-try-harder-gdm-layout.patch Url: http://www.gnome.org Requires: %{name}-lang = %{version} Obsoletes: resapplet @@ -108,7 +107,8 @@ %patch6 -p1 %patch8 -p1 %patch10 -p1 -%patch11 -p1 +# PATCH-NEEDS-REBASE +#%patch11 -p1 %patch12 -p1 %patch13 -p1 gnome-patch-translation-update @@ -139,6 +139,7 @@ %postun -p /sbin/ldconfig %pre -f %{name}.schemas_pre + %posttrans -f %{name}.schemas_posttrans %preun -f %{name}.schemas_preun ++++++ gnome-settings-daemon-2.27.1.tar.bz2 -> gnome-settings-daemon-2.27.5.tar.bz2 ++++++ ++++ 19608 lines of diff (skipped) ++++++ gnome-settings-daemon-activate-xkb-with-broken.patch ++++++ Index: gnome-settings-daemon-2.27.3/plugins/keyboard/gsd-keyboard-xkb.c =================================================================== --- gnome-settings-daemon-2.27.3.orig/plugins/keyboard/gsd-keyboard-xkb.c +++ gnome-settings-daemon-2.27.3/plugins/keyboard/gsd-keyboard-xkb.c @@ -257,6 +257,20 @@ apply_xkb_settings (void) gkbd_keyboard_config_load_from_x_current (¤t_sys_kbd_config, NULL); + if (!try_activating_xkb_config_if_new (¤t_sys_kbd_config)) { + if (filter_xkb_config ()) { + if (!try_activating_xkb_config_if_new (¤t_sys_kbd_config)) { + g_warning ("Could not activate the filtered XKB configuration"); + activation_error (); + } + } else { + g_warning ("Could not activate the XKB configuration"); + activation_error (); + } + } else + xkl_debug (100, + "Actual KBD configuration was not changed: redundant notification\n"); + if (gdm_layout != NULL) { /* If there are multiple layouts, * try to find the one closest to the gdm layout @@ -275,20 +289,6 @@ apply_xkb_settings (void) } } - if (!try_activating_xkb_config_if_new (¤t_sys_kbd_config)) { - if (filter_xkb_config ()) { - if (!try_activating_xkb_config_if_new (¤t_sys_kbd_config)) { - g_warning ("Could not activate the filtered XKB configuration"); - activation_error (); - } - } else { - g_warning ("Could not activate the XKB configuration"); - activation_error (); - } - } else - xkl_debug (100, - "Actual KBD configuration was not changed: redundant notification\n"); - if (group_to_activate != -1) xkl_engine_lock_group (current_config.engine, group_to_activate); ++++++ gnome-settings-daemon-system-proxy-configuration.diff ++++++ ++++ 721 lines (skipped) ++++ between GNOME/gnome-settings-daemon/gnome-settings-daemon-system-proxy-configuration.diff ++++ and /mounts/work_src_done/STABLE/gnome-settings-daemon/gnome-settings-daemon-system-proxy-configuration.diff ++++++ gnome-settings-daemon-try-harder-gdm-layout.patch ++++++ --- /var/tmp/diff_new_pack.Es56f9/_old 2009-07-31 19:33:29.000000000 +0200 +++ /var/tmp/diff_new_pack.Es56f9/_new 2009-07-31 19:33:29.000000000 +0200 @@ -1,8 +1,151 @@ -diff --git a/plugins/keyboard/gsd-keyboard-xkb.c b/plugins/keyboard/gsd-keyboard-xkb.c -index 346fdba..19ae642 100644 ---- a/plugins/keyboard/gsd-keyboard-xkb.c -+++ b/plugins/keyboard/gsd-keyboard-xkb.c -@@ -158,18 +158,42 @@ apply_xkb_settings (void) +Index: gnome-settings-daemon-2.27.4/plugins/keyboard/gsd-keyboard-xkb.c +=================================================================== +--- gnome-settings-daemon-2.27.4.orig/plugins/keyboard/gsd-keyboard-xkb.c ++++ gnome-settings-daemon-2.27.4/plugins/keyboard/gsd-keyboard-xkb.c +@@ -137,6 +137,103 @@ apply_desktop_settings (void) + gkbd_desktop_config_activate (¤t_config); + } + ++#define GROUP_SWITCHERS_GROUP "grp" ++#define DEFAULT_GROUP_SWITCH "grp:shifts_toggle" ++ ++static void ++_maybe_add_layout_switcher (GSList *layouts, ++ GConfClient *conf_client) ++{ ++ GSList *options; ++ GSList *option; ++ gboolean any_switcher; ++ ++ /* do we have more than one layout? */ ++ if (g_slist_length (layouts) > 1) ++ return; ++ ++ /* If yes, we need to make sure there's a way to change the layout ++ * Based on xkl_layout_chooser_add_default_switcher_if_necessary() in ++ * capplets/keyboard/gnome-keyboard-properties-xkbltadd.c ++ * (gnome-control-center) */ ++ options = gconf_client_get_list (conf_client, ++ GKBD_KEYBOARD_CONFIG_KEY_OPTIONS, ++ GCONF_VALUE_STRING, ++ NULL); ++ ++ if (options == NULL) { ++ /* nothing in gconf, get the current options from X */ ++ GkbdKeyboardConfig kbd_config; ++ ++ gkbd_keyboard_config_init (&kbd_config, ++ conf_client, ++ xkl_engine); ++ gkbd_keyboard_config_load_from_x_initial (&kbd_config, NULL); ++ ++ for (option = kbd_config.options; option != NULL; option = option->next) { ++ options = g_slist_prepend (options, ++ g_strdup (option->data)); ++ } ++ ++ options = g_slist_reverse (options); ++ ++ gkbd_keyboard_config_term (&kbd_config); ++ } ++ ++ any_switcher = FALSE; ++ ++ while (option != NULL) { ++ char *g, *o; ++ ++ if (gkbd_keyboard_config_split_items (option->data, &g, &o)) { ++ if (!g_ascii_strcasecmp (g, GROUP_SWITCHERS_GROUP)) { ++ any_switcher = TRUE; ++ break; ++ } ++ } ++ option = option->next; ++ } ++ ++ /* no option to switch between layouts, let's add one */ ++ if (!any_switcher) { ++ XklConfigItem *ci = xkl_config_item_new (); ++ ++ g_snprintf (ci->name, XKL_MAX_CI_NAME_LENGTH, ++ DEFAULT_GROUP_SWITCH); ++ ++ /* we make sure the option we want to add is known */ ++ if (!xkl_registry) { ++ xkl_registry = xkl_config_registry_get_instance (xkl_engine); ++ if (!xkl_config_registry_load (xkl_registry, TRUE)) { ++ g_object_unref (xkl_registry); ++ xkl_registry = NULL; ++ } ++ } ++ ++ if (xkl_registry && ++ xkl_config_registry_find_option (xkl_registry, ++ GROUP_SWITCHERS_GROUP, ++ ci)) { ++ const char *id; ++ ++ id = gkbd_keyboard_config_merge_items ++ (GROUP_SWITCHERS_GROUP, ++ DEFAULT_GROUP_SWITCH); ++ ++ options = g_slist_append (options, g_strdup (id)); ++ gconf_client_set_list (conf_client, ++ GKBD_KEYBOARD_CONFIG_KEY_OPTIONS, ++ GCONF_VALUE_STRING, options, ++ NULL); ++ } ++ ++ g_object_unref (G_OBJECT (ci)); ++ } ++ ++ g_slist_foreach (options, (GFunc) g_free, NULL); ++ g_slist_free (options); ++} ++ + static gboolean + try_activating_xkb_config_if_new (GkbdKeyboardConfig *current_sys_kbd_config) + { +@@ -211,6 +308,38 @@ filter_xkb_config (void) + return any_change; + } + ++static int ++_xkb_layout_strcmp (const char *a, ++ const char *b) ++{ ++ char *layout_a; ++ char *layout_b; ++ char *p; ++ int ret; ++ ++ if (!a) ++ return -(a != b); ++ if (!b) ++ return (a != b); ++ ++ layout_a = g_strdup (a); ++ p = strchr (layout_a, '\t'); ++ if (p != NULL) ++ p[0] = '\0'; ++ ++ layout_b = g_strdup (b); ++ p = strchr (layout_b, '\t'); ++ if (p != NULL) ++ p[0] = '\0'; ++ ++ ret = strcmp (layout_a, layout_b); ++ ++ g_free (layout_a); ++ g_free (layout_b); ++ ++ return ret; ++} ++ + static void + apply_xkb_settings (void) + { +@@ -233,18 +362,44 @@ apply_xkb_settings (void) gdm_keyboard_layout = NULL; if (gdm_layout != NULL) { GSList *layouts; @@ -22,7 +165,7 @@ + * list from becoming full if the user has a habit of selecting + * many different keyboard layouts in GDM. */ + -+ found_node = g_slist_find_custom (layouts, gdm_layout, g_strcmp0); ++ found_node = g_slist_find_custom (layouts, gdm_layout, _xkb_layout_strcmp); + + if (found_node) { + if (g_slist_position (layouts, found_node) > 3) { @@ -40,6 +183,8 @@ + * whichever comes first */ + layouts = g_slist_insert (layouts, g_strdup (gdm_layout), 3); + ++ _maybe_add_layout_switcher (layouts, conf_client); ++ gconf_client_set_list (conf_client, GKBD_KEYBOARD_CONFIG_KEY_LAYOUTS, GCONF_VALUE_STRING, layouts, ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org