[gnome-power-manager] DeviceKit-disks is expecting an int, not a uint
- From: Richard Hughes <rhughes src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gnome-power-manager] DeviceKit-disks is expecting an int, not a uint
- Date: Wed, 14 Oct 2009 08:02:04 +0000 (UTC)
commit 926a875df7b6b39b97982499fa4d7cb767ea1624
Author: Scott Howard <showard314 gmail com>
Date: Wed Oct 14 09:00:56 2009 +0100
DeviceKit-disks is expecting an int, not a uint
Fixes a crash on un-plugging AC on some machines
Signed-off-by: Richard Hughes <richard hughsie com>
src/gpm-disks.c | 4 ++--
src/gpm-disks.h | 2 +-
src/gpm-manager.c | 8 ++++----
3 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/src/gpm-disks.c b/src/gpm-disks.c
index d31e5de..7cde9f8 100644
--- a/src/gpm-disks.c
+++ b/src/gpm-disks.c
@@ -78,7 +78,7 @@ out:
* gpm_disks_register:
**/
static gboolean
-gpm_disks_register (GpmDisks *disks, guint timeout)
+gpm_disks_register (GpmDisks *disks, gint timeout)
{
gboolean ret = FALSE;
GError *error = NULL;
@@ -110,7 +110,7 @@ out:
* gpm_disks_set_spindown_timeout:
**/
gboolean
-gpm_disks_set_spindown_timeout (GpmDisks *disks, guint timeout)
+gpm_disks_set_spindown_timeout (GpmDisks *disks, gint timeout)
{
gboolean ret = TRUE;
diff --git a/src/gpm-disks.h b/src/gpm-disks.h
index f3d4589..7b59f8f 100644
--- a/src/gpm-disks.h
+++ b/src/gpm-disks.h
@@ -50,7 +50,7 @@ GType gpm_disks_get_type (void);
GpmDisks *gpm_disks_new (void);
gboolean gpm_disks_set_spindown_timeout (GpmDisks *disks,
- guint timeout);
+ gint timeout);
G_END_DECLS
diff --git a/src/gpm-manager.c b/src/gpm-manager.c
index 946ea3f..ddd6f7b 100644
--- a/src/gpm-manager.c
+++ b/src/gpm-manager.c
@@ -791,11 +791,11 @@ gpm_manager_button_pressed_cb (GpmButton *button, const gchar *type, GpmManager
/**
* gpm_manager_get_spindown_timeout:
**/
-static guint
+static gint
gpm_manager_get_spindown_timeout (GpmManager *manager)
{
gboolean enabled;
- guint timeout;
+ gint timeout;
/* get policy */
if (!manager->priv->on_battery) {
@@ -817,7 +817,7 @@ static void
gpm_manager_client_changed_cb (DkpClient *client, GpmManager *manager)
{
gboolean event_when_closed;
- guint timeout;
+ gint timeout;
gboolean on_battery;
/* get the on-battery state */
@@ -1800,7 +1800,7 @@ static void
gpm_manager_init (GpmManager *manager)
{
gboolean check_type_cpu;
- guint timeout;
+ gint timeout;
DBusGConnection *connection;
GError *error = NULL;
guint version;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]