[Xfce4-commits] <xfce4-power-manager:master> Start polkit daemon at startup if it is not running otherwise the power manager may fail to get suspend/hibernate polkit authorization.

[Ali Abdallah]

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

commit 5fab7afbb7bf25f721ef5ac26ae0b9c726b65cb7
Author: Ali Abdallah <aliov at xfce.org>
Date:   Mon Aug 30 11:16:51 2010 +0200

    Start polkit daemon at startup if it is not running otherwise the power manager
    may fail to get suspend/hibernate polkit authorization.

 configure.ac.in       |    2 +-
 src/xfpm-polkit.c     |   12 +++++-------
 src/xfpm-power-info.c |    4 +++-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index b4856fe..0c1802e 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],  [1])
 m4_define([xfpm_version_minor],  [0])
-m4_define([xfpm_version_micro],  [0])
+m4_define([xfpm_version_micro],  [1])
 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/src/xfpm-polkit.c b/src/xfpm-polkit.c
index e18bea9..e699e80 100644
--- a/src/xfpm-polkit.c
+++ b/src/xfpm-polkit.c
@@ -494,11 +494,10 @@ xfpm_polkit_init (XfpmPolkit *polkit)
 
 #ifdef ENABLE_POLKIT
     polkit->priv->proxy = 
-	dbus_g_proxy_new_for_name_owner (polkit->priv->bus,
-					 "org.freedesktop.PolicyKit1",
-					 "/org/freedesktop/PolicyKit1/Authority",
-					 "org.freedesktop.PolicyKit1.Authority",
-					 &error);
+	dbus_g_proxy_new_for_name (polkit->priv->bus,
+				   "org.freedesktop.PolicyKit1",
+				   "/org/freedesktop/PolicyKit1/Authority",
+				   "org.freedesktop.PolicyKit1.Authority");
     
     if (G_LIKELY (polkit->priv->proxy) )
     {
@@ -508,8 +507,7 @@ xfpm_polkit_init (XfpmPolkit *polkit)
     }
     else
     {
-	g_warning ("Failed to create proxy for 'org.freedesktop.PolicyKit1' : %s", error->message);
-	g_error_free (error);
+	g_warning ("Failed to create proxy for 'org.freedesktop.PolicyKit1'");
     }
 #endif /*ENABLE_POLKIT*/
 
diff --git a/src/xfpm-power-info.c b/src/xfpm-power-info.c
index b2f6ea2..5922bdf 100644
--- a/src/xfpm-power-info.c
+++ b/src/xfpm-power-info.c
@@ -683,6 +683,7 @@ xfpm_info_update_wakeups (XfpmInfo *info)
     }
 	
     g_ptr_array_free (array, TRUE);
+    
 }
 
 static gboolean
@@ -776,6 +777,7 @@ xfpm_info_cpu_wakeups (XfpmInfo *info)
     
     xfpm_info_update_wakeups (info);
     
+    xfpm_info_update_wakeups (info);
     g_timeout_add_seconds (4, (GSourceFunc) xfpm_info_update_wakeups_idle, info);
     
     gtk_widget_show (vbox);
@@ -818,7 +820,7 @@ xfpm_info_create (XfpmInfo *info)
 							GTK_DIALOG_DESTROY_WITH_PARENT,
 							GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
 							NULL);
-							
+    gtk_window_set_position (GTK_WINDOW (info->dialog), GTK_WIN_POS_CENTER_ALWAYS);
     gtk_window_set_default_size (GTK_WINDOW (info->dialog), -1, 400);
 				 
     gtk_window_set_icon_name (GTK_WINDOW (info->dialog), GTK_STOCK_INFO);