[gnome-control-center/extensible-shell] [shell] make sure the control center menu is available before loading it

[Thomas Wood <thos src gnome org>]

commit 808567a6d0a2a4adb91f884614c297b8da6faf4b
Author: Thomas Wood <thos gnome org>
Date:   Sun Jan 31 10:35:04 2010 +0000

    [shell] make sure the control center menu is available before loading it

 shell/control-center.c |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/shell/control-center.c b/shell/control-center.c
index 4ccf841..5e5c9bc 100644
--- a/shell/control-center.c
+++ b/shell/control-center.c
@@ -276,14 +276,20 @@ fill_model (ShellData *data)
 {
   GSList *list, *l;
   GMenuTreeDirectory *d;
-  GMenuTree *t;
+  GMenuTree *tree;
   GtkWidget *vbox, *w;
 
   vbox = W (data->builder, "main-vbox");
 
-  t = gmenu_tree_lookup (MENUDIR "/gnomecc.menu", 0);
+  tree = gmenu_tree_lookup (MENUDIR "/gnomecc.menu", 0);
 
-  d = gmenu_tree_get_root_directory (t);
+  if (!tree)
+    {
+      g_warning ("Could not find control center menu");
+      return;
+    }
+
+  d = gmenu_tree_get_root_directory (tree);
 
   list = gmenu_tree_directory_get_contents (d);