[gnome-power-manager] trivial: use g_set_error() in more places
- From: Richard Hughes <rhughes src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gnome-power-manager] trivial: use g_set_error() in more places
- Date: Sun, 17 Jan 2010 23:16:38 +0000 (UTC)
commit fc3c688a0152449b3e58b68e385b8c22f08433ec
Author: Richard Hughes <richard hughsie com>
Date: Sun Jan 17 23:16:14 2010 +0000
trivial: use g_set_error() in more places
src/gpm-backlight.c | 8 ++++----
src/gpm-control.c | 6 ++----
2 files changed, 6 insertions(+), 8 deletions(-)
---
diff --git a/src/gpm-backlight.c b/src/gpm-backlight.c
index 23c137e..4acf99e 100644
--- a/src/gpm-backlight.c
+++ b/src/gpm-backlight.c
@@ -110,7 +110,7 @@ gpm_backlight_get_brightness (GpmBacklight *backlight, guint *brightness, GError
/* check if we have the hw */
if (backlight->priv->can_dim == FALSE) {
- *error = g_error_new (gpm_backlight_error_quark (),
+ g_set_error_literal (error, gpm_backlight_error_quark (),
GPM_BACKLIGHT_ERROR_HARDWARE_NOT_PRESENT,
"Dim capable hardware not present");
return FALSE;
@@ -121,7 +121,7 @@ gpm_backlight_get_brightness (GpmBacklight *backlight, guint *brightness, GError
if (ret) {
*brightness = level;
} else {
- *error = g_error_new (gpm_backlight_error_quark (),
+ g_set_error_literal (error, gpm_backlight_error_quark (),
GPM_BACKLIGHT_ERROR_DATA_NOT_AVAILABLE,
"Data not available");
}
@@ -142,7 +142,7 @@ gpm_backlight_set_brightness (GpmBacklight *backlight, guint percentage, GError
/* check if we have the hw */
if (backlight->priv->can_dim == FALSE) {
- *error = g_error_new (gpm_backlight_error_quark (),
+ g_set_error_literal (error, gpm_backlight_error_quark (),
GPM_BACKLIGHT_ERROR_HARDWARE_NOT_PRESENT,
"Dim capable hardware not present");
return FALSE;
@@ -154,7 +154,7 @@ gpm_backlight_set_brightness (GpmBacklight *backlight, guint percentage, GError
/* sets the current policy brightness */
ret = gpm_brightness_set (backlight->priv->brightness, percentage, &hw_changed);
if (!ret) {
- *error = g_error_new (gpm_backlight_error_quark (),
+ g_set_error_literal (error, gpm_backlight_error_quark (),
GPM_BACKLIGHT_ERROR_GENERAL,
"Cannot set policy brightness");
}
diff --git a/src/gpm-control.c b/src/gpm-control.c
index 6903a8d..0a89a3a 100644
--- a/src/gpm-control.c
+++ b/src/gpm-control.c
@@ -152,8 +152,7 @@ gpm_control_suspend (GpmControl *control, GError **error)
NULL);
if (!allowed) {
egg_debug ("cannot suspend as not allowed from policy");
- if (error != NULL)
- *error = g_error_new (GPM_CONTROL_ERROR, GPM_CONTROL_ERROR_GENERAL, "Cannot suspend");
+ g_set_error_literal (error, GPM_CONTROL_ERROR, GPM_CONTROL_ERROR_GENERAL, "Cannot suspend");
goto out;
}
@@ -221,8 +220,7 @@ gpm_control_hibernate (GpmControl *control, GError **error)
NULL);
if (!allowed) {
egg_debug ("cannot hibernate as not allowed from policy");
- if (error != NULL)
- *error = g_error_new (GPM_CONTROL_ERROR, GPM_CONTROL_ERROR_GENERAL, "Cannot hibernate");
+ g_set_error_literal (error, GPM_CONTROL_ERROR, GPM_CONTROL_ERROR_GENERAL, "Cannot hibernate");
goto out;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]