--- a/ChangeLog	Wed Oct 22 03:25:32 2008 +0000
+++ b/ChangeLog	Wed Oct 22 13:06:44 2008 +0000
@@ -1,3 +1,12 @@
+2008-10-22  Ghee Teo <[email protected]>
+
+	Fixed 6761428, stopper for OpenSolaris. Removed Options tab
+	from properties dialog and display error when gnome-sesssion-save 
+	is invoked.
+	* SUNWgnome-session.spec:
+	* base-specs/gnome-session.spec:
+	* patches/gnome-session-15-hide-preference-options.diff:
+
 2008-10-22  Laszlo (Laca) Peter  <[email protected]>
 
 	* indiana/SUNWopensolaris-welcome.spec: bump to 0.0.17

--- a/SUNWgnome-session.spec	Wed Oct 22 03:25:32 2008 +0000
+++ b/SUNWgnome-session.spec	Wed Oct 22 13:06:44 2008 +0000
@@ -85,7 +85,11 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 rm -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/splash/flash.gif
-#install -d $RPM_BUILD_ROOT%{_datadir}/autostart
+cat > $RPM_BUILD_ROOT%{_bindir}/gnome-session-save <<EOF
+#!/bin/sh
+echo "Session saving is not implemented yet!" >& 2
+exit 1
+EOF
 
 %if %build_l10n
 %else

--- a/base-specs/gnome-session.spec	Wed Oct 22 03:25:32 2008 +0000
+++ b/base-specs/gnome-session.spec	Wed Oct 22 13:06:44 2008 +0000
@@ -60,6 +60,8 @@
 %endif
 #owner:halton date:2008-10-09 type:bug bugster:6756344 bugzilla:555369
 Patch14:     gnome-session-14-autostart.diff
+#owner:gheet date:2008-09-03 type:branding bugster:6761428
+Patch15:     gnome-session-15-hide-preference-options.diff
 
 URL:          http://www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
@@ -112,6 +114,7 @@
 %patch13 -p1
 %endif
 %patch14 -p1
+%patch15 -p1
 
 %build
 %ifos linux
@@ -180,6 +183,8 @@
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Mon Oct 20 2008 - [email protected]
+- Added gnome-session-15-hide-preference-options.diff #6761428 created by MattK.
 * Thu Oct 09 2008 - [email protected]
 - Add patch autostart.diff to fix bugster #6756344, bugzilla #555369
 * Mon Sep 29 2008 - [email protected]

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-session-15-hide-preference-options.diff	Wed Oct 22 13:06:44 2008 +0000
@@ -0,0 +1,37 @@
+/jds/bin/diff -uprN gnome-session-2.24.0.old/capplet/gsm-properties-dialog.c gnome-session-2.24.0/capplet/gsm-properties-dialog.c
+--- gnome-session-2.24.0.old/capplet/gsm-properties-dialog.c	2008-10-17 12:48:23.202778000 +0100
++++ gnome-session-2.24.0/capplet/gsm-properties-dialog.c	2008-10-17 12:49:36.720806000 +0100
+@@ -1354,6 +1354,24 @@ setup_dialog (GsmPropertiesDialog *dialo
+         populate_model (dialog);
+ }
+ 
++static void
++hide_options_tab (GsmPropertiesDialog *dialog)
++{
++    GtkWidget *widget;
++
++    /*
++      Hide the optios tab of gnome-session-properties, until save/restore
++      session feature is fixed in new gnome-session
++    */
++    widget = glade_xml_get_widget (dialog->priv->xml, "vbox3");
++    gtk_widget_hide (widget);
++    widget = glade_xml_get_widget (dialog->priv->xml, "label5");
++    gtk_widget_hide (widget);
++
++    /* Hiding the tab shrinks the dialog, so resize back to decent size */
++    gtk_widget_set_size_request(GTK_WIDGET(dialog), 500, 400);
++}
++
+ static GObject *
+ gsm_properties_dialog_constructor (GType                  type,
+                                 guint                  n_construct_properties,
+@@ -1369,6 +1387,8 @@ gsm_properties_dialog_constructor (GType
+ 
+         gtk_widget_show_all (GTK_WIDGET (dialog));
+ 
++        hide_options_tab(dialog);
++
+         return G_OBJECT (dialog);
+ }
+