diff options
| author | Ryan Lortie <desrt@desrt.ca> | 2014-06-06 14:35:55 -0400 |
|---|---|---|
| committer | Ryan Lortie <desrt@desrt.ca> | 2014-06-10 19:04:35 -0400 |
| commit | fcdd25a96eb33c389f381cacce42e6d4f2912c5c (patch) | |
| tree | d1a30180a75c954dae6e6329f80bf20e9422b189 | |
| parent | b413f7a285f597e4bcbb8866fcb22bea661fcdcd (diff) | |
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
| -rw-r--r-- | gobject/gparam.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gobject/gparam.h b/gobject/gparam.h index 7f77ca821..d0191edae 100644 --- 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) |