rpms/libgnomekbd/devel list-leak.patch, NONE, 1.1 libgnomekbd.spec, 1.36, 1.37

[Matthias Clasen]

Author: mclasen

Update of /cvs/extras/rpms/libgnomekbd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29831

Modified Files:
	libgnomekbd.spec 
Added Files:
	list-leak.patch 
Log Message:
Plug a small memory leak


list-leak.patch:

--- NEW FILE list-leak.patch ---
Index: libgnomekbd/gkbd-keyboard-config.c
===================================================================
--- libgnomekbd/gkbd-keyboard-config.c	(revision 302)
+++ libgnomekbd/gkbd-keyboard-config.c	(working copy)
@@ -325,7 +325,7 @@
 {
 	GError *gerror = NULL;
 	gchar *pc;
-	GSList *pl;
+	GSList *pl, *l;
 
 	pc = gconf_client_get_string (kbd_config->conf_client,
 				      param_names[0], &gerror);
@@ -347,7 +347,7 @@
 
 	gkbd_keyboard_config_layouts_reset (kbd_config);
 
-	pl = gconf_client_get_list (kbd_config->conf_client,
+	l = pl = gconf_client_get_list (kbd_config->conf_client,
 				    param_names[1],
 				    GCONF_VALUE_STRING, &gerror);
 	if (pl == NULL || gerror != NULL) {
@@ -359,17 +359,17 @@
 		}
 	}
 
-	while (pl != NULL) {
-		xkl_debug (150, "Loaded Kbd layout: [%s]\n", pl->data);
+	while (l != NULL) {
+		xkl_debug (150, "Loaded Kbd layout: [%s]\n", l->data);
 		gkbd_keyboard_config_layouts_add_full (kbd_config,
-						       pl->data);
-		pl = pl->next;
+						       l->data);
+		l = l->next;
 	}
 	gkbd_keyboard_config_string_list_reset (&pl);
 
 	gkbd_keyboard_config_options_reset (kbd_config);
 
-	pl = gconf_client_get_list (kbd_config->conf_client,
+	l = pl = gconf_client_get_list (kbd_config->conf_client,
 				    param_names[2],
 				    GCONF_VALUE_STRING, &gerror);
 	if (pl == NULL || gerror != NULL) {
@@ -381,12 +381,12 @@
 		}
 	}
 
-	while (pl != NULL) {
-		xkl_debug (150, "Loaded Kbd option: [%s]\n", pl->data);
+	while (l != NULL) {
+		xkl_debug (150, "Loaded Kbd option: [%s]\n", l->data);
 		gkbd_keyboard_config_options_add_full (kbd_config,
-						       (const gchar *) pl->
+						       (const gchar *) l->
 						       data);
-		pl = pl->next;
+		l = l->next;
 	}
 	gkbd_keyboard_config_string_list_reset (&pl);
 }


Index: libgnomekbd.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnomekbd/devel/libgnomekbd.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- libgnomekbd.spec	12 May 2008 03:05:20 -0000	1.36
+++ libgnomekbd.spec	29 Aug 2008 22:24:26 -0000	1.37
@@ -1,6 +1,6 @@
 Name:           libgnomekbd
 Version:       	2.23.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A keyboard configuration library
 
 Group:          System Environment/Libraries
@@ -27,6 +27,8 @@
 Requires(post): GConf2
 Requires(preun): GConf2
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=549874
+Patch0: list-leak.patch
 
 %description
 The libgnomekbd package contains a GNOME library which manages
@@ -60,6 +62,7 @@
 
 %prep
 %setup -q
+%patch0 -p0 -b .list-leak
 
 %build
 %configure --disable-static --enable-compile-warnings=no
@@ -129,6 +132,9 @@
 
 
 %changelog
+* Fri Aug 29 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.2-2
+- Plug a small memory leak
+
 * Sun May 11 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.2-1
 - Update to 2.23.2