--- a/ChangeLog	Sat May 31 02:53:11 2008 +0000
+++ b/ChangeLog	Sat May 31 10:05:47 2008 +0000
@@ -1,3 +1,13 @@
+2008-05-30  Brian Cameron <[email protected]>
+
+	* base-specs/gnome-session.spec,
+	  patches/gnome-session-15-noswitchuser.diff:  Add patch so that the
+	  "Switch User" button isn't shown when VT is not available.  Fixes
+	  bug #535892.
+	* base-specs/metacity.spec,
+	  patches/metacity-15-fixcrash.diff:  Fix bug #6685666, another issue
+	  that was causing the Appearance dialog to crash.
+
 2008-05-30  Brian Cameron <[email protected]>
 
 	* manpages/man1/gvfs-monitor-dir.1,
@@ -312,7 +322,7 @@
 2008-05-22  Brian Cameron <[email protected]>
 
 	* base-specs/gdm.spec, patches/gdm-05-atom.diff:  Add a patch
-	  so that GDM does not create th eXFree86_VT atom if it does
+	  so that GDM does not create the XFree86_VT atom if it does
 	  not exist.
 
 2008-05-22  Brian Cameron <[email protected]>

--- a/base-specs/gnome-session.spec	Sat May 31 02:53:11 2008 +0000
+++ b/base-specs/gnome-session.spec	Sat May 31 10:05:47 2008 +0000
@@ -57,6 +57,8 @@
 Patch13:      gnome-session-13-logout-shutdown-dialog.diff
 #owner:niall date 2008-05-29 type:bug bugster:6706624
 Patch14:      gnome-session-14-dbus-cleanup.diff
+#owner:yippi date:2008-03-31 bugzilla:535892 type:bug
+Patch15:      gnome-session-15-noswitchuser.diff
 
 URL:          http://www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
@@ -106,6 +108,7 @@
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
 
 %build
 %ifos linux
@@ -175,6 +178,9 @@
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Sat May 31 2008 - [email protected]
+- Add patch so that the "Switch User" button does not show up on
+  Solaris.  Fixes bugzilla:535892.
 * Thu May 29 2008 - [email protected]
 - Add patch -14-dbus-cleanup.diff for bugster #6706624
   Affected code was rewritten in 2.23 so no need to upstream.

--- a/base-specs/metacity.spec	Sat May 31 02:53:11 2008 +0000
+++ b/base-specs/metacity.spec	Sat May 31 10:05:47 2008 +0000
@@ -49,6 +49,8 @@
 Patch13:      metacity-13-fail-windowattr.diff
 #owner:bewitche date:2008-05-23 type:bug bugster:6676458 bugzilla:161239
 Patch14:      metacity-14-wireframe.diff
+#owner:yippi date:2008-05-31 type:bug bugster:6685666 state:upstream
+Patch15:      metacity-15-fixcrash.diff
 
 URL:          http://www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
@@ -91,6 +93,7 @@
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
 
 %build
 %ifos linux
@@ -168,6 +171,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sat May 31 2008 - [email protected]
+- Add patch metacity-15-fixcrash.diff to address the Appearance applet 
+  crashing issue.  Fixes bug #6685666.
 * Fri May 23 2008 - [email protected]
 - add patch metacity-14-wireframe.diff to fixed bug 6676458 with regular size
   window maximize it and then minimize it and a wire frame will appear.  

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-session-15-noswitchuser.diff	Sat May 31 10:05:47 2008 +0000
@@ -0,0 +1,11 @@
+--- gnome-session-2.22.2/gnome-session/logout-dialog.c-orig	2008-05-31 04:13:38.613413000 -0500
++++ gnome-session-2.22.2/gnome-session/logout-dialog.c	2008-05-31 04:40:38.285867000 -0500
+@@ -336,7 +336,7 @@ is_xorg_with_vt ()
+     {
+       gsm_verbose ("Just run xlsatoms!\nstandard output:\n %s\nerror output:\n %s\n", 
+ 			std_output?std_output:"", err_output?err_output:"");
+-      value = std_output ? TRUE : FALSE;
++      value = (std_output && *std_output) ? TRUE : FALSE;
+     }
+ 
+   g_free (cmd);

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/metacity-15-fixcrash.diff	Sat May 31 10:05:47 2008 +0000
@@ -0,0 +1,53 @@
+--- metacity-2.22.0/src/ui/preview-widget.c-orig	2008-05-31 03:14:18.184724000 -0500
++++ metacity-2.22.0/src/ui/preview-widget.c	2008-05-31 03:14:21.808621000 -0500
+@@ -21,7 +21,9 @@
+  * 02111-1307, USA.
+  */
+ 
+-#include <config.h>
++#define _GNU_SOURCE
++
++#include <math.h>
+ #include "preview-widget.h"
+ 
+ static void     meta_preview_class_init    (MetaPreviewClass *klass);
+@@ -477,10 +473,23 @@ meta_preview_get_clip_region (MetaPrevie
+   MetaFrameLayout *fgeom;
+   MetaFrameStyle *frame_style;
+ 
+-  g_return_if_fail (META_IS_PREVIEW (preview));
++  g_return_val_if_fail (META_IS_PREVIEW (preview), NULL);
+ 
+   flags = (META_PREVIEW (preview)->flags);
+ 
++  window_xregion = gdk_region_new ();
++
++  xrect.x = 0;
++  xrect.y = 0;
++  xrect.width = new_window_width;
++  xrect.height = new_window_height;
++
++  gdk_region_union_with_rect (window_xregion, &xrect);
++
++  if (preview->theme == NULL)
++    return window_xregion;
++
++  /* Otherwise, we do have a theme, so calculate the corners */
+   frame_style = meta_theme_get_frame_style (preview->theme,
+       META_FRAME_TYPE_NORMAL, flags);
+ 
+@@ -561,14 +570,6 @@ meta_preview_get_clip_region (MetaPrevie
+         }
+     }
+ 
+-  window_xregion = gdk_region_new ();
+-
+-  xrect.x = 0;
+-  xrect.y = 0;
+-  xrect.width = new_window_width;
+-  xrect.height = new_window_height;
+-
+-  gdk_region_union_with_rect (window_xregion, &xrect);
+   gdk_region_subtract (window_xregion, corners_xregion);
+   gdk_region_destroy (corners_xregion);
+