rpms/control-center/F-12 about-me-delete.patch, NONE, 1.1 control-center.spec, 1.496, 1.497

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/control-center/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19355

Modified Files:
	control-center.spec 
Added Files:
	about-me-delete.patch 
Log Message:
fix a crash in the about-me capplet


about-me-delete.patch:
 gnome-about-me.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE about-me-delete.patch ---
diff -up gnome-control-center-2.28.0/capplets/about-me/gnome-about-me.c.about-me-delete gnome-control-center-2.28.0/capplets/about-me/gnome-about-me.c
--- gnome-control-center-2.28.0/capplets/about-me/gnome-about-me.c.about-me-delete	2009-08-17 04:40:16.000000000 -0400
+++ gnome-control-center-2.28.0/capplets/about-me/gnome-about-me.c	2009-10-06 00:18:40.622398272 -0400
@@ -72,6 +71,7 @@ typedef struct {
 	gchar 		*username;
 
 	guint	      	 commit_timeout_id;
+	gboolean	 destroyed;
 } GnomeAboutMe;
 
 static GnomeAboutMe *me = NULL;
@@ -183,7 +183,8 @@ about_me_destroy (GnomeAboutMe *me)
 	g_free (me->person);
 	g_free (me->login);
 	g_free (me->username);
-	g_free (me);
+
+	me->destroyed = TRUE;
 }
 
 static void
@@ -275,6 +276,9 @@ about_me_focus_out (GtkWidget *widget, G
 	const gchar *wid;
 	gint i;
 
+	if (me->destroyed)
+		return FALSE;
+
 	wid = gtk_widget_get_name (widget);
 
 	if (wid == NULL)


Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/F-12/control-center.spec,v
retrieving revision 1.496
retrieving revision 1.497
diff -u -p -r1.496 -r1.497
--- control-center.spec	3 Oct 2009 02:23:53 -0000	1.496
+++ control-center.spec	6 Oct 2009 04:25:00 -0000	1.497
@@ -24,7 +24,7 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 2.28.0
-Release: 14%{?dist}
+Release: 15%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -67,6 +67,9 @@ Patch52: shell-markup.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=596939
 Patch53: keybinding-bugs.patch
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=592348
+Patch54: about-me-delete.patch
+
 # call the Fedora/RHEL graphical passwd changing apps
 Patch95: gnome-control-center-2.25.2-passwd.patch
 Patch96: gnome-control-center-2.25.2-gecos.patch
@@ -204,6 +207,7 @@ for the GNOME desktop.
 %patch51 -p1 -b .mirror-crash
 %patch52 -p1 -b .shell-markup
 %patch53 -p1 -b .keybinding-bugs
+%patch54 -p1 -b .about-me-delete
 
 # vendor configuration patches
 %patch95 -p1 -b .passwd
@@ -394,6 +398,9 @@ fi
 
 
 %changelog
+* Tue Oct  6 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-15
+- Fix a crash in the about-me capplet (#525590)
+
 * Fri Oct  2 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-14
 - Fix some logic errors in the keybinding capplet that can lead
   to missing entries