Merge lp:~jpetersen/netbook-remix-launcher/fix-bug-465548 into lp:netbook-remix-launcher

[Jan Arne Petersen]

Reset priv->old_view to NULL at the end of the fade-out animation in NlContentView.

Fixes: lp#465548 - netbook-launcher crashed with SIGSEGV in
g_cclosure_marshal_VOID__VOID() - i was just clicking around

[Didier Roche-Tolomelli (didrocks)]

Thanks for your merge proposal. Awesome! merging in trunk now.

review: Approve

=== modified file 'netbook-launcher/nl-content-view.c'
--- netbook-launcher/nl-content-view.c	2009-07-23 14:58:31 +0000
+++ netbook-launcher/nl-content-view.c	2010-03-17 13:24:19 +0000
@@ -201,10 +201,16 @@
 on_old_hidden (ClutterAnimation *anim,
                NlContentView    *view)
 {
+  NlContentViewPrivate *priv;
+
   if (NL_IS_CONTENT_VIEW (view))
     {
       ClutterActor *child = (ClutterActor*)clutter_animation_get_object (anim);
 
+      priv = view->priv;
+
+      priv->old_child = NULL;
+
       if (ctk_bin_get_child (CTK_BIN (view)) != child)
         clutter_actor_unparent (child);
     }