rpms/gnome-session/devel legacy-crash.patch, NONE, 1.1 gnome-session.spec, 1.163, 1.164

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/gnome-session/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4822

Modified Files:
	gnome-session.spec 
Added Files:
	legacy-crash.patch 
Log Message:
fix a crash


legacy-crash.patch:

--- NEW FILE legacy-crash.patch ---
diff -up gnome-session-2.23.2.2/gnome-session/session.c.legacy-crash gnome-session-2.23.2.2/gnome-session/session.c
--- gnome-session-2.23.2.2/gnome-session/session.c.legacy-crash	2008-05-15 19:46:02.000000000 -0400
+++ gnome-session-2.23.2.2/gnome-session/session.c	2008-05-15 19:47:48.000000000 -0400
@@ -152,8 +152,13 @@ out:
 static void
 append_app (GsmSession *session, GsmApp *app)
 {
-  const char *basename = gsm_app_get_basename (app);
-  GsmApp *dup = g_hash_table_lookup (session->apps_by_name, basename);
+  const char *basename;
+  GsmApp *dup = NULL;
+
+  basename = gsm_app_get_basename (app);
+
+  if (basename) 
+    dup = g_hash_table_lookup (session->apps_by_name, basename);
 
   if (dup)
     {
@@ -163,7 +168,8 @@ append_app (GsmSession *session, GsmApp 
     }
 
   session->apps = g_slist_append (session->apps, app);
-  g_hash_table_insert (session->apps_by_name, g_strdup (basename), app);
+  if (basename)
+    g_hash_table_insert (session->apps_by_name, g_strdup (basename), app);
 }
 
 static void


Index: gnome-session.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- gnome-session.spec	15 May 2008 02:48:19 -0000	1.163
+++ gnome-session.spec	16 May 2008 00:46:15 -0000	1.164
@@ -12,7 +12,7 @@
 Summary: GNOME session manager
 Name: gnome-session
 Version: 2.23.2.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-session/2.23/%{name}-%{version}.tar.bz2
 Source1: redhat-default-session
@@ -53,6 +53,9 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=475468
 Patch22: ice-leaks.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=533351
+Patch33: legacy-crash.patch
+
 BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
 BuildRequires: dbus-devel >= %{dbus_version}
@@ -95,6 +98,7 @@
 #%patch20 -p1 -b .timeout
 #%patch21 -p0 -b .use-gdm-hints
 #%patch22 -p1 -b .ice-leaks
+%patch33 -p1 -b .legacy-crash
 
 %build
 
@@ -180,6 +184,9 @@
 
 
 %changelog
+* Thu May 15 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.2.2-2
+- Don't crash while handling legacy sessions
+
 * Wed May 14 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.2.2-1
 - Update to 2.23.2.2