[Goodies-commits] r7091 - in xfce4-power-manager/trunk: . settings src

[Ali Abdallah]

Author: aliov
Date: 2009-04-02 08:24:54 +0000 (Thu, 02 Apr 2009)
New Revision: 7091

Modified:
   xfce4-power-manager/trunk/ChangeLog
   xfce4-power-manager/trunk/settings/xfpm-settings.c
   xfce4-power-manager/trunk/src/org.freedesktop.PowerManagement.Inhibit.xml
   xfce4-power-manager/trunk/src/xfpm-battery.c
   xfce4-power-manager/trunk/src/xfpm-inhibit.c
   xfce4-power-manager/trunk/src/xfpm-xfconf.c
Log:
Fix Some bugs reported by Yves Alexis

Modified: xfce4-power-manager/trunk/ChangeLog
===================================================================
--- xfce4-power-manager/trunk/ChangeLog	2009-04-02 06:40:10 UTC (rev 7090)
+++ xfce4-power-manager/trunk/ChangeLog	2009-04-02 08:24:54 UTC (rev 7091)
@@ -1,4 +1,7 @@
 
+2009-04-02 10:24 Ali aliov at xfce.org 
+	 * : Fix Some bugs reported by Yves Alexis
+
 2009-04-02  8:40 Ali aliov at xfce.org 
 	 * : Patch of the man page from Robby Workman
 

Modified: xfce4-power-manager/trunk/settings/xfpm-settings.c
===================================================================
--- xfce4-power-manager/trunk/settings/xfpm-settings.c	2009-04-02 06:40:10 UTC (rev 7090)
+++ xfce4-power-manager/trunk/settings/xfpm-settings.c	2009-04-02 08:24:54 UTC (rev 7091)
@@ -412,7 +412,7 @@
 {
     guint val = (guint) gtk_spin_button_get_value (w);
     
-    if (!xfconf_channel_get_uint (channel, CRITICAL_POWER_LEVEL, val) )
+    if (!xfconf_channel_set_uint (channel, CRITICAL_POWER_LEVEL, val) )
     {
 	g_critical ("Unable to set value %d for property %s\n", val, CRITICAL_POWER_LEVEL);
     }

Modified: xfce4-power-manager/trunk/src/org.freedesktop.PowerManagement.Inhibit.xml
===================================================================
--- xfce4-power-manager/trunk/src/org.freedesktop.PowerManagement.Inhibit.xml	2009-04-02 06:40:10 UTC (rev 7090)
+++ xfce4-power-manager/trunk/src/org.freedesktop.PowerManagement.Inhibit.xml	2009-04-02 08:24:54 UTC (rev 7091)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <node name="/">
     <interface name="org.freedesktop.PowerManagement.Inhibit">
+    
     <method name="Inhibit">
      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
       <arg type="s" name="application" direction="in"/>
@@ -20,6 +21,11 @@
       <arg type="b" name="has_inhibit_changed" direction="out"/>
     </signal>
     
+    <!--*** NOT STANDARD ***-->
+    <method name="GetInhibitors">
+     <arg type="as" name="inhibitors" direction="out"/>
+    </method>
+    
     </interface>
     
 </node>

Modified: xfce4-power-manager/trunk/src/xfpm-battery.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-battery.c	2009-04-02 06:40:10 UTC (rev 7090)
+++ xfce4-power-manager/trunk/src/xfpm-battery.c	2009-04-02 08:24:54 UTC (rev 7091)
@@ -283,6 +283,9 @@
 	    return _("is almost empty");
     	}
     }
+    
+    g_warn_if_reached ();
+    
     return "";
 }
 

Modified: xfce4-power-manager/trunk/src/xfpm-inhibit.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-inhibit.c	2009-04-02 06:40:10 UTC (rev 7090)
+++ xfce4-power-manager/trunk/src/xfpm-inhibit.c	2009-04-02 08:24:54 UTC (rev 7091)
@@ -294,6 +294,10 @@
 					 gboolean    *OUT_has_inhibit,
 					 GError     **error);
 
+static gboolean xfpm_inhibit_get_inhibitors (XfpmInhibit *inhibit,
+					     gchar ***OUT_inhibitor,
+					     GError **error);
+
 #include "org.freedesktop.PowerManagement.Inhibit.h"
 
 static void xfpm_inhibit_dbus_class_init  (XfpmInhibitClass *klass)
@@ -371,3 +375,25 @@
 
     return TRUE;
 }
+
+static gboolean xfpm_inhibit_get_inhibitors (XfpmInhibit *inhibit,
+					     gchar ***OUT_inhibitors,
+					     GError **error)
+{
+    gint i;
+    Inhibitor *inhibitor;
+
+    TRACE ("Get Inhibitors message received");
+    
+    *OUT_inhibitors = g_new (gchar *, inhibit->priv->array->len + 1);
+    
+    for ( i = 0; i<inhibit->priv->array->len; i++)
+    {
+	inhibitor = g_ptr_array_index (inhibit->priv->array, i);
+	(*OUT_inhibitors)[i] = g_strdup (inhibitor->app_name);
+    }
+    
+    (*OUT_inhibitors)[inhibit->priv->array->len] = NULL;
+    
+    return TRUE;
+}

Modified: xfce4-power-manager/trunk/src/xfpm-xfconf.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-xfconf.c	2009-04-02 06:40:10 UTC (rev 7090)
+++ xfce4-power-manager/trunk/src/xfpm-xfconf.c	2009-04-02 08:24:54 UTC (rev 7091)
@@ -231,7 +231,7 @@
     {
 	str = g_value_get_string (value);
 	val = xfpm_shutdown_string_to_int (str);
-	if ( G_UNLIKELY (val == -1 || val == 3 || val == 1 ))
+	if ( G_UNLIKELY (val == -1 || val == 1 ))
 	{
 	    g_warning ("Invalid value %s for property %s, using default\n", str, CRITICAL_BATT_ACTION_CFG);
 	    conf->priv->critical_action = XFPM_DO_NOTHING;