isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-22 16:10:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove conditional wrappers for property installation/notification

Browse Source 
For the time being, just keep the #define's.
This commit is contained in:
Emmanuele Bassi 2010-10-08 14:49:47 +01:00
parent 9caf11f2d8
commit 09a830d294
2 changed files with 8 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
clutter/clutter-drag-action.c
View File

@ -469,10 +469,6 @@ clutter_drag_action_class_init (ClutterDragActionClass *klass)
g_type_class_add_private (klass, sizeof (ClutterDragActionPrivate)); g_type_class_add_private (klass, sizeof (ClutterDragActionPrivate));
gobject_class->set_property = clutter_drag_action_set_property;
gobject_class->get_property = clutter_drag_action_get_property;
gobject_class->dispose = clutter_drag_action_dispose;
meta_class->set_actor = clutter_drag_action_set_actor; meta_class->set_actor = clutter_drag_action_set_actor;
klass->drag_motion = clutter_drag_action_real_drag_motion; klass->drag_motion = clutter_drag_action_real_drag_motion;
@ -553,7 +549,12 @@ clutter_drag_action_class_init (ClutterDragActionClass *klass)
CLUTTER_DRAG_AXIS_NONE, CLUTTER_DRAG_AXIS_NONE,
CLUTTER_PARAM_READWRITE); CLUTTER_PARAM_READWRITE);
_clutter_object_class_install_properties (klass, PROP_LAST, drag_props); gobject_class->set_property = clutter_drag_action_set_property;
gobject_class->get_property = clutter_drag_action_get_property;
gobject_class->dispose = clutter_drag_action_dispose;
_clutter_object_class_install_properties (gobject_class,
PROP_LAST,
drag_props);
/** /**
* ClutterDragAction::drag-begin: * ClutterDragAction::drag-begin:

27
clutter/clutter-private.h
View File

@ -537,34 +537,11 @@ void _clutter_event_set_platform_data (ClutterEvent *event,
gpointer data); gpointer data);
gpointer _clutter_event_get_platform_data (const ClutterEvent *event); gpointer _clutter_event_get_platform_data (const ClutterEvent *event);
#if GLIB_CHECK_VERSION (2, 25, 9)
#define _clutter_notify_by_pspec(obj, pspec) \ #define _clutter_notify_by_pspec(obj, pspec) \
g_object_notify_by_pspec ((obj), (pspec)) g_object_notify_by_pspec ((obj), (pspec))
#else #define _clutter_object_class_install_properties(oclass, n_pspecs, pspecs) \
g_object_class_install_properties ((oclass), (n_pspecs), (pspecs))
#define _clutter_notify_by_pspec(obj, pspec) \
g_object_notify ((obj), (pspec)->name)
#endif
/* wrapper for g_object_class_install_properties() */
static inline void
_clutter_object_class_install_properties (gpointer oclass,
guint n_pspecs,
GParamSpec **pspecs)
{
#if GLIB_CHECK_VERSION (2, 26, 0)
g_object_class_install_properties (oclass, n_pspecs, pspecs);
#else
int i;
/* XXX - we start at 1 because 0 is a reserved property id */
for (i = 1; i < n_pspecs; i++)
g_object_class_install_property (oclass, i, pspecs[i]);
#endif
}
void _clutter_paint_volume_init_static (ClutterActor *actor, void _clutter_paint_volume_init_static (ClutterActor *actor,
ClutterPaintVolume *pv); ClutterPaintVolume *pv);