[Goodies-commits] r7302 - in xfce4-power-manager/trunk: . libxfpm src

[Ali Abdallah]

Author: aliov
Date: 2009-05-02 08:27:26 +0000 (Sat, 02 May 2009)
New Revision: 7302

Modified:
   xfce4-power-manager/trunk/ChangeLog
   xfce4-power-manager/trunk/libxfpm/hal-battery.c
   xfce4-power-manager/trunk/libxfpm/hal-power.c
   xfce4-power-manager/trunk/src/xfpm-backlight.c
   xfce4-power-manager/trunk/src/xfpm-battery.c
   xfce4-power-manager/trunk/src/xfpm-button.c
Log:
Fix a compile warning

Modified: xfce4-power-manager/trunk/ChangeLog
===================================================================
--- xfce4-power-manager/trunk/ChangeLog	2009-05-01 22:54:21 UTC (rev 7301)
+++ xfce4-power-manager/trunk/ChangeLog	2009-05-02 08:27:26 UTC (rev 7302)
@@ -1,4 +1,7 @@
 
+2009-05-02 10:27 Ali aliov at xfce.org 
+	 * : Fix a compile warning
+
 2009-05-01  9:52 Ali aliov at xfce.org 
 	 * : Fix compile issue bug#5321
 

Modified: xfce4-power-manager/trunk/libxfpm/hal-battery.c
===================================================================
--- xfce4-power-manager/trunk/libxfpm/hal-battery.c	2009-05-01 22:54:21 UTC (rev 7301)
+++ xfce4-power-manager/trunk/libxfpm/hal-battery.c	2009-05-02 08:27:26 UTC (rev 7302)
@@ -218,7 +218,7 @@
 				    PROP_UNIT,
 				    g_param_spec_string("unit",
 							 NULL, NULL,
-							 FALSE,
+							 NULL,
 							 G_PARAM_READABLE));
 							 
     g_type_class_add_private(klass,sizeof(HalBatteryPrivate));

Modified: xfce4-power-manager/trunk/libxfpm/hal-power.c
===================================================================
--- xfce4-power-manager/trunk/libxfpm/hal-power.c	2009-05-01 22:54:21 UTC (rev 7301)
+++ xfce4-power-manager/trunk/libxfpm/hal-power.c	2009-05-02 08:27:26 UTC (rev 7302)
@@ -235,7 +235,6 @@
 
 out:
     g_object_unref (device);
-    
 }
 
 static gboolean
@@ -245,7 +244,7 @@
     gboolean   val;
     
     device = hal_device_new ();
-    
+
     hal_device_set_udi (device, "/org/freedesktop/Hal/devices/computer");
     
     val = hal_device_get_property_bool (device, "power_management.is_powersave_set");

Modified: xfce4-power-manager/trunk/src/xfpm-backlight.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-backlight.c	2009-05-01 22:54:21 UTC (rev 7301)
+++ xfce4-power-manager/trunk/src/xfpm-backlight.c	2009-05-02 08:27:26 UTC (rev 7302)
@@ -85,7 +85,7 @@
 	
 	max_level = xfpm_brightness_hal_get_max_level (bk->priv->br);
 	xfpm_brightness_widget_set_max_level (bk->priv->widget,
-					      max_level -1 );
+					      max_level);
     }
     
 }

Modified: xfce4-power-manager/trunk/src/xfpm-battery.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-battery.c	2009-05-01 22:54:21 UTC (rev 7301)
+++ xfce4-power-manager/trunk/src/xfpm-battery.c	2009-05-02 08:27:26 UTC (rev 7302)
@@ -398,10 +398,11 @@
         {
             est_time = _("Estimated time left");
         }
-        else if ( state == BATTERY_IS_CHARGING )
+        else //* BATTERY_IS_CHARGING
         {
             est_time = _("Estimated time to be fully charged");
         }
+
         time_str = g_strdup_printf("%s: %d %s %d %s",est_time,
                                    hours,hours > 1 ? _("hours") : _("hour") ,
                                    minutes_left, minutes_left > 1 ? _("minutes") : _("minute"));

Modified: xfce4-power-manager/trunk/src/xfpm-button.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-button.c	2009-05-01 22:54:21 UTC (rev 7301)
+++ xfce4-power-manager/trunk/src/xfpm-button.c	2009-05-02 08:27:26 UTC (rev 7302)
@@ -43,7 +43,7 @@
 #define XFPM_BUTTON_GET_PRIVATE(o) \
 (G_TYPE_INSTANCE_GET_PRIVATE ((o), XFPM_TYPE_BUTTON, XfpmButtonPrivate))
 
-#define SLEEP_KEY_TIMEOUT 5.0f
+#define SLEEP_KEY_TIMEOUT 6.0f
 
 struct XfpmButtonPrivate
 {