--- a/patches/gnome-session-18-fastreboot.diff Thu Nov 26 08:57:26 2009 +0000
+++ b/patches/gnome-session-18-fastreboot.diff Thu Nov 26 09:48:16 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,233 @@ gsm_logout_dialog_set_timeout (GsmLogout
+@@ -352,6 +358,237 @@ gsm_logout_dialog_set_timeout (GsmLogout
logout_dialog);
}
@@ -141,6 +141,7 @@
+ GtkWidget *check;
+ char *obuf = NULL;
+
++ /* SUN_BRANDING */
+ check = gtk_check_button_new_with_mnemonic (_("S_kip boot menu on restart"));
+ gtk_widget_show (check);
+ g_signal_connect (GTK_WIDGET (check),
@@ -181,6 +182,7 @@
+ gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
+ label = gtk_label_new (NULL);
+ gtk_widget_show (label);
++ /* SUN_BRANDING */
+ gtk_label_set_markup (GTK_LABEL (label),
+ _("<span style=\"italic\" size=\"smaller\">Options apply only after Restart, not after Shut Down</span>"));
+ gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
@@ -203,6 +205,7 @@
+ warning = get_warning ();
+ gtk_widget_show (warning);
+
++ /* SUN_BRANDING */
+ label = gtk_label_new_with_mnemonic (_("_Default boot environment at next restart:"));
+ gtk_widget_show (label);
+
@@ -274,6 +277,7 @@
+ gint spacing;
+ gint size;
+
++ /* SUN_BRANDING */
+ expander = gtk_expander_new_with_mnemonic (_("_More Options"));
+ gtk_widget_show (expander);
+ gtk_widget_style_get (expander, "expander-size", &size,