[gnome-panel/wip/3.0-freeze-break] panel: No need to check gnome-session 'logout-prompt'

[Vincent Untz <vuntz src gnome org>]

commit e101a707cedea3780f3bac2df111714b83acccdc
Author: Vincent Untz <vuntz gnome org>
Date:   Fri Mar 25 15:53:51 2011 +0100

    panel: No need to check gnome-session 'logout-prompt'
    
    gnome-session checks it already, so we don't have to tell gnome-session
    if confirmation for logout is needed or not.

 gnome-panel/panel-action-button.c |   27 +++++----------------------
 1 files changed, 5 insertions(+), 22 deletions(-)
---
diff --git a/gnome-panel/panel-action-button.c b/gnome-panel/panel-action-button.c
index e80c001..86e3e14 100644
--- a/gnome-panel/panel-action-button.c
+++ b/gnome-panel/panel-action-button.c
@@ -56,8 +56,6 @@ G_DEFINE_TYPE (PanelActionButton, panel_action_button, BUTTON_TYPE_WIDGET)
 
 #define PANEL_ACTION_BUTTON_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PANEL_TYPE_ACTION_BUTTON, PanelActionButtonPrivate))
 
-#define LOGOUT_PROMPT_KEY "/apps/gnome-session/options/logout_prompt"
-
 enum {
 	PROP_0,
 	PROP_ACTION_TYPE,
@@ -166,26 +164,11 @@ panel_action_lock_invoke_menu (PanelActionButton *button,
 static void
 panel_action_logout (GtkWidget *widget)
 {
-	PanelSessionManager *manager;
-	gboolean             not_prompt;
-
-	not_prompt = gconf_client_get_bool (panel_gconf_get_client (),
-					    LOGOUT_PROMPT_KEY, NULL);
-	/* this avoids handling errors from gconf since prompting is
-	 * safer */
-	not_prompt = !not_prompt;
-
-	manager = panel_session_manager_get ();
-
-	if (not_prompt)
-		panel_session_manager_request_logout (manager,
-						      PANEL_SESSION_MANAGER_LOGOUT_MODE_NO_CONFIRMATION);
-	else
-		/* FIXME: we need to use widget to get the screen for the
-		 * confirmation dialog, see
-		 * http://bugzilla.gnome.org/show_bug.cgi?id=536914 */
-		panel_session_manager_request_logout (manager,
-						      PANEL_SESSION_MANAGER_LOGOUT_MODE_NORMAL);
+	/* FIXME: we need to use widget to get the screen for the
+	 * confirmation dialog, see
+	 * http://bugzilla.gnome.org/show_bug.cgi?id=536914 */
+	panel_session_manager_request_logout (panel_session_manager_get (),
+					      PANEL_SESSION_MANAGER_LOGOUT_MODE_NORMAL);
 }
 
 static void