[gnome-settings-daemon] power: Fix possible crashers reusing set GError
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-settings-daemon] power: Fix possible crashers reusing set GError
- Date: Sat, 20 Oct 2012 10:18:05 +0000 (UTC)
commit 0435e0664960bf0c2356414e565797162466d998
Author: Bastien Nocera <hadess hadess net>
Date: Fri Oct 19 17:02:06 2012 +0200
power: Fix possible crashers reusing set GError
When setting the panel's backlight can't be turned off for example,
switching off the keyboard's backlight will fail as well, as the
error will be invalid for use.
https://bugzilla.gnome.org/show_bug.cgi?id=686468
plugins/power/gsd-power-manager.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
index 070cf32..f2de0f5 100644
--- a/plugins/power/gsd-power-manager.c
+++ b/plugins/power/gsd-power-manager.c
@@ -2282,7 +2282,7 @@ suspend_with_lid_closed (GsdPowerManager *manager)
if (!ret) {
g_warning ("failed to turn the panel off after lid close: %s",
error->message);
- g_error_free (error);
+ g_clear_error (&error);
}
/* only toggle keyboard if present and not already toggled */
@@ -2991,7 +2991,7 @@ idle_set_mode (GsdPowerManager *manager, GsdPowerIdleMode mode)
if (!ret) {
g_warning ("failed to turn the panel off: %s",
error->message);
- g_error_free (error);
+ g_clear_error (&error);
}
/* only toggle keyboard if present and not already toggled */
@@ -3039,7 +3039,7 @@ idle_set_mode (GsdPowerManager *manager, GsdPowerIdleMode mode)
g_warning ("failed to restore backlight to %i: %s",
manager->priv->pre_dim_brightness,
error->message);
- g_error_free (error);
+ g_clear_error (&error);
} else {
manager->priv->pre_dim_brightness = -1;
}
@@ -3052,7 +3052,7 @@ idle_set_mode (GsdPowerManager *manager, GsdPowerIdleMode mode)
if (!ret) {
g_warning ("failed to turn the kbd backlight on: %s",
error->message);
- g_error_free (error);
+ g_clear_error (&error);
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]