luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-07-10 12:38:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make object_interface_check_properties work

Browse Source 
As pointed out in bug 637738, it does not currently work, since
g_type_class_peek always returns NULL.
This commit is contained in:
Matthias Clasen
2010-12-27 23:41:10 -05:00
parent 2a5e0cf9e0
commit 068d53358b
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gobject/gobject.c
View File

@ -1189,11 +1189,13 @@ object_interface_check_properties (gpointer func_data,
gpointer g_iface) gpointer g_iface)
{ {
GTypeInterface *iface_class = g_iface; GTypeInterface *iface_class = g_iface;
GObjectClass *class = g_type_class_peek (iface_class->g_instance_type); GObjectClass *class;
GType iface_type = iface_class->g_type; GType iface_type = iface_class->g_type;
GParamSpec **pspecs; GParamSpec **pspecs;
guint n; guint n;
class = g_type_class_ref (iface_class->g_instance_type);
if (!G_IS_OBJECT_CLASS (class)) if (!G_IS_OBJECT_CLASS (class))
return; return;
@ -1205,7 +1207,7 @@ object_interface_check_properties (gpointer func_data,
pspecs[n]->name, pspecs[n]->name,
G_OBJECT_CLASS_TYPE (class), G_OBJECT_CLASS_TYPE (class),
TRUE); TRUE);
if (!class_pspec) if (!class_pspec)
{ {
g_critical ("Object class %s doesn't implement property " g_critical ("Object class %s doesn't implement property "
@ -1237,9 +1239,9 @@ object_interface_check_properties (gpointer func_data,
g_type_name (G_PARAM_SPEC_VALUE_TYPE (pspecs[n])), g_type_name (G_PARAM_SPEC_VALUE_TYPE (pspecs[n])),
g_type_name (iface_type)); g_type_name (iface_type));
} }
#define SUBSET(a,b,mask) (((a) & ~(b) & (mask)) == 0) #define SUBSET(a,b,mask) (((a) & ~(b) & (mask)) == 0)
/* CONSTRUCT and CONSTRUCT_ONLY add restrictions. /* CONSTRUCT and CONSTRUCT_ONLY add restrictions.
* READABLE and WRITABLE remove restrictions. The implementation * READABLE and WRITABLE remove restrictions. The implementation
* paramspec must have less restrictive flags. * paramspec must have less restrictive flags.
@ -1259,10 +1261,12 @@ object_interface_check_properties (gpointer func_data,
g_type_name (G_OBJECT_CLASS_TYPE (class)), g_type_name (G_OBJECT_CLASS_TYPE (class)),
g_type_name (iface_type)); g_type_name (iface_type));
} }
#undef SUBSET #undef SUBSET
} }
g_free (pspecs); g_free (pspecs);
g_type_class_unref (class);
} }
GType GType