[gjs: 2/3] arg-cache: Do not warn about missing parenthesis with newer GLib
- From: Philip Chimento <pchimento src gnome org>
- To: commits-list gnome org
- Cc: 
- Subject: [gjs: 2/3] arg-cache: Do not warn about missing parenthesis with newer GLib
- Date: Tue,  5 Jul 2022 05:23:47 +0000 (UTC)
commit a703c21da79b52167497a52963f9f74ce1094ef2
Author: Marco Trevisan (TreviƱo) <mail 3v1n0 net>
Date:   Wed Jun 29 07:26:25 2022 +0200
    arg-cache: Do not warn about missing parenthesis with newer GLib
    
    Using GLib 1.72 we were warned about missing brackets to divide || and
    && statements.
 gi/arg-cache.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/gi/arg-cache.cpp b/gi/arg-cache.cpp
index d431677d6..8b7128fdc 100644
--- a/gi/arg-cache.cpp
+++ b/gi/arg-cache.cpp
@@ -904,10 +904,11 @@ bool CallbackIn::in(JSContext* cx, GjsFunctionCallState* state, GIArgument* arg,
     }
 
     bool keep_forever =
+        !has_callback_destroy() && (
 #if GI_CHECK_VERSION(1, 72, 0)
-        m_scope == GI_SCOPE_TYPE_FOREVER ||
+                                       m_scope == GI_SCOPE_TYPE_FOREVER ||
 #endif
-        m_scope == GI_SCOPE_TYPE_NOTIFIED && !has_callback_destroy();
+                                       m_scope == GI_SCOPE_TYPE_NOTIFIED);
 
     if (trampoline && keep_forever) {
         trampoline->mark_forever();
[
Date Prev][
Date Next]   [
Thread Prev][
Thread Next]   
[
Thread Index]
[
Date Index]
[
Author Index]