Merge lp:~jconti/unity-greeter/check_null_indicator into lp:unity-greeter

[Jason Conti]

indicator_object_new_from_file can fail to load an indicator and return null for a variety of reasons (missing file, version mismatch, ...). This branch checks for null and continues loading the remaining indicators.

I thought about adding an additional warning but indicator_object_new_from_file already emits a detailed warning based on the reason it failed and I am not sure there is more information we could add.

[Robert Ancell (robert-ancell)]

Looks good, thanks!

review: Approve

=== modified file 'NEWS'
--- NEWS	2012-01-24 16:06:51 +0000
+++ NEWS	2012-01-30 16:46:27 +0000
@@ -1,6 +1,7 @@
 Overview of changes in unity-greeter 0.2.1
 
     * Fix session menu button not showing for first user
+    * Skip indicators that fail to load
 
 Overview of changes in unity-greeter 0.2.0
 

=== modified file 'src/menubar.vala'
--- src/menubar.vala	2012-01-14 16:24:09 +0000
+++ src/menubar.vala	2012-01-30 16:46:27 +0000
@@ -296,6 +296,7 @@
         foreach (var filename in filenames)
         {
             var io = new Indicator.Object.from_file (filename);
+            if (io == null) continue;
             indicator_objects.append (io);
             io.entry_added.connect (indicator_added_cb);
             io.entry_removed.connect (indicator_removed_cb);