[gdm] display: turn some assertions into warnings
- From: Ray Strode <halfline src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gdm] display: turn some assertions into warnings
- Date: Thu, 26 Feb 2015 12:53:38 +0000 (UTC)
commit 678ac9657d3166dcdeadbccb7ad9427ba0677339
Author: Ray Strode <rstrode redhat com>
Date: Thu Feb 26 07:52:30 2015 -0500
display: turn some assertions into warnings
It's clear there's a bug if they're hit, but
we shouldn't tank, since it's not a fatal
bug.
daemon/gdm-display.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/daemon/gdm-display.c b/daemon/gdm-display.c
index 1d20284..08b6ef4 100644
--- a/daemon/gdm-display.c
+++ b/daemon/gdm-display.c
@@ -1215,10 +1215,10 @@ gdm_display_dispose (GObject *object)
}
g_clear_object (&self->priv->launch_environment);
- g_assert (self->priv->status == GDM_DISPLAY_FINISHED ||
- self->priv->status == GDM_DISPLAY_FAILED);
- g_assert (self->priv->user_access_file == NULL);
- g_assert (self->priv->access_file == NULL);
+ g_warn_if_fail (self->priv->status == GDM_DISPLAY_PREPARED);
+ g_warn_if_fail (self->priv->status == GDM_DISPLAY_MANAGED);
+ g_warn_if_fail (self->priv->user_access_file == NULL);
+ g_warn_if_fail (self->priv->access_file == NULL);
G_OBJECT_CLASS (gdm_display_parent_class)->dispose (object);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]