So it seems my proposed fix to doo#11230 submitted yesterday isn't good
enough.
In view of the timeline, I am backout the fix I put in for doo#9528
http://defect.opensolaris.org/bz/show_bug.cgi?id=9528
So the latter 9528 has to be readdressed.
-Ghee
---
> Index: patches/nautilus-17-autostart.diff
> ===================================================================
> --- patches/nautilus-17-autostart.diff (revision 19362)
> +++ patches/nautilus-17-autostart.diff (working copy)
> @@ -1,116 +0,0 @@
> -diff -urN nautilus-2.27.4/data/Makefile.am
> ../SUNWgnome-file-mgr-2.26.1.hacked/nautilus-2.27.4/data/Makefile.am
> ---- nautilus-2.27.4/data/Makefile.am 2009-06-24 15:00:10.000000000
> +0100
> -+++
> ../SUNWgnome-file-mgr-2.26.1.hacked/nautilus-2.27.4/data/Makefile.am
> 2009-08-20 12:15:52.075099471 +0100
> -@@ -7,7 +7,6 @@
> - desktopdir = $(datadir)/applications
> - desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
> - desktop_in_files = \
> -- nautilus.desktop.in \
> - nautilus-home.desktop.in \
> - nautilus-computer.desktop.in \
> - nautilus-folder-handler.desktop.in \
> -@@ -16,6 +15,10 @@
> - nautilus-autorun-software.desktop.in
> - @INTLTOOL_DESKTOP_RULE@
> -
> -+autostartdir = $(datadir)/gnome/autostart
> -+autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
> -+autostart_in_files = nautilus.desktop.in
> -+
> - mimedir = $(datadir)/mime/packages
> - mime_DATA = $(xml_files)
> -
> -diff -urN nautilus-2.27.4/data/nautilus.desktop.in.in
> ../SUNWgnome-file-mgr-2.26.1.hacked/nautilus-2.27.4/data/nautilus.desktop.in.in
> ---- nautilus-2.27.4/data/nautilus.desktop.in.in 2009-06-24
> 15:00:10.000000000 +0100
> -+++
> ../SUNWgnome-file-mgr-2.26.1.hacked/nautilus-2.27.4/data/nautilus.desktop.in.in
>
> 2009-08-20 12:16:41.250884469 +0100
> -@@ -6,13 +6,12 @@
> - Terminal=false
> - Type=Application
> - 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
> - x-gnome-bugzilla-versi...@version@
> - X-GNOME-Autostart-Phase=Desktop
> - X-GNOME-Autostart-Notify=true
> --X-GNOME-AutoRestart=true
> - X-GNOME-Provides=filemanager
> -diff -urN nautilus-2.27.4/eel/eel-background.c
> ../SUNWgnome-file-mgr-2.26.1.hacked/nautilus-2.27.4/eel/eel-background.c
> ---- nautilus-2.27.4/eel/eel-background.c 2009-06-24
> 15:00:10.000000000 +0100
> -+++
> ../SUNWgnome-file-mgr-2.26.1.hacked/nautilus-2.27.4/eel/eel-background.c
> 2009-08-21 14:44:35.685904973 +0100
> -@@ -142,10 +142,25 @@
> - object_class->finalize = eel_background_finalize;
> - }
> -
> -+static gboolean
> -+is_sunray_client (void)
> -+{
> -+ Atom sunray_client_id;
> -+
> -+ sunray_client_id = XInternAtom (GDK_DISPLAY (),
> -+ "_SUN_SUNRAY_HOME", True);
> -+
> -+ if (sunray_client_id == None) {
> -+ return FALSE;
> -+ }
> -+ else return TRUE;
> -+}
> -+
> - static void
> - on_bg_changed (GnomeBG *bg, EelBackground *background)
> - {
> -- init_fade (background, background->details->widget);
> -+ if (!is_sunray_client())
> -+ init_fade (background, background->details->widget);
> - g_signal_emit (G_OBJECT (background),
> - signals[APPEARANCE_CHANGED], 0);
> - }
> -@@ -153,7 +168,8 @@
> - static void
> - on_bg_transitioned (GnomeBG *bg, EelBackground *background)
> - {
> -- free_fade (background);
> -+ if (!is_sunray_client())
> -+ free_fade (background);
> - g_signal_emit (G_OBJECT (background),
> - signals[APPEARANCE_CHANGED], 0);
> - }
> -@@ -236,7 +252,8 @@
> -
> - free_background_pixmap (background);
> -
> -- free_fade (background);
> -+ if (!is_sunray_client())
> -+ free_fade (background);
> -
> - g_free (background->details);
> -
> -@@ -900,7 +917,8 @@
> - background->details->use_common_pixmap = FALSE;
> - }
> -
> -- init_fade (background, widget);
> -+ if (!is_sunray_client ())
> -+ init_fade (background, widget);
> - }
> - }
> -
> -diff -urN nautilus-2.27.4/src/nautilus-main.c
> ../SUNWgnome-file-mgr-2.26.1.hacked/nautilus-2.27.4/src/nautilus-main.c
> ---- nautilus-2.27.4/src/nautilus-main.c 2009-08-20
> 11:58:35.759110017 +0100
> -+++
> ../SUNWgnome-file-mgr-2.26.1.hacked/nautilus-2.27.4/src/nautilus-main.c
> 2009-08-20 12:18:05.479946637 +0100
> -@@ -407,9 +407,9 @@
> -
> - g_set_prgname ("nautilus");
> -
> -- if (g_file_test (DATADIR "/applications/nautilus.desktop",
> G_FILE_TEST_EXISTS)) {
> -- egg_set_desktop_file (DATADIR "/applications/nautilus.desktop");
> -- }
> -+ if (g_file_test (DATADIR "/gnome/autostart/nautilus.desktop",
> G_FILE_TEST_EXISTS)) {
> -+ egg_set_desktop_file (DATADIR
> "/gnome/autostart/nautilus.desktop");
> -+ }
> -
> - context = g_option_context_new (_("\n\nBrowse the file system
> with the file manager"));
> - g_option_context_add_main_entries (context, options, NULL);
> Index: base-specs/nautilus.spec
> ===================================================================
> --- base-specs/nautilus.spec (revision 19362)
> +++ base-specs/nautilus.spec (working copy)
> @@ -61,8 +61,6 @@
> Patch15: nautilus-15-configure.diff
> #owner:padraig date:2008-08-25 type:bug bugzilla:589520
> Patch16: nautilus-16-crash-onexit.diff
> -#owner:gheet date:2009-08-28 type:bug doo:9528 bugzilla:571417
> -Patch17: nautilus-17-autostart.diff
>
> BuildRoot: %{_tmppath}/%{name}-%{version}-build
> Docdir: %{_defaultdocdir}/nautilus2
> @@ -153,7 +151,6 @@
> %patch14 -p1
> %patch15 -p1
> %patch16 -p1
> -%patch17 -p1
>
> cp %SOURCE4 icons
> cp %SOURCE5 icons
>
> Index: SUNWgnome-file-mgr.spec
> ===================================================================
> --- SUNWgnome-file-mgr.spec (revision 19362)
> +++ SUNWgnome-file-mgr.spec (working copy)
> @@ -184,9 +184,6 @@
> %dir %attr (0755, root, sys) %{_datadir}
> %dir %attr (0755, root, other) %{_datadir}/applications
> %{_datadir}/applications/*
> -%dir %attr (0755, root, other) %{_datadir}/gnome
> -%dir %attr (0755, root, bin) %{_datadir}/gnome/autostart
> -%{_datadir}/gnome/autostart/*
> %if %with_hal
> %dir %attr (0755, root, other) %{_datadir}/gnome-mount
> %{_datadir}/gnome-mount/*
