From 44002421574a8f7d51e17731fd608c9fb2fa16e4 Mon Sep 17 00:00:00 2001
From: Ali Abdallah <ali.slackware@gmail.com>
Date: Sat, 2 May 2009 08:27:26 +0000
Subject: [PATCH] Fix a compile warning
(Old svn revision: 7302)
---
ChangeLog | 3 +++
libxfpm/hal-battery.c | 2 +-
libxfpm/hal-power.c | 3 +--
src/xfpm-backlight.c | 2 +-
src/xfpm-battery.c | 3 ++-
src/xfpm-button.c | 2 +-
6 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 419a6bd3..8e411cc6 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 3f982b25..30327d9b 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 2f4003d4..6a173713 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 a60f386d..649fc1a3 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 cd5f2b1e..229cf9a8 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 02a5ff33..b37fc00f 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
{
--
GitLab