--- a/ChangeLog	Thu Sep 04 13:29:02 2008 +0000
+++ b/ChangeLog	Thu Sep 04 15:14:38 2008 +0000
@@ -1,3 +1,18 @@
+2008-09-04  Ghee Teo <[email protected]>
+
+	Fixed patches for 2.23.91 tarball, removed 2 upstream patches.
+	Added Requires SUNWgnome-wm since it now requires metacity.desktop
+	to run.
+	* base-specs/gnome-session.spec:
+	* patches/gnome-session-01-gnome-atom.diff:
+	* patches/gnome-session-03-wait-for-postrun.diff:
+	* patches/gnome-session-07-compiz-integration.diff:
+	* patches/gnome-session-10-trusted-extensions.diff:
+	* patches/gnome-session-13-desktop-id.diff:
+	* patches/gnome-session-13-show-splash.diff:
+	* patches/gnome-session-14-restart-app.diff:
+	* patches/gnome-session-15-show-splash.diff:
+
 2008-09-04  Darren Kenny  <[email protected]>
 
 	* patches/gnome-netstatus-07-wifi-info.diff:

--- a/SUNWgnome-session.spec	Thu Sep 04 13:29:02 2008 +0000
+++ b/SUNWgnome-session.spec	Thu Sep 04 15:14:38 2008 +0000
@@ -37,6 +37,7 @@
 Requires: SUNWgnome-base-libs
 Requires: SUNWpostrun
 Requires: SUNWgnome-desktop-prefs
+Requires: SUNWgnome-wm
 BuildRequires: SUNWgnome-audio-devel
 BuildRequires: SUNWgnome-base-libs-devel
 BuildRequires: SUNWgnome-vfs-devel

--- a/base-specs/gnome-session.spec	Thu Sep 04 13:29:02 2008 +0000
+++ b/base-specs/gnome-session.spec	Thu Sep 04 15:14:38 2008 +0000
@@ -11,7 +11,7 @@
 Name:         gnome-session
 License:      GPL
 Group:        System/GUI/GNOME
-Version:      2.23.90
+Version:      2.23.91
 Release:      3
 Distribution: Java Desktop System
 Vendor:	      Sun Microsystems, Inc.
@@ -56,12 +56,8 @@
 Patch11:      gnome-session-11-menu-entry.diff
 #owner:gheet date:2008-08-15 type:branding
 Patch12:     gnome-session-12-null-string.diff
-#owner:gheet date:2008-08-28 type:bug bugster:6738640 bugzilla:542880
-Patch13:     gnome-session-13-desktop-id.diff
-#owner:gheet date:2008-09-01 type:bug bugster:6741523 bugzilla:548710
-Patch14:     gnome-session-14-restart-app.diff
 #owner:gheet date:2008-09-03 type:branding bugster:6743662
-Patch15:     gnome-session-15-show-splash.diff
+Patch13:     gnome-session-13-show-splash.diff
 
 URL:          http://www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
@@ -108,8 +104,6 @@
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
-%patch14 -p1
-%patch15 -p1
 
 %build
 %ifos linux
@@ -178,6 +172,9 @@
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Thu Sep 04 2008 - [email protected]
+- Removed 13-desktop-id.diff which has been implemented differently upstream.
+  gnome-session-14-restart-app.diff which was taken from upstream..
 * Wed Sep 03 2008 - [email protected]
 - Added gnome-session-15-show-splash.diff, a brnading patch to enable splash.
   Also corrected indiana splash screen location.

--- a/patches/gnome-session-01-gnome-atom.diff	Thu Sep 04 13:29:02 2008 +0000
+++ b/patches/gnome-session-01-gnome-atom.diff	Thu Sep 04 15:14:38 2008 +0000
@@ -1,7 +1,7 @@
-diff -urN gnome-session-2.23.7/gnome-session/main.c ../SUNWgnome-session-2.23.7.hacked/gnome-session-2.23.7/gnome-session/main.c
---- gnome-session-2.23.7/gnome-session/main.c	2008-08-18 15:07:31.000000000 +0100
-+++ ../SUNWgnome-session-2.23.7.hacked/gnome-session-2.23.7/gnome-session/main.c	2008-08-18 15:52:57.827488000 +0100
-@@ -28,6 +28,7 @@
+diff -urN gnome-session-2.23.91/gnome-session/main.c ../SUNWgnome-session-2.23.6.p1/gnome-session-2.23.91/gnome-session/main.c
+--- gnome-session-2.23.91/gnome-session/main.c	2008-09-01 23:14:22.000000000 -0100
++++ ../SUNWgnome-session-2.23.6.p1/gnome-session-2.23.91/gnome-session/main.c	2008-09-04 13:58:25.286124000 -0100
+@@ -30,6 +30,7 @@
  
  #include <glib/gi18n.h>
  #include <glib/goption.h>
@@ -9,7 +9,7 @@
  #include <gtk/gtk.h>
  
  #include <dbus/dbus.h>
-@@ -396,6 +397,8 @@
+@@ -485,6 +486,8 @@
          struct sigaction  sa;
          GError           *error;
          char             *display_str;
@@ -18,7 +18,7 @@
          GsmManager       *manager;
          GsmStore         *client_store;
          GsmXsmpServer    *xsmp_server;
-@@ -444,6 +447,10 @@
+@@ -548,6 +551,10 @@
          gsm_util_setenv ("DISPLAY", display_str);
          g_free (display_str);
  
@@ -26,5 +26,6 @@
 +	xdisp = gdk_x11_display_get_xdisplay (gdisp);
 +	XInternAtom (xdisp, "GNOME_SM_DESKTOP", FALSE);
 +
-         client_store = gsm_store_new ();
- 
+         /* Some third-party programs rely on GNOME_DESKTOP_SESSION_ID to
+          * detect if GNOME is running. We keep this for compatibility reasons.
+          */

--- a/patches/gnome-session-03-wait-for-postrun.diff	Thu Sep 04 13:29:02 2008 +0000
+++ b/patches/gnome-session-03-wait-for-postrun.diff	Thu Sep 04 15:14:38 2008 +0000
@@ -1,9 +1,7 @@
-Binary files gnome-session-2.23.7/data/gnome-splash.png and ../SUNWgnome-session-2.23.7/gnome-session-2.23.7/data/gnome-splash.png differ
-Binary files gnome-session-2.23.7/gnome-session/core and ../SUNWgnome-session-2.23.7/gnome-session-2.23.7/gnome-session/core differ
-diff -urN -x'*.rej' -x'*.orig' gnome-session-2.23.7/gnome-session/main.c ../SUNWgnome-session-2.23.7/gnome-session-2.23.7/gnome-session/main.c
---- gnome-session-2.23.7/gnome-session/main.c	2008-08-18 17:00:43.613547000 +0100
-+++ ../SUNWgnome-session-2.23.7/gnome-session-2.23.7/gnome-session/main.c	2008-08-18 17:07:00.040685000 +0100
-@@ -29,6 +29,9 @@
+diff -urN gnome-session-2.23.91/gnome-session/main.c ../SUNWgnome-session-2.23.6.p3/gnome-session-2.23.91/gnome-session/main.c
+--- gnome-session-2.23.91/gnome-session/main.c	2008-09-04 14:12:38.398599000 -0100
++++ ../SUNWgnome-session-2.23.6.p3/gnome-session-2.23.91/gnome-session/main.c	2008-09-04 14:08:58.222668000 -0100
+@@ -31,6 +31,9 @@
  #include <glib/gi18n.h>
  #include <glib/goption.h>
  #include <gdk/gdkx.h>
@@ -13,10 +11,11 @@
  #include <gtk/gtk.h>
  
  #include <dbus/dbus.h>
-@@ -391,6 +394,68 @@
-         return ret;
+@@ -480,6 +483,69 @@
+         return TRUE;
  }
  
++
 +static gboolean
 +postrun_progress_update (gpointer data)
 +{
@@ -26,8 +25,7 @@
 +  	gtk_progress_bar_pulse (GTK_PROGRESS_BAR (data));
 +
 +  	if (count == 30) {
-+    		g_spawn_command_line_sync ("/usr/lib/postrun-query -c JDS_wait -e", 
-+			       NULL, NULL, &status, &error);
++    		g_spawn_command_line_sync ("/usr/lib/postrun-query -c JDS_wait -e", NULL, NULL, &status, &error);
 +    		count = 0;
 +  	}
 +
@@ -79,14 +77,16 @@
 +  	}
 +}
 +
++  
  int
  main (int argc, char **argv)
  {
-@@ -451,6 +516,7 @@
+@@ -555,6 +621,8 @@
  	xdisp = gdk_x11_display_get_xdisplay (gdisp);
  	XInternAtom (xdisp, "GNOME_SM_DESKTOP", FALSE);
  
 +	gsm_wait_for_unfinished_postrun ();
-         client_store = gsm_store_new ();
- 
- 
++
+         /* Some third-party programs rely on GNOME_DESKTOP_SESSION_ID to
+          * detect if GNOME is running. We keep this for compatibility reasons.
+          */

--- a/patches/gnome-session-07-compiz-integration.diff	Thu Sep 04 13:29:02 2008 +0000
+++ b/patches/gnome-session-07-compiz-integration.diff	Thu Sep 04 15:14:38 2008 +0000
@@ -1,7 +1,7 @@
-diff -urN -x'*.orig' -x '*.rej' gnome-session-2.23.7/data/gnome-wm ../SUNWgnome-session-2.23.7-p7/gnome-session-2.23.7/data/gnome-wm
---- gnome-session-2.23.7/data/gnome-wm	2008-08-14 15:53:06.000000000 +0100
-+++ ../SUNWgnome-session-2.23.7-p7/gnome-session-2.23.7/data/gnome-wm	2008-08-18 17:15:26.938737000 +0100
-@@ -1,12 +1,12 @@
+diff -urN gnome-session-2.23.91/data/gnome-wm ../SUNWgnome-session-2.23.6.p7/gnome-session-2.23.91/data/gnome-wm
+--- gnome-session-2.23.91/data/gnome-wm	2008-09-01 23:14:23.000000000 -0100
++++ ../SUNWgnome-session-2.23.6.p7/gnome-session-2.23.91/data/gnome-wm	2008-09-04 14:26:37.174463000 -0100
+@@ -1,7 +1,8 @@
  #!/bin/sh
  
  # The user can specify his prefered WM by setting the WINDOW_MANAGER
@@ -11,31 +11,28 @@
  #
  # If this is not set, we search a list of known windowmanagers and use
  # the first one that is found in the users's PATH
- #
--
- # sm-client-id value
- SMID=
- # default-wm value
-@@ -37,6 +37,18 @@
+@@ -40,6 +41,20 @@
    esac
  done
  
-+# Get previously set window manager in gconf 
++# Get previously set window manager in gconf
 +
 +if [ -z "$DEFWM" -o "x$DEFWM" = "xgnome-wm" ]; then
-+  DEFWM=`gconftool-2 -g /desktop/gnome/applications/window_manager/default 2>/dev/null`
++  DEFWM=`gconftool-2 -g /desktop/gnome/applications/window_manager/default 2>/
++dev/null`
 +fi
 +
 +# If not exist, set to metacity.
 +if [ ! -x "$DEFWM" ]; then
-+    gconftool-2 -s /desktop/gnome/applications/window_manager/default /usr/bin/metacity --type string 2> /dev/null
++    gconftool-2 -s /desktop/gnome/applications/window_manager/default /usr/bin
++/metacity --type string 2> /dev/null
 +    DEFWM=/usr/bin/metacity
 +fi
 +
  # WINDOW_MANAGER overrides all
  if [ -z "$WINDOW_MANAGER" ] ; then
-   WINDOW_MANAGER=`gconftool-2 --get /apps/gnome-session/gnome-wm/preferred_window_manager 2> /dev/null`
-@@ -115,21 +127,15 @@
+     WINDOW_MANAGER=`gconftool-2 --get /desktop/gnome/session/required-components/windowmanager 2> /dev/null`
+@@ -118,21 +133,15 @@
        OPT1=--sm-client-id
        OPT2=$SMID
        ;;

--- a/patches/gnome-session-10-trusted-extensions.diff	Thu Sep 04 13:29:02 2008 +0000
+++ b/patches/gnome-session-10-trusted-extensions.diff	Thu Sep 04 15:14:38 2008 +0000
@@ -1,6 +1,6 @@
-diff -urN -x'*.orig' -x'*.rej' gnome-session-2.23.7/gnome-session/Makefile.am ../SUNWgnome-session-2.23.7-p10/gnome-session-2.23.7/gnome-session/Makefile.am
---- gnome-session-2.23.7/gnome-session/Makefile.am	2008-08-18 15:07:31.000000000 +0100
-+++ ../SUNWgnome-session-2.23.7-p10/gnome-session-2.23.7/gnome-session/Makefile.am	2008-08-19 14:24:58.947145000 +0100
+diff -urN -x '*.orig' -x'*.rej' gnome-session-2.23.91/gnome-session/Makefile.am ../SUNWgnome-session-2.23.6.p10/gnome-session-2.23.91/gnome-session/Makefile.am
+--- gnome-session-2.23.91/gnome-session/Makefile.am	2008-09-01 23:14:22.000000000 -0100
++++ ../SUNWgnome-session-2.23.6.p10/gnome-session-2.23.91/gnome-session/Makefile.am	2008-09-04 14:30:03.151552000 -0100
 @@ -43,7 +43,7 @@
  	$(NULL)
  
@@ -19,10 +19,10 @@
  	$(NULL)
  
  libgsmutil_la_LIBADD = 				\
-diff -urN -x'*.orig' -x'*.rej' gnome-session-2.23.7/gnome-session/gsm-manager.c ../SUNWgnome-session-2.23.7-p10/gnome-session-2.23.7/gnome-session/gsm-manager.c
---- gnome-session-2.23.7/gnome-session/gsm-manager.c	2008-08-19 14:13:44.586831000 +0100
-+++ ../SUNWgnome-session-2.23.7-p10/gnome-session-2.23.7/gnome-session/gsm-manager.c	2008-08-19 14:24:58.949773000 +0100
-@@ -2313,6 +2313,16 @@
+diff -urN -x '*.orig' -x'*.rej' gnome-session-2.23.91/gnome-session/gsm-manager.c ../SUNWgnome-session-2.23.6.p10/gnome-session-2.23.91/gnome-session/gsm-manager.c
+--- gnome-session-2.23.91/gnome-session/gsm-manager.c	2008-09-04 14:29:33.043770000 -0100
++++ ../SUNWgnome-session-2.23.6.p10/gnome-session-2.23.91/gnome-session/gsm-manager.c	2008-09-04 14:30:03.171764000 -0100
+@@ -2338,6 +2338,16 @@
  */
  
  gboolean
@@ -39,9 +39,9 @@
  gsm_manager_shutdown (GsmManager *manager,
                        GError    **error)
  {
-diff -urN -x'*.orig' -x'*.rej' gnome-session-2.23.7/gnome-session/gsm-manager.h ../SUNWgnome-session-2.23.7-p10/gnome-session-2.23.7/gnome-session/gsm-manager.h
---- gnome-session-2.23.7/gnome-session/gsm-manager.h	2008-08-15 12:45:15.000000000 +0100
-+++ ../SUNWgnome-session-2.23.7-p10/gnome-session-2.23.7/gnome-session/gsm-manager.h	2008-08-19 14:24:58.952604000 +0100
+diff -urN -x '*.orig' -x'*.rej' gnome-session-2.23.91/gnome-session/gsm-manager.h ../SUNWgnome-session-2.23.6.p10/gnome-session-2.23.91/gnome-session/gsm-manager.h
+--- gnome-session-2.23.91/gnome-session/gsm-manager.h	2008-09-01 23:14:22.000000000 -0100
++++ ../SUNWgnome-session-2.23.6.p10/gnome-session-2.23.91/gnome-session/gsm-manager.h	2008-09-04 14:30:03.172245000 -0100
 @@ -174,6 +174,8 @@
                                                                  const char     *condition,
                                                                  gboolean       *handled,
@@ -51,25 +51,18 @@
  
  G_END_DECLS
  
-diff -urN -x'*.orig' -x'*.rej' gnome-session-2.23.7/gnome-session/main.c ../SUNWgnome-session-2.23.7-p10/gnome-session-2.23.7/gnome-session/main.c
---- gnome-session-2.23.7/gnome-session/main.c	2008-08-19 14:13:44.560090000 +0100
-+++ ../SUNWgnome-session-2.23.7-p10/gnome-session-2.23.7/gnome-session/main.c	2008-08-19 14:29:29.325587000 +0100
-@@ -60,12 +60,14 @@
- static char **override_autostart_dirs = NULL;
+diff -urN -x '*.orig' -x'*.rej' gnome-session-2.23.91/gnome-session/main.c ../SUNWgnome-session-2.23.6.p10/gnome-session-2.23.91/gnome-session/main.c
+--- gnome-session-2.23.91/gnome-session/main.c	2008-09-04 14:29:32.981966000 -0100
++++ ../SUNWgnome-session-2.23.6.p10/gnome-session-2.23.91/gnome-session/main.c	2008-09-04 14:44:22.204960000 -0100
+@@ -62,6 +62,7 @@
+ static gboolean show_version = FALSE;
  /* FIXME: turn this off closer to release */
  static gboolean debug = TRUE;
 +static gboolean trusted_session;
  
- static GOptionEntry entries[] = {
-         { "autostart", 'a', 0, G_OPTION_ARG_STRING_ARRAY, &override_autostart_dirs, N_("Override standard autostart directories"), NULL },
-         { "debug", 0, 0, G_OPTION_ARG_NONE, &debug, N_("Enable debugging code"), NULL },
-         { "failsafe", 'f', 0, G_OPTION_ARG_NONE, &failsafe, N_("Do not load user-specified applications"), NULL },
-         { "version", 0, 0, G_OPTION_ARG_NONE, &show_version, N_("Version of this application"), NULL },
-+	{ "trusted-session", '\0', 0, G_OPTION_ARG_NONE, &trusted_session, N_("Used for Trusted Multi-Label Session"), NULL},
-         { NULL, 0, 0, 0, NULL, NULL, NULL }
- };
- 
-@@ -516,6 +518,12 @@
+ static void
+ on_bus_name_lost (DBusGProxy *bus_proxy,
+@@ -621,6 +622,12 @@
  	xdisp = gdk_x11_display_get_xdisplay (gdisp);
  	XInternAtom (xdisp, "GNOME_SM_DESKTOP", FALSE);
  
@@ -80,9 +73,9 @@
 +	}
 +
  	gsm_wait_for_unfinished_postrun ();
-         client_store = gsm_store_new ();
  
-@@ -539,7 +547,14 @@
+         /* Some third-party programs rely on GNOME_DESKTOP_SESSION_ID to
+@@ -654,7 +661,14 @@
          }
  
          gsm_xsmp_server_start (xsmp_server);
@@ -98,9 +91,9 @@
  
          gtk_main ();
  
-diff -urN -x'*.orig' -x'*.rej' gnome-session-2.23.7/gnome-session/trusted.c ../SUNWgnome-session-2.23.7-p10/gnome-session-2.23.7/gnome-session/trusted.c
---- gnome-session-2.23.7/gnome-session/trusted.c	1970-01-01 01:00:00.000000000 +0100
-+++ ../SUNWgnome-session-2.23.7-p10/gnome-session-2.23.7/gnome-session/trusted.c	2008-08-19 14:24:58.954756000 +0100
+diff -urN -x '*.orig' -x'*.rej' gnome-session-2.23.91/gnome-session/trusted.c ../SUNWgnome-session-2.23.6.p10/gnome-session-2.23.91/gnome-session/trusted.c
+--- gnome-session-2.23.91/gnome-session/trusted.c	1969-12-31 23:00:00.000000000 -0100
++++ ../SUNWgnome-session-2.23.6.p10/gnome-session-2.23.91/gnome-session/trusted.c	2008-09-04 14:30:03.173822000 -0100
 @@ -0,0 +1,114 @@
 +/* trusted.c
 + * Copyright (C) 2008 SUN Microsystems, Inc.
@@ -216,9 +209,9 @@
 +	}
 +}
 +
-diff -urN -x'*.orig' -x'*.rej' gnome-session-2.23.7/gnome-session/trusted.h ../SUNWgnome-session-2.23.7-p10/gnome-session-2.23.7/gnome-session/trusted.h
---- gnome-session-2.23.7/gnome-session/trusted.h	1970-01-01 01:00:00.000000000 +0100
-+++ ../SUNWgnome-session-2.23.7-p10/gnome-session-2.23.7/gnome-session/trusted.h	2008-08-19 14:24:58.955005000 +0100
+diff -urN -x '*.orig' -x'*.rej' gnome-session-2.23.91/gnome-session/trusted.h ../SUNWgnome-session-2.23.6.p10/gnome-session-2.23.91/gnome-session/trusted.h
+--- gnome-session-2.23.91/gnome-session/trusted.h	1969-12-31 23:00:00.000000000 -0100
++++ ../SUNWgnome-session-2.23.6.p10/gnome-session-2.23.91/gnome-session/trusted.h	2008-09-04 14:30:03.174063000 -0100
 @@ -0,0 +1,28 @@
 +/* trusted.h
 + * Copyright (C) 2008 SUN Microsystems, Inc.

--- a/patches/gnome-session-13-desktop-id.diff	Thu Sep 04 13:29:02 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-diff -urN gnome-session-2.23.90/gnome-session/main.c ../SUNWgnome-session-2.23.6.sid.hacked/gnome-session-2.23.90/gnome-session/main.c
---- gnome-session-2.23.90/gnome-session/main.c	2008-08-27 21:52:54.175577000 +0100
-+++ ../SUNWgnome-session-2.23.6.sid.hacked/gnome-session-2.23.90/gnome-session/main.c	2008-08-27 22:52:01.379361000 +0100
-@@ -72,6 +72,15 @@
- };
- 
- static void
-+legacy_desktop_session_id ()
-+{
-+	if (failsafe)
-+		putenv ("GNOME_DESKTOP_SESSION_ID=failsafe");
-+	else
-+		putenv ("GNOME_DESKTOP_SESSION_ID=default");
-+}
-+
-+static void
- on_bus_name_lost (DBusGProxy *bus_proxy,
-                   const char *name,
-                   gpointer    data)
-@@ -556,6 +565,7 @@
- 		gsm_manager_start (manager);
- 	}
- 
-+	legacy_desktop_session_id ();
-         gtk_main ();
- 
-         if (xsmp_server != NULL) {

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-session-13-show-splash.diff	Thu Sep 04 15:14:38 2008 +0000
@@ -0,0 +1,12 @@
+diff -urN gnome-session-2.23.90/data/gnome-session.schemas.in ../SUNWgnome-session-2.23.6.hacked/gnome-session-2.23.90/data/gnome-session.schemas.in
+--- gnome-session-2.23.90/data/gnome-session.schemas.in	2008-08-12 17:35:07.000000000 +0100
++++ ../SUNWgnome-session-2.23.6.hacked/gnome-session-2.23.90/data/gnome-session.schemas.in	2008-09-03 10:30:44.163866000 +0100
+@@ -19,7 +19,7 @@
+          <applyto>/apps/gnome-session/options/show_splash_screen</applyto>
+          <owner>gnome</owner>
+          <type>bool</type>
+-         <default>false</default>
++         <default>true</default>
+          <locale name="C">
+             <short>Show the splash screen</short>
+             <long>Show the splash screen when the session starts up</long>

--- a/patches/gnome-session-14-restart-app.diff	Thu Sep 04 13:29:02 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-diff -urN gnome-session-2.23.90/gnome-session/gsm-autostart-app.c ../SUNWgnome-session-2.23.6.hacked/gnome-session-2.23.90/gnome-session/gsm-autostart-app.c
---- gnome-session-2.23.90/gnome-session/gsm-autostart-app.c	2008-08-18 21:24:25.000000000 +0100
-+++ ../SUNWgnome-session-2.23.6.hacked/gnome-session-2.23.90/gnome-session/gsm-autostart-app.c	2008-09-01 14:50:43.989771000 +0100
-@@ -935,11 +935,12 @@
-         GError  *local_error;
-         gboolean res;
- 
-+	/* ignore stop errors - it is fine if it is already stopped */
-         local_error = NULL;
-         res = gsm_app_stop (app, &local_error);
-         if (! res) {
--                g_propagate_error (error, local_error);
--                return FALSE;
-+		g_debug ("GsmAutostartApp: Couldn't stop app: %s", local_error->message);
-+                g_error_free (local_error);
-         }
- 
-         res = gsm_app_start (app, &local_error);

--- a/patches/gnome-session-15-show-splash.diff	Thu Sep 04 13:29:02 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-diff -urN gnome-session-2.23.90/data/gnome-session.schemas.in ../SUNWgnome-session-2.23.6.hacked/gnome-session-2.23.90/data/gnome-session.schemas.in
---- gnome-session-2.23.90/data/gnome-session.schemas.in	2008-08-12 17:35:07.000000000 +0100
-+++ ../SUNWgnome-session-2.23.6.hacked/gnome-session-2.23.90/data/gnome-session.schemas.in	2008-09-03 10:30:44.163866000 +0100
-@@ -19,7 +19,7 @@
-          <applyto>/apps/gnome-session/options/show_splash_screen</applyto>
-          <owner>gnome</owner>
-          <type>bool</type>
--         <default>false</default>
-+         <default>true</default>
-          <locale name="C">
-             <short>Show the splash screen</short>
-             <long>Show the splash screen when the session starts up</long>