Merge lp:~darkxst/ubuntu/raring/clutter-1.0/lp963925 into lp:ubuntu/raring/clutter-1.0

[Tim Lunn]

[Iain Lane (laney)]

Uploaded to r-proposed - thanks! Not sure what will happen to this MP...

review: Approve

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2012-11-08 11:03:05 +0000
+++ .pc/applied-patches	2013-05-21 04:12:28 +0000
@@ -1,1 +1,2 @@
 fix_test_data_path.patch
+git_backport_cally_weak_pointer.patch

=== modified file 'clutter/cally/cally-stage.c'
--- clutter/cally/cally-stage.c	2012-03-21 13:43:06 +0000
+++ clutter/cally/cally-stage.c	2013-05-21 04:12:28 +0000
@@ -139,7 +139,11 @@
       AtkObject *old = NULL;
 
       if (self->priv->key_focus != NULL)
-        old = clutter_actor_get_accessible (self->priv->key_focus);
+        {
+          g_object_remove_weak_pointer (G_OBJECT (self->priv->key_focus),
+                                        (gpointer *) &self->priv->key_focus);
+          old = clutter_actor_get_accessible (self->priv->key_focus);
+        }
       else
         old = clutter_actor_get_accessible (CLUTTER_ACTOR (stage));
 
@@ -154,7 +158,19 @@
   self->priv->key_focus = key_focus;
 
   if (key_focus != NULL)
-    new = clutter_actor_get_accessible (key_focus);
+    {
+      /* ensure that if the key focus goes away, the field inside
+       * CallyStage is reset. see bug:
+       *
+       * https://bugzilla.gnome.org/show_bug.cgi?id=692706
+       *
+       * we remove the weak pointer above.
+       */
+      g_object_add_weak_pointer (G_OBJECT (self->priv->key_focus),
+                                 (gpointer *) &self->priv->key_focus);
+
+      new = clutter_actor_get_accessible (key_focus);
+    }
   else
     new = clutter_actor_get_accessible (CLUTTER_ACTOR (stage));
 

=== modified file 'debian/changelog'
--- debian/changelog	2013-02-28 12:54:45 +0000
+++ debian/changelog	2013-05-21 04:12:28 +0000
@@ -1,3 +1,11 @@
+clutter-1.0 (1.12.2-0ubuntu3.1) raring; urgency=low
+
+  * debian/patches/git_cally_weak_pointer.patch:
+    - Upstream git patch backported to fix crash (LP: #963925)
+
+
+ -- Tim Lunn <[e-mail]>  Tue, 21 May 2013 13:08:37 +1000
+
 clutter-1.0 (1.12.2-0ubuntu3) raring; urgency=low
 
   * Remove Breaks from libclutter-1.0-0 to libcogl11 — our proposed-migration

=== added file 'debian/patches/git_backport_cally_weak_pointer.patch'
--- debian/patches/git_backport_cally_weak_pointer.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/git_backport_cally_weak_pointer.patch	2013-05-21 04:12:28 +0000
@@ -0,0 +1,53 @@
+From a586c23ddcef9a11f6e343b4b6848cde2df54927 Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <[e-mail]>
+Date: Mon, 06 May 2013 22:46:25 +0000
+Subject: cally: Use a weak pointer to hold the key focus in CallyStage
+
+We want to avoid the pointer getting stale, and causing crashes.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=692706
+(cherry picked from commit 19391a9626b087bd4df452e8699d53caa54c350f)
+
+Signed-off-by: Emmanuele Bassi <[e-mail]>
+---
+diff --git a/clutter/cally/cally-stage.c b/clutter/cally/cally-stage.c
+index 2b1cfd1..c95ccb0 100644
+--- a/clutter/cally/cally-stage.c
++++ b/clutter/cally/cally-stage.c
+@@ -139,7 +139,11 @@ cally_stage_notify_key_focus_cb (ClutterStage *stage,
+       AtkObject *old = NULL;
+ 
+       if (self->priv->key_focus != NULL)
+-        old = clutter_actor_get_accessible (self->priv->key_focus);
++        {
++          g_object_remove_weak_pointer (G_OBJECT (self->priv->key_focus),
++                                        (gpointer *) &self->priv->key_focus);
++          old = clutter_actor_get_accessible (self->priv->key_focus);
++        }
+       else
+         old = clutter_actor_get_accessible (CLUTTER_ACTOR (stage));
+ 
+@@ -154,7 +158,19 @@ cally_stage_notify_key_focus_cb (ClutterStage *stage,
+   self->priv->key_focus = key_focus;
+ 
+   if (key_focus != NULL)
+-    new = clutter_actor_get_accessible (key_focus);
++    {
++      /* ensure that if the key focus goes away, the field inside
++       * CallyStage is reset. see bug:
++       *
++       * https://bugzilla.gnome.org/show_bug.cgi?id=692706
++       *
++       * we remove the weak pointer above.
++       */
++      g_object_add_weak_pointer (G_OBJECT (self->priv->key_focus),
++                                 (gpointer *) &self->priv->key_focus);
++
++      new = clutter_actor_get_accessible (key_focus);
++    }
+   else
+     new = clutter_actor_get_accessible (CLUTTER_ACTOR (stage));
+ 
+--
+cgit v0.9.1
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-11-08 11:03:05 +0000
+++ debian/patches/series	2013-05-21 04:12:28 +0000
@@ -1,1 +1,2 @@
 fix_test_data_path.patch
+git_backport_cally_weak_pointer.patch