luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-27 01:26:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

gparam: change value of G_PARAM_EXPLICIT_NOTIFY

Browse Source 
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
This commit is contained in:
Ryan Lortie 2014-06-06 14:35:55 -04:00
parent b413f7a285
commit fcdd25a96e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gobject/gparam.h
View File

@ -161,8 +161,8 @@ typedef enum
#endif #endif
G_PARAM_STATIC_NICK = 1 << 6, G_PARAM_STATIC_NICK = 1 << 6,
G_PARAM_STATIC_BLURB = 1 << 7, G_PARAM_STATIC_BLURB = 1 << 7,
G_PARAM_EXPLICIT_NOTIFY = 1 << 8, /* User defined flags go here */
/* User defined flags go up to 30 */ G_PARAM_EXPLICIT_NOTIFY = 1 << 30,
G_PARAM_DEPRECATED = 1 << 31 G_PARAM_DEPRECATED = 1 << 31
} GParamFlags; } GParamFlags;
/** /**
@ -184,7 +184,7 @@ typedef enum
* G_PARAM_USER_SHIFT: * G_PARAM_USER_SHIFT:
* *
* Minimum shift count to be used for user defined flags, to be stored in * 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) #define G_PARAM_USER_SHIFT (8)