[Xfce4-commits] <xfce4-power-manager:master> Fix old lixfcegui4 inlude+remove consolekit cookie subject, and use only PID subject for polkit auth detection.

[Ali Abdallah]

Updating branch refs/heads/master
         to 17f616d957f6ab7be0d61487babb582b53ed2459 (commit)
       from c917631c9b15ef3a151cf35a0484ea9576fbcff8 (commit)

commit 17f616d957f6ab7be0d61487babb582b53ed2459
Author: Ali Abdallah <aliov at xfce.org>
Date:   Thu Aug 12 10:55:04 2010 +0200

    Fix old lixfcegui4 inlude+remove consolekit cookie subject, and use only PID
    subject for polkit auth detection.

 configure.ac.in                              |    6 +++---
 panel-plugins/brightness/brightness-button.c |    2 +-
 src/xfpm-polkit.c                            |   15 +++++++++++----
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index 50727af..b4856fe 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -1,7 +1,7 @@
 m4_define([intltool_minimum_version], [0.31])
-m4_define([xfpm_version_major],  [0])
-m4_define([xfpm_version_minor],  [9])
-m4_define([xfpm_version_micro],  [98])
+m4_define([xfpm_version_major],  [1])
+m4_define([xfpm_version_minor],  [0])
+m4_define([xfpm_version_micro],  [0])
 m4_define([xfpm_version_build],  [])
 m4_define([xfpm_version_tag],[])
 m4_define([xfpm_version], [xfpm_version_major().xfpm_version_minor().xfpm_version_micro()ifelse(xfpm_version_tag(), [git], [xfpm_version_tag().xfpm_version_build()], [xfpm_version_tag()])])
diff --git a/panel-plugins/brightness/brightness-button.c b/panel-plugins/brightness/brightness-button.c
index 8c4998b..5693372 100644
--- a/panel-plugins/brightness/brightness-button.c
+++ b/panel-plugins/brightness/brightness-button.c
@@ -28,7 +28,7 @@
 
 #include <glib.h>
 #include <libxfce4util/libxfce4util.h>
-#include <libxfcegui4/libxfcegui4.h>
+#include <libxfce4ui/libxfce4ui.h>
 
 #include "common/xfpm-common.h"
 #include "common/xfpm-icons.h"
diff --git a/src/xfpm-polkit.c b/src/xfpm-polkit.c
index a14bf33..e18bea9 100644
--- a/src/xfpm-polkit.c
+++ b/src/xfpm-polkit.c
@@ -213,9 +213,9 @@ xfpm_polkit_free_data (gpointer data)
 static void
 xfpm_polkit_init_data (XfpmPolkit *polkit)
 {
-    const gchar *consolekit_cookie;
+    //const gchar *consolekit_cookie;
     GValue hash_elem = { 0 };
-    gboolean subject_created = FALSE;
+    //gboolean subject_created = FALSE;
 
     if (polkit->priv->subject_valid)
 	return;
@@ -226,6 +226,10 @@ xfpm_polkit_init_data (XfpmPolkit *polkit)
      * it is set by the session manager (4.8 and above)  
      * since we don't have a login manager, yet!
      **/
+     /*
+      *	
+      *	Disable for the moment
+      * 
     consolekit_cookie = g_getenv ("XDG_SESSION_COOKIE");
   
     if ( consolekit_cookie )
@@ -240,6 +244,7 @@ xfpm_polkit_init_data (XfpmPolkit *polkit)
 						  "/org/freedesktop/ConsoleKit/Manager",
 						  "org.freedesktop.ConsoleKit.Manager",
 						  NULL);
+
 	if ( proxy )
 	{
 	    ret = dbus_g_proxy_call (proxy, "GetSessionForCookie", &error,
@@ -280,9 +285,11 @@ xfpm_polkit_init_data (XfpmPolkit *polkit)
 	    g_warning ("'GetSessionForCookie' failed : %s", error->message);
 	    g_error_free (error);
 	}
+	
     }
-
-    if ( subject_created == FALSE )
+    */
+    
+    //if ( subject_created == FALSE )
     {
 	gint pid;
 	guint64 start_time;