From 09a830d2945456d882cbf8b326264041b172fea9 Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri, 8 Oct 2010 14:49:47 +0100
Subject: [PATCH] Remove conditional wrappers for property
 installation/notification

For the time being, just keep the #define's.
---
 clutter/clutter-drag-action.c | 11 ++++++-----
 clutter/clutter-private.h     | 27 ++-------------------------
 2 files changed, 8 insertions(+), 30 deletions(-)

diff --git a/clutter/clutter-drag-action.c b/clutter/clutter-drag-action.c
index 6fedf3ec2..d682be132 100644
--- a/clutter/clutter-drag-action.c
+++ b/clutter/clutter-drag-action.c
@@ -469,10 +469,6 @@ clutter_drag_action_class_init (ClutterDragActionClass *klass)
 
   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;
 
   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_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:
diff --git a/clutter/clutter-private.h b/clutter/clutter-private.h
index f078786ad..34b61811d 100644
--- a/clutter/clutter-private.h
+++ b/clutter/clutter-private.h
@@ -537,34 +537,11 @@ void     _clutter_event_set_platform_data (ClutterEvent       *event,
                                            gpointer            data);
 gpointer _clutter_event_get_platform_data (const ClutterEvent *event);
 
-#if GLIB_CHECK_VERSION (2, 25, 9)
-
 #define _clutter_notify_by_pspec(obj, pspec) \
   g_object_notify_by_pspec ((obj), (pspec))
 
-#else
-
-#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
-}
+#define _clutter_object_class_install_properties(oclass, n_pspecs, pspecs) \
+  g_object_class_install_properties ((oclass), (n_pspecs), (pspecs))
 
 void                _clutter_paint_volume_init_static          (ClutterActor *actor,
                                                                 ClutterPaintVolume *pv);