[gnome-desktop] Don't assume Success can be squashed into a gboolean
- From: Richard Hughes <rhughes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-desktop] Don't assume Success can be squashed into a gboolean
- Date: Mon, 3 Oct 2011 15:34:40 +0000 (UTC)
commit 7abaed644f666cce6fc55ebc3f0ccde45deadb29
Author: Richard Hughes <richard hughsie com>
Date: Mon Oct 3 16:34:16 2011 +0100
Don't assume Success can be squashed into a gboolean
libgnome-desktop/gnome-rr.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/libgnome-desktop/gnome-rr.c b/libgnome-desktop/gnome-rr.c
index e23e516..66e8142 100644
--- a/libgnome-desktop/gnome-rr.c
+++ b/libgnome-desktop/gnome-rr.c
@@ -1186,6 +1186,7 @@ gnome_rr_screen_set_dpms_mode (GnomeRRScreen *screen,
{
CARD16 state = 0;
gboolean ret;
+ gint rc;
GnomeRRDpmsMode current_mode;
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
@@ -1216,12 +1217,11 @@ gnome_rr_screen_set_dpms_mode (GnomeRRScreen *screen,
}
gdk_error_trap_push ();
- ret = DPMSForceLevel (screen->priv->xdisplay, state);
- gdk_flush ();
+ rc = DPMSForceLevel (screen->priv->xdisplay, state);
if (gdk_error_trap_pop ())
ret = FALSE;
- if (!ret) {
+ if (!ret || rc != Success) {
ret = FALSE;
g_set_error_literal (error,
GNOME_RR_ERROR,
@@ -1231,11 +1231,11 @@ gnome_rr_screen_set_dpms_mode (GnomeRRScreen *screen,
}
gdk_error_trap_push ();
- ret = DPMSSetTimeouts (screen->priv->xdisplay, 0, 0, 0);
+ rc = DPMSSetTimeouts (screen->priv->xdisplay, 0, 0, 0);
if (gdk_error_trap_pop ())
ret = FALSE;
- if (!ret) {
+ if (!ret || rc != Success) {
ret = FALSE;
g_set_error_literal (error,
GNOME_RR_ERROR,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]