rpms/gnome-applets/devel gnome-applets-2.16.0.1-keyboard-indicator-segfault.patch, NONE, 1.1 gnome-applets.spec, 1.183, 1.184

Mon Sep 18 13:59:17 UTC 2006

Author: mclasen

Update of /cvs/dist/rpms/gnome-applets/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6090

Modified Files:
	gnome-applets.spec 
Added Files:
	gnome-applets-2.16.0.1-keyboard-indicator-segfault.patch 
Log Message:
fix a keyboard indicator segfault


gnome-applets-2.16.0.1-keyboard-indicator-segfault.patch:
 gnome-kbd-indicator.c |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

--- NEW FILE gnome-applets-2.16.0.1-keyboard-indicator-segfault.patch ---
--- 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);
 			}
 		}
 	}


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- gnome-applets.spec	15 Sep 2006 15:08:05 -0000	1.183
+++ gnome-applets.spec	18 Sep 2006 13:59:15 -0000	1.184
@@ -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 @@
 # 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 @@
 %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 @@
 %{_libdir}/pkgconfig/gweather.pc
 
 %changelog
+* Mon Sep 18 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.16.0.1-5
+- Fix a segfault in the keyboard indicator applet
+
 * Fri Sep 15 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.16.0.1-4
 - Fix some icon size issues in the trash applet
 


