Hello community, here is the log from the commit of package gnome-applets checked in at Fri Nov 17 00:35:40 CET 2006. -------- --- GNOME/gnome-applets/gnome-applets.changes 2006-11-14 19:08:59.000000000 +0100 +++ /mounts/work_src_done/STABLE/gnome-applets/gnome-applets.changes 2006-11-16 19:44:51.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Nov 16 19:43:58 CET 2006 - danw@suse.de + +- Add a patch from CVS to fix crash in keyboard layout indicator + when there are multiple layouts available. #216201 + +------------------------------------------------------------------- New: ---- gnome-applets-216201-kbd-indicator-crash.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-applets.spec ++++++ --- /var/tmp/diff_new_pack.yysrCZ/_old 2006-11-17 00:35:19.000000000 +0100 +++ /var/tmp/diff_new_pack.yysrCZ/_new 2006-11-17 00:35:19.000000000 +0100 @@ -27,7 +27,7 @@ %endif Autoreqprov: on Version: 2.16.1 -Release: 26 +Release: 28 Summary: A Collection of Useful Programs for the GNOME 2.x Desktop Panel Source: %{name}-%{version}.tar.bz2 Source1: gnome-applets-2.9.3.1-modemlights.tar.bz2 @@ -38,6 +38,7 @@ Patch23: gnome-applets-modemlights-potfiles.patch Patch24: gnome-applets-modemlights-smpppd.patch Patch27: gnome-applets-autobuild-warning.patch +Patch28: gnome-applets-216201-kbd-indicator-crash.patch URL: http://www.gnome.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: filesystem /usr/bin/touch gconf2 @@ -131,6 +132,7 @@ %patch23 %patch24 %patch27 +%patch28 gnome-patch-translation-update %build @@ -256,6 +258,9 @@ %{prefix}/%_lib/pkgconfig/*.pc %changelog -n gnome-applets +* Thu Nov 16 2006 - danw@suse.de +- Add a patch from CVS to fix crash in keyboard layout indicator + when there are multiple layouts available. #216201 * Tue Nov 14 2006 - jhargadon@suse.de - commented out the section in patch gnome-applets-in-proc.patch that deals with mixer. This was done so that the mixer is not ++++++ gnome-applets-216201-kbd-indicator-crash.patch ++++++ --- libgswitchit/gnome-kbd-indicator.c +++ libgswitchit/gnome-kbd-indicator.c @@ -248,7 +248,6 @@ if (xkl_engine_get_features (globals.engine) & XKLF_MULTIPLE_LAYOUTS_SUPPORTED) { - char *short_group_name; char *full_layout_name = (char *) g_slist_nth_data (globals.kbd_cfg. layouts, @@ -264,11 +263,14 @@ sizeof (cfg_item.name), "%s", layout_name); - short_group_name = - globals.short_group_names[group]; - if (short_group_name != NULL - && *short_group_name != '\0') { - layout_name = g_strdup (short_group_name); + if (globals.short_group_names != NULL) { + char *short_group_name = + globals.short_group_names[group]; + if (short_group_name != NULL + && *short_group_name != '\0') { + layout_name = + g_strdup (short_group_name); + } } } else layout_name = @@ -414,8 +416,8 @@ if (xkl_engine_get_features (globals.engine) & XKLF_MULTIPLE_LAYOUTS_SUPPORTED) { GSList *lst = globals.kbd_cfg.layouts; - for (i = 0; lst; lst = lst->next) { - globals.full_group_names[i++] = + for (i = 0; lst; lst = lst->next, i++) { + globals.full_group_names[i] = g_strdup ((char *) lst->data); } } else { @@ -439,12 +441,19 @@ &globals.kbd_cfg); g_strfreev (globals.full_group_names); - g_strfreev (globals.short_group_names); + globals.full_group_names = NULL; + + if (globals.short_group_names != NULL) { + g_strfreev (globals.short_group_names); + globals.short_group_names = NULL; + } + gnome_kbd_indicator_load_group_names (); ForAllIndicators () { gnome_kbd_indicator_reinit_ui (gki); - } NextIndicator (); + } + NextIndicator (); } /* Should be called once for all applets */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org