[Xfce4-commits] <xfce4-panel:master> Don't use the session manager in action plugin.

[Nick Schermer]

Updating branch refs/heads/master
         to be632df549abec6630a25c024e83d4b3440b2b96 (commit)
       from 489d47a2aca97d6c0ed8eeeaeab6e9305df36b4c (commit)

commit be632df549abec6630a25c024e83d4b3440b2b96
Author: Nick Schermer <nick at xfce.org>
Date:   Fri Dec 17 14:13:55 2010 +0100

    Don't use the session manager in action plugin.
    
    The reboot/shutdown and logout functions are not implemented
    in XfceSmClient; so use xfce4-session-logout.

 plugins/actions/actions.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/plugins/actions/actions.c b/plugins/actions/actions.c
index 7fbc867..c8ce075 100644
--- a/plugins/actions/actions.c
+++ b/plugins/actions/actions.c
@@ -431,7 +431,7 @@ actions_plugin_button_clicked (GtkWidget     *button,
                                ActionsPlugin *plugin)
 {
   ActionType    action;
-  XfceSMClient *sm_client;
+  XfceSMClient *sm_client = NULL;
 
   panel_return_if_fail (XFCE_IS_ACTIONS_PLUGIN (plugin));
 
@@ -441,10 +441,13 @@ actions_plugin_button_clicked (GtkWidget     *button,
   else
     action = plugin->second_action;
 
+#if 0
   /* get the active session */
+  /* TODO this is not implemented in XfceSMClient */
   sm_client = xfce_sm_client_get ();
   if (!xfce_sm_client_is_connected (sm_client))
     sm_client = NULL;
+#endif
 
   switch (action)
     {