diff -ru gnome-session-2.26.0/capplet/gsm-properties-dialog.c gnome-session-2.26.0.new/capplet/gsm-properties-dialog.c
--- gnome-session-2.26.0/capplet/gsm-properties-dialog.c	2009-03-16 18:26:57.000000000 -0400
+++ gnome-session-2.26.0.new/capplet/gsm-properties-dialog.c	2009-04-07 14:05:04.000000000 -0400
@@ -60,11 +60,13 @@
 #define CAPPLET_EDIT_WIDGET_NAME          "session_properties_edit_button"
 #define CAPPLET_SAVE_WIDGET_NAME          "session_properties_save_button"
 #define CAPPLET_REMEMBER_WIDGET_NAME      "session_properties_remember_toggle"
+#define CAPPLET_PROMPT_WIDGET_NAME        "logout_prompt_toggle"
 
 #define STARTUP_APP_ICON     "system-run"
 
 #define SPC_GCONF_CONFIG_PREFIX   "/apps/gnome-session/options"
 #define SPC_GCONF_AUTOSAVE_KEY    SPC_GCONF_CONFIG_PREFIX "/auto_save_session"
+#define SPC_GCONF_PROMPT_KEY      SPC_GCONF_CONFIG_PREFIX "/logout_prompt"
 
 struct GsmPropertiesDialogPrivate
 {
@@ -1228,6 +1230,29 @@
 }
 
 static void
+on_prompt_value_notify (GConfClient         *client,
+                        guint                id,
+                        GConfEntry          *entry,
+                        GsmPropertiesDialog *dialog)
+{
+        gboolean   gval;
+        gboolean   bval;
+        GtkWidget *button;
+
+        button = glade_xml_get_widget (dialog->priv->xml, CAPPLET_PROMPT_WIDGET_NAME);
+        if (button == NULL) {
+                return;
+        }
+
+        gval = gconf_value_get_bool (entry->value);
+        bval = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button));
+
+        if (bval != gval) {
+                gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), gval);
+        }
+}
+
+static void
 on_autosave_value_toggled (GtkToggleButton     *button,
                            GsmPropertiesDialog *dialog)
 {
@@ -1246,6 +1271,24 @@
 }
 
 static void
+on_prompt_value_toggled (GtkToggleButton     *button,
+                         GsmPropertiesDialog *dialog)
+{
+        GConfClient *client;
+        gboolean     gval;
+        gboolean     bval;
+
+        client = gconf_client_get_default ();
+        gval = gconf_client_get_bool (client, SPC_GCONF_PROMPT_KEY, NULL);
+        bval = gtk_toggle_button_get_active (button);
+
+        if (gval != bval) {
+                gconf_client_set_bool (client, SPC_GCONF_PROMPT_KEY, bval, NULL);
+        }
+        g_object_unref (client);
+}
+
+static void
 on_save_session_clicked (GtkWidget           *widget,
                          GsmPropertiesDialog *dialog)
 {
@@ -1373,6 +1416,7 @@
                           dialog);
 
         client = gconf_client_get_default ();
+
         button = glade_xml_get_widget (dialog->priv->xml, CAPPLET_REMEMBER_WIDGET_NAME);
         gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button),
                                       gconf_client_get_bool (client, SPC_GCONF_AUTOSAVE_KEY, NULL));
@@ -1382,13 +1426,29 @@
                                  dialog,
                                  NULL,
                                  NULL);
-        g_object_unref (client);
 
         g_signal_connect (button,
                           "toggled",
                           G_CALLBACK (on_autosave_value_toggled),
                           dialog);
 
+        button = glade_xml_get_widget (dialog->priv->xml, CAPPLET_PROMPT_WIDGET_NAME);
+        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button),
+                                      gconf_client_get_bool (client, SPC_GCONF_PROMPT_KEY, NULL));
+        gconf_client_notify_add (client,
+                                 SPC_GCONF_PROMPT_KEY,
+                                 (GConfClientNotifyFunc)on_prompt_value_notify,
+                                 dialog,
+                                 NULL,
+                                 NULL);
+
+        g_signal_connect (button,
+                          "toggled",
+                          G_CALLBACK (on_prompt_value_toggled),
+                          dialog);
+
+        g_object_unref (client);
+
         button = glade_xml_get_widget (dialog->priv->xml, CAPPLET_SAVE_WIDGET_NAME);
         g_signal_connect (button,
                           "clicked",
diff -ru gnome-session-2.26.0/data/session-properties.glade gnome-session-2.26.0.new/data/session-properties.glade
--- gnome-session-2.26.0/data/session-properties.glade	2009-03-16 18:26:58.000000000 -0400
+++ gnome-session-2.26.0.new/data/session-properties.glade	2009-04-07 14:02:18.000000000 -0400
@@ -302,6 +302,19 @@
                   </packing>
                 </child>
                 <child>
+                  <widget class="GtkCheckButton" id="logout_prompt_toggle">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="label" translatable="yes">_Prompt for confirmation when logging out</property>
+                    <property name="use_underline">True</property>
+                    <property name="draw_indicator">True</property>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                  </packing>
+                </child>
+                <child>
                   <widget class="GtkHButtonBox" id="hbuttonbox1">
                     <property name="visible">True</property>
                     <child>
