diff --git a/ChangeLog b/ChangeLog
index 419a6bd35ec7aab5b7ae97359d478f7b773f14a9..8e411cc601e2619a25bd25cf4bd719b9f763c7e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
 
+2009-05-02 10:27 Ali aliov@xfce.org 
+	 * : Fix a compile warning
+
 2009-05-01  9:52 Ali aliov@xfce.org 
 	 * : Fix compile issue bug#5321
 
diff --git a/libxfpm/hal-battery.c b/libxfpm/hal-battery.c
index 3f982b25c8472e9baf410e5016667434c0463019..30327d9bede3e54335c126e9efcd1272d74d883b 100644
--- a/libxfpm/hal-battery.c
+++ b/libxfpm/hal-battery.c
@@ -218,7 +218,7 @@ hal_battery_class_init(HalBatteryClass *klass)
 				    PROP_UNIT,
 				    g_param_spec_string("unit",
 							 NULL, NULL,
-							 FALSE,
+							 NULL,
 							 G_PARAM_READABLE));
 							 
     g_type_class_add_private(klass,sizeof(HalBatteryPrivate));
diff --git a/libxfpm/hal-power.c b/libxfpm/hal-power.c
index 2f4003d488b60a585482c32437182722d4441f8a..6a1737130add12fa0afa730124dee80ce9ea0713 100644
--- a/libxfpm/hal-power.c
+++ b/libxfpm/hal-power.c
@@ -235,7 +235,6 @@ hal_power_get_batteries_internal (HalPower *power)
 
 out:
     g_object_unref (device);
-    
 }
 
 static gboolean
@@ -245,7 +244,7 @@ hal_power_is_power_save_set (void)
     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");
diff --git a/src/xfpm-backlight.c b/src/xfpm-backlight.c
index a60f386ddc7f5a000d66c307d61cd3f45b83a551..649fc1a32779810d5ad053a3e89a1d694648f375 100644
--- a/src/xfpm-backlight.c
+++ b/src/xfpm-backlight.c
@@ -85,7 +85,7 @@ xfpm_backlight_get_device (XfpmBacklight *bk)
 	
 	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);
     }
     
 }
diff --git a/src/xfpm-battery.c b/src/xfpm-battery.c
index cd5f2b1eae32963042e1d256a1566f3e16f469f1..229cf9a8f3d2fef6aa7ad1f2b631b5ba4aa2fbd8 100644
--- a/src/xfpm-battery.c
+++ b/src/xfpm-battery.c
@@ -398,10 +398,11 @@ xfpm_battery_refresh_primary (XfpmBattery *battery, gboolean is_present,
         {
             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"));
diff --git a/src/xfpm-button.c b/src/xfpm-button.c
index 02a5ff33b5471534fa76fb35d9c31d88b887a97c..b37fc00f4081206f0a255b4e9e520ec11f9f19e0 100644
--- a/src/xfpm-button.c
+++ b/src/xfpm-button.c
@@ -43,7 +43,7 @@ static void xfpm_button_finalize   (GObject *object);
 #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
 {