[clutter/clutter-1.14] drag-action: fix warning when setting drag-handle to null



commit 80d3fbdb9ca2e996cc66c25ff37ddfe43a18434e
Author: Lionel Landwerlin <llandwerlin gmail com>
Date:   Thu Sep 26 16:49:45 2013 +0100

    drag-action: fix warning when setting drag-handle to null
    
    https://bugzilla.gnome.org/show_bug.cgi?id=708850
    (cherry picked from commit 067fcc3690b0a354bf0a7b0692aab47fb68a0817)
    Signed-off-by: Emmanuele Bassi <ebassi gnome org>

 clutter/clutter-drag-action.c |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/clutter/clutter-drag-action.c b/clutter/clutter-drag-action.c
index 0abe8ed..982972d 100644
--- a/clutter/clutter-drag-action.c
+++ b/clutter/clutter-drag-action.c
@@ -1142,14 +1142,18 @@ clutter_drag_action_set_drag_handle (ClutterDragAction *action,
 
   priv->transformed_press_x = priv->press_x;
   priv->transformed_press_y = priv->press_y;
-  clutter_actor_transform_stage_point (handle, priv->press_x, priv->press_y,
-                                       &priv->transformed_press_x,
-                                       &priv->transformed_press_y);
 
   if (priv->drag_handle != NULL)
-    g_signal_connect (priv->drag_handle, "destroy",
-                      G_CALLBACK (on_drag_handle_destroy),
-                      action);
+    {
+      clutter_actor_transform_stage_point (priv->drag_handle,
+                                           priv->press_x,
+                                           priv->press_y,
+                                          &priv->transformed_press_x,
+                                          &priv->transformed_press_y);
+      g_signal_connect (priv->drag_handle, "destroy",
+                       G_CALLBACK (on_drag_handle_destroy),
+                       action);
+    }
 
   g_object_notify_by_pspec (G_OBJECT (action), drag_props[PROP_DRAG_HANDLE]);
 }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]