rpms/gnome-session/devel gnome-session-nautilus.patch, NONE, 1.1 gnome-session.spec, 1.164, 1.165

[Matthias Clasen (mclasen)]

Author: mclasen

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

Modified Files:
	gnome-session.spec 
Added Files:
	gnome-session-nautilus.patch 
Log Message:
make nautilus start up again


gnome-session-nautilus.patch:

--- NEW FILE gnome-session-nautilus.patch ---
diff -up gnome-session-2.23.2.2/gnome-session/session.c.nautilus gnome-session-2.23.2.2/gnome-session/session.c
--- gnome-session-2.23.2.2/gnome-session/session.c.nautilus	2008-05-16 20:22:01.000000000 -0400
+++ gnome-session-2.23.2.2/gnome-session/session.c	2008-05-16 20:22:51.000000000 -0400
@@ -199,7 +199,10 @@ append_default_apps (GsmSession *session
       if (!a->data)
         continue;
 
-      desktop_file = g_strdup_printf ("%s.desktop", (char *) a->data); 
+      if (strcmp (a->data, "nautilus") == 0)
+        desktop_file = g_strdup ("gnome-nautilus.desktop");
+      else
+        desktop_file = g_strdup_printf ("%s.desktop", (char *) a->data); 
 
       g_debug ("Look for: %s", desktop_file);
 


Index: gnome-session.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- gnome-session.spec	16 May 2008 00:46:15 -0000	1.164
+++ gnome-session.spec	17 May 2008 00:30:11 -0000	1.165
@@ -12,7 +12,7 @@
 Summary: GNOME session manager
 Name: gnome-session
 Version: 2.23.2.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-session/2.23/%{name}-%{version}.tar.bz2
 Source1: redhat-default-session
@@ -56,6 +56,9 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=533351
 Patch33: legacy-crash.patch
 
+# Work around the assumption that the nautilus desktop file is nautilus.desktop
+Patch34: gnome-session-nautilus.patch
+
 BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
 BuildRequires: dbus-devel >= %{dbus_version}
@@ -99,6 +102,7 @@
 #%patch21 -p0 -b .use-gdm-hints
 #%patch22 -p1 -b .ice-leaks
 %patch33 -p1 -b .legacy-crash
+%patch34 -p1 -b .nautilus
 
 %build
 
@@ -184,6 +188,9 @@
 
 
 %changelog
+* Fri May 16 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.2.2-3
+- Make nautilus start again
+
 * Thu May 15 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.2.2-2
 - Don't crash while handling legacy sessions