[gjs: 6/9] object: Upgrade severity of toggle warning to error
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gjs: 6/9] object: Upgrade severity of toggle warning to error
- Date: Sat, 12 May 2018 17:40:15 +0000 (UTC)
commit 1ee67098cba3e06bc00cba84a5e2928e3fadacab
Author: Philip Chimento <philip chimento gmail com>
Date: Sun May 6 23:00:33 2018 -0700
object: Upgrade severity of toggle warning to error
Since #103 is not a problem anymore, we can turn this assertion back into
an error rather than a warning.
gi/object.cpp | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
---
diff --git a/gi/object.cpp b/gi/object.cpp
index d32c10e2..6f61bee7 100644
--- a/gi/object.cpp
+++ b/gi/object.cpp
@@ -1445,21 +1445,12 @@ disassociate_js_gobject(ObjectInstance *priv)
if (!priv->g_object_finalized)
g_object_weak_unref(priv->gobj, wrapped_gobj_dispose_notify, priv);
- /* FIXME: this check fails when JS code runs after the main loop ends,
- * because the idle functions are not dispatched without a main loop.
- * The only situation I'm aware of where this happens is during the
- * dbus_unregister stage in GApplication. Ideally this check should be an
- * assertion.
- * https://bugzilla.gnome.org/show_bug.cgi?id=778862
- */
auto& toggle_queue = ToggleQueue::get_default();
std::tie(had_toggle_down, had_toggle_up) = toggle_queue.cancel(priv->gobj);
if (had_toggle_down != had_toggle_up) {
- g_critical("JS object wrapper for GObject %p (%s) is being released "
- "while toggle references are still pending. This may happen "
- "on exit in Gio.Application.vfunc_dbus_unregister(). If you "
- "encounter it another situation, please report a GJS bug.",
- priv->gobj, G_OBJECT_TYPE_NAME(priv->gobj));
+ g_error("JS object wrapper for GObject %p (%s) is being released while "
+ "toggle references are still pending.",
+ priv->gobj, G_OBJECT_TYPE_NAME(priv->gobj));
}
/* Fist, remove the wrapper pointer from the wrapped GObject */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]