colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

shared: add NM_GOBJECT_PROPERTIES_DEFINE_NOTIFY() macro as part of NM_GOBJECT_PROPERTIES_DEFINE()

Browse Source 
This will be needed independently from NM_GOBJECT_PROPERTIES_DEFINE().
This commit is contained in:
Thomas Haller
2019-05-07 09:51:17 +02:00
parent dadd38c484
commit f5482013ac
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
shared/nm-glib-aux/nm-macros-internal.h
View File

@@ -1011,10 +1011,9 @@ typedef enum { \
} _PropertyEnums; \ } _PropertyEnums; \
static GParamSpec *obj_properties[_PROPERTY_ENUMS_LAST] = { NULL, } static GParamSpec *obj_properties[_PROPERTY_ENUMS_LAST] = { NULL, }
#define NM_GOBJECT_PROPERTIES_DEFINE(obj_type, ...) \ #define NM_GOBJECT_PROPERTIES_DEFINE_NOTIFY(obj_type, obj_properties, property_enums_type, prop_0) \
NM_GOBJECT_PROPERTIES_DEFINE_BASE (__VA_ARGS__); \
static inline void \ static inline void \
_nm_gobject_notify_together_impl (obj_type *obj, guint n, const _PropertyEnums *props) \ _nm_gobject_notify_together_impl (obj_type *obj, guint n, const property_enums_type *props) \
{ \ { \
const gboolean freeze_thaw = (n > 1); \ const gboolean freeze_thaw = (n > 1); \
\ \
@@ -1024,9 +1023,9 @@ _nm_gobject_notify_together_impl (obj_type *obj, guint n, const _PropertyEnums *
if (freeze_thaw) \ if (freeze_thaw) \
g_object_freeze_notify ((GObject *) obj); \ g_object_freeze_notify ((GObject *) obj); \
while (n-- > 0) { \ while (n-- > 0) { \
const _PropertyEnums prop = *props++; \ const property_enums_type prop = *props++; \
\ \
if (prop != PROP_0) { \ if (prop != prop_0) { \
nm_assert ((gsize) prop < G_N_ELEMENTS (obj_properties)); \ nm_assert ((gsize) prop < G_N_ELEMENTS (obj_properties)); \
nm_assert (obj_properties[prop]); \ nm_assert (obj_properties[prop]); \
g_object_notify_by_pspec ((GObject *) obj, obj_properties[prop]); \ g_object_notify_by_pspec ((GObject *) obj, obj_properties[prop]); \
@@ -1037,11 +1036,15 @@ _nm_gobject_notify_together_impl (obj_type *obj, guint n, const _PropertyEnums *
} \ } \
\ \
static inline void \ static inline void \
_notify (obj_type *obj, _PropertyEnums prop) \ _notify (obj_type *obj, property_enums_type prop) \
{ \ { \
_nm_gobject_notify_together_impl (obj, 1, &prop); \ _nm_gobject_notify_together_impl (obj, 1, &prop); \
} \ } \
#define NM_GOBJECT_PROPERTIES_DEFINE(obj_type, ...) \
NM_GOBJECT_PROPERTIES_DEFINE_BASE (__VA_ARGS__); \
NM_GOBJECT_PROPERTIES_DEFINE_NOTIFY (obj_type, obj_properties, _PropertyEnums, PROP_0)
/* invokes _notify() for all arguments (of type _PropertyEnums). Note, that if /* invokes _notify() for all arguments (of type _PropertyEnums). Note, that if
* there are more than one prop arguments, this will involve a freeze/thaw * there are more than one prop arguments, this will involve a freeze/thaw
* of GObject property notifications. */ * of GObject property notifications. */