fixing commited conflict due to interrupted commit

diff --git a/clutter/clutter-main.c b/clutter/clutter-main.c
index 17501c9..51d2359 100644 (file)
--- a/clutter/clutter-main.c
+++ b/clutter/clutter-main.c
@@ -1203,52 +1203,10 @@ done:
 #undef MAX_EVENT_DEPTH
 }
 
-<<<<<<< .mine
-
-static inline void generate_enter_leave_events (ClutterMainContext *context,
-                                                ClutterActor       *motion_current_actor,
-                                                ClutterEvent       *event)
-{
-  static ClutterActor *motion_last_actor = NULL; 
-
-  if (motion_last_actor != motion_current_actor)
-    {
-      if (motion_last_actor && motion_current_actor)
-        {
-          ClutterEvent cev;
-
-          cev.crossing.type    = CLUTTER_LEAVE;
-          cev.crossing.time    = event->any.time;
-          cev.crossing.flags   = 0; 
-          cev.crossing.x       = event->motion.x;
-          cev.crossing.y       = event->motion.y;
-          cev.crossing.source  = motion_last_actor;
-          /* unref in free  */
-          cev.crossing.related = g_object_ref (motion_current_actor);
-
-          g_queue_push_head (context->events_queue, 
-          clutter_event_copy (&cev));
-
-          cev.crossing.type    = CLUTTER_ENTER;
-          cev.crossing.time    = event->any.time;
-          cev.crossing.flags   = 0; 
-          cev.crossing.x       = event->motion.x;
-          cev.crossing.y       = event->motion.y;
-          cev.crossing.source  = motion_current_actor;
-          cev.crossing.related = g_object_ref (motion_last_actor);
-
-          g_queue_push_head (context->events_queue, 
-          clutter_event_copy (&cev));
-        }
-    }
-  motion_last_actor = motion_current_actor;
-}
-
-=======
-
-static void generate_enter_leave_events (ClutterMainContext *context,
-                                         ClutterActor       *motion_current_actor,
-                                         ClutterEvent       *event)
+static inline void
+generate_enter_leave_events (ClutterMainContext *context,
+                             ClutterActor       *motion_current_actor,
+                             ClutterEvent       *event)
 {
   static ClutterActor *motion_last_actor = NULL; 
 
@@ -1285,7 +1243,6 @@ static void generate_enter_leave_events (ClutterMainContext *context,
   motion_last_actor = motion_current_actor;
 }
 
->>>>>>> .r1604
 /** 
  * clutter_do_event
  * @event: a #ClutterEvent.