[Xfce4-commits] <xfce4-session:master> Don't use consolekit when it's not enabled.

[Jérôme Guelfucci]

Updating branch refs/heads/master
         to 985787ccae5ccce5e54039f82cc565686a432ecf (commit)
       from 1075715c0cf0c408f58eef51d0334341ee9d0566 (commit)

commit 985787ccae5ccce5e54039f82cc565686a432ecf
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Sun Oct 17 11:56:51 2010 +0200

    Don't use consolekit when it's not enabled.

 xfce4-session/xfsm-shutdown-helper.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/xfce4-session/xfsm-shutdown-helper.c b/xfce4-session/xfsm-shutdown-helper.c
index f5d6bf8..e0a65e8 100644
--- a/xfce4-session/xfsm-shutdown-helper.c
+++ b/xfce4-session/xfsm-shutdown-helper.c
@@ -331,7 +331,9 @@ init_dbus_gtypes (void)
 static gboolean
 xfsm_shutdown_helper_init_polkit_data (XfsmShutdownHelper *helper)
 {
+#ifdef ENABLE_CONSOLE_KIT
   const gchar *consolekit_cookie;
+#endif
   GValue hash_elem = { 0 };
   gboolean subject_created = FALSE;
 
@@ -344,6 +346,7 @@ xfsm_shutdown_helper_init_polkit_data (XfsmShutdownHelper *helper)
   if (!helper->polkit_proxy)
     return FALSE;
 
+#ifdef ENABLE_CONSOLE_KIT
   /**
    * This variable should be set by the session manager or by
    * the login manager (gdm?). under clean Xfce environment
@@ -401,6 +404,7 @@ xfsm_shutdown_helper_init_polkit_data (XfsmShutdownHelper *helper)
           g_object_unref (proxy);
         }
     }
+#endif
 
   /**
    * We failed to get valid session data, then we try