From e8f2eeac9221d91ba32447bbcbdc5ba057647f8e Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Sat, 10 Nov 2012 18:35:37 +0100
Subject: bitmask: Fix intersection code

With the fix in 77912a65e2aa6eb9cfee994fa93bbfbc6b9f8538, another bug
got visible: booleans are 32 bits, so if the intersection between the 2
bitmasks happened in higher bits, the return value would be truncated to
FALSE.

This actually made slider handles disappear, so it was pretty visible.
---
 gtk/gtkbitmaskprivateimpl.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gtk/gtkbitmaskprivateimpl.h')

diff --git a/gtk/gtkbitmaskprivateimpl.h b/gtk/gtkbitmaskprivateimpl.h
index c46fa9622c..c0058c77da 100644
--- a/gtk/gtkbitmaskprivateimpl.h
+++ b/gtk/gtkbitmaskprivateimpl.h
@@ -163,5 +163,5 @@ _gtk_bitmask_intersects (const GtkBitmask *mask,
       _gtk_bitmask_is_allocated (other))
     return _gtk_allocated_bitmask_intersects (mask, other);
   else
-    return _gtk_bitmask_to_bits (mask) & _gtk_bitmask_to_bits (other);
+    return _gtk_bitmask_to_bits (mask) & _gtk_bitmask_to_bits (other) ? TRUE : FALSE;
 }
-- 
cgit v1.2.1