diff options
| author | Matthias Clasen <mclasen@fedoraproject.org> | 2006-09-18 13:59:15 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@fedoraproject.org> | 2006-09-18 13:59:15 +0000 |
| commit | 7ceb3da6e0085812023a0df8a311ee901f0bd8d5 (patch) | |
| tree | 3d076389269809a28e158ea5ab4de7b3f1db4144 | |
| parent | 1c905c66e50aa6953f7088effe04d7c7b64c617f (diff) | |
| download | gnome-applets-7ceb3da6e0085812023a0df8a311ee901f0bd8d5.tar.gz gnome-applets-7ceb3da6e0085812023a0df8a311ee901f0bd8d5.tar.xz gnome-applets-7ceb3da6e0085812023a0df8a311ee901f0bd8d5.zip | |
fix a keyboard indicator segfaultgnome-applets-2_16_0_1-5_fc6
| -rw-r--r-- | gnome-applets-2.16.0.1-keyboard-indicator-segfault.patch | 30 | ||||
| -rw-r--r-- | gnome-applets.spec | 9 |
2 files changed, 38 insertions, 1 deletions
diff --git a/gnome-applets-2.16.0.1-keyboard-indicator-segfault.patch b/gnome-applets-2.16.0.1-keyboard-indicator-segfault.patch new file mode 100644 index 0000000..85b44b0 --- /dev/null +++ b/gnome-applets-2.16.0.1-keyboard-indicator-segfault.patch @@ -0,0 +1,30 @@ +--- gnome-applets-2.16.0.1/libgswitchit/gnome-kbd-indicator.c.keyboard-indicator-segfault 2006-08-12 21:26:53.000000000 -0400 ++++ gnome-applets-2.16.0.1/libgswitchit/gnome-kbd-indicator.c 2006-09-18 09:23:54.000000000 -0400 +@@ -410,18 +410,22 @@ + xkl_engine_get_num_groups (globals.engine); + globals.full_group_names = + g_new0 (char *, total_groups + 1); ++ globals.short_group_names = ++ g_new0 (char *, total_groups + 1); + + 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++] = +- g_strdup ((char *) lst->data); ++ for (i = 0; lst; lst = lst->next,i++) { ++ globals.short_group_names[i] = ++ globals.full_group_names[i] = ++ g_strdup ((char *) lst->data); + } + } else { + for (i = total_groups; --i >= 0;) { +- globals.full_group_names[i] = +- g_strdup_printf ("Group %d", i); ++ globals.short_group_names[i] = ++ globals.full_group_names[i] = ++ g_strdup_printf ("Group %d", i); + } + } + } diff --git a/gnome-applets.spec b/gnome-applets.spec index 5db600b..579977d 100644 --- a/gnome-applets.spec +++ b/gnome-applets.spec @@ -32,7 +32,7 @@ Summary: Small applications for the GNOME panel Name: gnome-applets Version: 2.16.0.1 -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 1 License: GPL Group: User Interface/Desktops @@ -67,6 +67,9 @@ Patch23: gnome-applets-2.16.0.1-desktop-clicks.patch # http://bugzilla.gnome.org/show_bug.cgi?id=356138 Patch24: gnome-applets-2.16.0.1-trash-icon-size.patch +# http://bugzilla.gnome.org/show_bug.cgi?id=356536 +Patch25: gnome-applets-2.16.0.1-keyboard-indicator-segfault.patch + URL: http://www.gnome.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -156,6 +159,7 @@ small utilities for the GNOME panel. %patch22 -p1 -b .mixer-icon-size %patch23 -p1 -b .desktop-clicks %patch24 -p1 -b .trash-icon-size +%patch25 -p1 -b .keyboard-indicator-segfault cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png @@ -323,6 +327,9 @@ fi %{_libdir}/pkgconfig/gweather.pc %changelog +* Mon Sep 18 2006 Matthias Clasen <mclasen@redhat.com> - 1:2.16.0.1-5 +- Fix a segfault in the keyboard indicator applet + * Fri Sep 15 2006 Matthias Clasen <mclasen@redhat.com> - 1:2.16.0.1-4 - Fix some icon size issues in the trash applet |