--- a/ChangeLog	Tue Nov 24 13:36:41 2009 +0000
+++ b/ChangeLog	Wed Nov 25 04:09:53 2009 +0000
@@ -1,3 +1,8 @@
+2009-11-25  Wang Xin  <[email protected]>
+
+	* patches/gnome-session-18-fastreboot.diff: Update the patch to disable
+	fast reboot & BE switching on SPARC.
+
 2009-11-24  Ghee Teo  <[email protected]>
 
 	bugster#6904352, security fix by uprev tarballs.

--- a/patches/gnome-session-18-fastreboot.diff	Tue Nov 24 13:36:41 2009 +0000
+++ b/patches/gnome-session-18-fastreboot.diff	Wed Nov 25 04:09:53 2009 +0000
@@ -117,7 +117,7 @@
          gtk_window_set_skip_taskbar_hint (GTK_WINDOW (logout_dialog), TRUE);
          gtk_window_set_keep_above (GTK_WINDOW (logout_dialog), TRUE);
          gtk_window_stick (GTK_WINDOW (logout_dialog));
-@@ -352,6 +358,235 @@ gsm_logout_dialog_set_timeout (GsmLogout
+@@ -352,6 +358,233 @@ gsm_logout_dialog_set_timeout (GsmLogout
                                                           logout_dialog);
  }
  
@@ -152,7 +152,6 @@
 +
 +	return check;
 +}
-+#endif
 +
 +static void
 +boot_environment_cb (GtkWidget *button, gpointer data)
@@ -283,7 +282,6 @@
 +	vbox = gtk_vbox_new (FALSE, 0);
 +	gtk_widget_show (vbox);
 +
-+#if defined(__x86) || defined(__x86__)
 +	check = get_fast_reboot_option (logout_dialog);
 +	align = gtk_alignment_new (0.0, 0.0, 0.0, 0.0);
 +	gtk_widget_show (align);
@@ -291,7 +289,6 @@
 +			(size + 2 * spacing), 0);
 +	gtk_container_add (GTK_CONTAINER (align), check);
 +	gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 10);
-+#endif
 +
 +	be = get_be_option (logout_dialog);
 +	align = gtk_alignment_new (0.0, 0.0, 0.0, 0.0);
@@ -348,17 +345,20 @@
 +
 +	return;
 +}
++#endif
 +
 +
  static GtkWidget *
  gsm_get_dialog (GsmDialogLogoutType type,
                  GdkScreen          *screen,
-@@ -418,6 +653,8 @@ gsm_get_dialog (GsmDialogLogoutType type
+@@ -418,6 +653,10 @@ gsm_get_dialog (GsmDialogLogoutType type
                  }
  
                  if (gsm_logout_supports_reboot (logout_dialog)) {
++#if defined(__x86) || defined(__x86__)
 +			/* fast reboot support */
 +			create_fastreboot_options(logout_dialog);
++#endif
                          gtk_dialog_add_button (GTK_DIALOG (logout_dialog),
                                                 _("_Restart"),
                                                 GSM_LOGOUT_RESPONSE_REBOOT);