[gjs/march-maintenance: 11/11] object: Fix namespace



commit a7b6dfcc9c71d5418dca1502387916d8952b6bbb
Author: Philip Chimento <philip chimento gmail com>
Date:   Mon Mar 9 07:59:32 2020 -0700

    object: Fix namespace
    
    This was the wrong namespace, but happened to work because
    ObjectInstance inherits from ObjectBase.

 gi/object.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/gi/object.cpp b/gi/object.cpp
index daf02f45..e07cfe68 100644
--- a/gi/object.cpp
+++ b/gi/object.cpp
@@ -352,7 +352,7 @@ bool ObjectInstance::prop_getter_impl(JSContext* cx, JS::HandleString name,
 
     /* Do not fetch JS overridden properties from GObject, to avoid
      * infinite recursion. */
-    if (g_param_spec_get_qdata(param, ObjectInstance::custom_property_quark()))
+    if (g_param_spec_get_qdata(param, ObjectBase::custom_property_quark()))
         return true;
 
     if ((param->flags & G_PARAM_READABLE) == 0) {
@@ -481,8 +481,7 @@ bool ObjectInstance::prop_setter_impl(JSContext* cx, JS::HandleString name,
 
     /* Do not set JS overridden properties through GObject, to avoid
      * infinite recursion (unless constructing) */
-    if (g_param_spec_get_qdata(param_spec,
-        ObjectInstance::custom_property_quark()))
+    if (g_param_spec_get_qdata(param_spec, ObjectBase::custom_property_quark()))
         return true;
 
     if (!(param_spec->flags & G_PARAM_WRITABLE))


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]