Merge lp:~raof/netbook-remix-launcher/fix-bug-513083 into lp:netbook-remix-launcher

[Chris Halse Rogers]

Add a null guard in the on_child_focus_changed signal handler. This fixes the crash when using keyboard navigation to enter the System category.

=== modified file 'src/nl-menu-items.c'
--- src/nl-menu-items.c	2009-09-24 17:14:55 +0000
+++ src/nl-menu-items.c	2010-03-11 23:24:18 +0000
@@ -573,6 +573,14 @@
   gfloat y1 = 0, y2 = 0;
   ClutterActorBox focus_box = { 0 };
 
+  /* For some reason somewhere between signal emission and this handler being
+   * called, box can get NULLed (eg: LP #514083).
+   * 
+   * I think this problem should be hunted down at some point.  Until then
+   * work around it by checking for NULL.
+   */
+  g_return_if_fail (box != NULL);
+
   parent = clutter_actor_get_parent (icon_view);
 
   children = clutter_container_get_children (main_box);