gparam: change value of G_PARAM_EXPLICIT_NOTIFY

GParamSpec has a possibility of user-introduced flags, and we didn't
respect that with the addition of _EXPLICIT_NOTIFY.

Change the documentation for the maximum number of user flags to 10,
just to pick a somewhat random number.  The documentation here was never
correct anyway -- it previously claimed that as many as 38 flags were
possible.

Meanwhile, move G_PARAM_EXPLICIT_NOTIFY next to _DEPRECATED in order to
avoid conflicts with low-numbered user flags (which are in use by at
least evolution-data-server).

https://bugzilla.gnome.org/show_bug.cgi?id=731341

diff --git a/gobject/gparam.h b/gobject/gparam.h
index 7f77ca82144bd85c909d67dd5853dba394c2add8..d0191edae4712343240688d91cea13859628db0e 100644 (file)
--- a/gobject/gparam.h
+++ b/gobject/gparam.h
@@ -161,8 +161,8 @@ typedef enum
 #endif
   G_PARAM_STATIC_NICK        = 1 << 6,
   G_PARAM_STATIC_BLURB       = 1 << 7,
-  G_PARAM_EXPLICIT_NOTIFY     = 1 << 8,
-  /* User defined flags go up to 30 */
+  /* User defined flags go here */
+  G_PARAM_EXPLICIT_NOTIFY     = 1 << 30,
   G_PARAM_DEPRECATED          = 1 << 31
 } GParamFlags;
 /**
@@ -184,7 +184,7 @@ typedef enum
  * G_PARAM_USER_SHIFT:
  * 
  * Minimum shift count to be used for user defined flags, to be stored in
- * #GParamSpec.flags. The maximum allowed is 30 + G_PARAM_USER_SHIFT.
+ * #GParamSpec.flags. The maximum allowed is 10.
  */
 #define        G_PARAM_USER_SHIFT      (8)