--- a/ChangeLog	Mon Oct 19 09:05:09 2009 +0000
+++ b/ChangeLog	Mon Oct 19 17:25:53 2009 +0000
@@ -1,3 +1,11 @@
+2009-10-19  Ghee Teo  <[email protected]>
+
+	Fixed doo#9528 by introducing the conditional start in nautilus.
+	Also skipped any old desktop file fro user's own session
+	* base-specs/nautilus.spec:
+	* patches/gnome-session-19-remove-dup.diff:
+	* patches/nautilus-16-desktop-file.diff:
+
 2009-10-19  Brian Lu  <[email protected]>
 
 	* SUNWgnome-meeting.spec:

--- a/base-specs/nautilus.spec	Mon Oct 19 09:05:09 2009 +0000
+++ b/base-specs/nautilus.spec	Mon Oct 19 17:25:53 2009 +0000
@@ -59,6 +59,8 @@
 Patch14:      nautilus-14-interface-changes.diff
 #owner:chrisk date:2009-07-23 type:bug
 Patch15:      nautilus-15-configure.diff
+#owner:gheet date:2009-10-19 type:bug doo:9528
+Patch16:      nautilus-16-desktop-file.diff
 
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_defaultdocdir}/nautilus2
@@ -148,6 +150,7 @@
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
 
 cp %SOURCE4 icons
 cp %SOURCE5 icons

--- a/patches/gnome-session-19-remove-dup.diff	Mon Oct 19 09:05:09 2009 +0000
+++ b/patches/gnome-session-19-remove-dup.diff	Mon Oct 19 17:25:53 2009 +0000
@@ -1,7 +1,28 @@
-diff -urN -x'*nfs*' gnome-session-2.27.91/gnome-session/gsm-manager.c ../SUNWgnome-session-2.27.91.hacked/gnome-session-2.27.91/gnome-session/gsm-manager.c
---- gnome-session-2.27.91/gnome-session/gsm-manager.c	2009-09-10 14:34:08.335925907 +0100
-+++ ../SUNWgnome-session-2.27.91.hacked/gnome-session-2.27.91/gnome-session/gsm-manager.c	2009-09-11 16:02:03.504831396 +0100
-@@ -3362,14 +3362,40 @@
+diff -urN -x'*.orig' gnome-session-2.28.0/gnome-session/gsm-manager.c ../SUNWgnome-session-2.28.0.hacked/gnome-session-2.28.0/gnome-session/gsm-manager.c
+--- gnome-session-2.28.0/gnome-session/gsm-manager.c	2009-10-19 16:38:47.843586847 +0100
++++ ../SUNWgnome-session-2.28.0.hacked/gnome-session-2.28.0/gnome-session/gsm-manager.c	2009-10-19 16:44:58.383168801 +0100
+@@ -3386,6 +3386,20 @@
+         return TRUE;
+ }
+ 
++static gboolean
++skip_users_service (char *service, char *path)
++{
++   char *skip="filemanager";
++
++   if (!strcmp (service, skip) && strcmp (path, "/usr/share/applications"))
++   {
++        g_debug ("GsmManager: skipped %s from %s\n", service, path);
++        return TRUE;
++   }
++   else
++        return FALSE;
++}
++
+ gboolean
+ gsm_manager_add_autostart_apps_from_dir (GsmManager *manager,
+                                          const char *path)
+@@ -3404,14 +3418,42 @@
          }
  
          while ((name = g_dir_read_name (dir))) {
@@ -36,6 +57,8 @@
 +			}
 +			else {
 +				g_debug ("GsmManager: *** desktop file: %s provides %s\n", desktop_file, provides[0]);
++				if (skip_users_service (provides[0], path))
++                                        continue;
 +                		gsm_manager_add_autostart_app (manager, desktop_file, provides[0]);
 +			}
 +			g_strfreev (provides);
@@ -44,9 +67,9 @@
                  g_free (desktop_file);
          }
  
-diff -urN -x'*nfs*' gnome-session-2.27.91/gnome-session/main.c ../SUNWgnome-session-2.27.91.hacked/gnome-session-2.27.91/gnome-session/main.c
---- gnome-session-2.27.91/gnome-session/main.c	2009-09-10 14:34:08.210619477 +0100
-+++ ../SUNWgnome-session-2.27.91.hacked/gnome-session-2.27.91/gnome-session/main.c	2009-09-10 15:26:07.812681657 +0100
+diff -urN -x'*.orig' gnome-session-2.28.0/gnome-session/main.c ../SUNWgnome-session-2.28.0.hacked/gnome-session-2.28.0/gnome-session/main.c
+--- gnome-session-2.28.0/gnome-session/main.c	2009-10-19 16:38:47.829824877 +0100
++++ ../SUNWgnome-session-2.28.0.hacked/gnome-session-2.28.0/gnome-session/main.c	2009-10-19 16:43:20.143550467 +0100
 @@ -210,7 +210,8 @@
  }
  

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/nautilus-16-desktop-file.diff	Mon Oct 19 17:25:53 2009 +0000
@@ -0,0 +1,11 @@
+diff -urN nautilus-2.28.0/data/nautilus.desktop.in.in ../SUNWgnome-file-mgr-2.28.0.hacked/nautilus-2.28.0/data/nautilus.desktop.in.in
+--- nautilus-2.28.0/data/nautilus.desktop.in.in	2009-05-23 19:13:29.000000000 +0100
++++ ../SUNWgnome-file-mgr-2.28.0.hacked/nautilus-2.28.0/data/nautilus.desktop.in.in	2009-10-19 16:59:44.332094880 +0100
+@@ -8,6 +8,7 @@
+ StartupNotify=true
+ NoDisplay=true
+ OnlyShowIn=GNOME;
++AutostartCondition=GNOME /apps/nautilus/preferences/show_desktop
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=nautilus
+ X-GNOME-Bugzilla-Component=general