Merge lp:~victored/wingpanel/lp-1170998 into lp:~elementary-pantheon/wingpanel/old-trunk

[Victor Martinez]

Don't assume that all the indicators return a valid entry name.

Some indicators do not set a value for the "entry-name" property, and we need to avoid dereferencing a null pointer in such case. Fixes lp:1170998.

Fix bug #1170998.

[lp:~victored/wingpanel/lp-1170998]

133. By Victor Martinez on 2013-05-06

Some indicators do not set a value for the "entry-name" property, and we need to avoid dereferencing a null pointer in such case. This fixes bug #1170998.

[Cody Garver (codygarver)]

review: Approve

=== modified file 'src/Indicator/IndicatorObjectEntry.vala'
--- src/Indicator/IndicatorObjectEntry.vala	2013-04-14 07:54:25 +0000
+++ src/Indicator/IndicatorObjectEntry.vala	2013-05-03 03:48:29 +0000
@@ -50,9 +50,6 @@
             this.entry = entry;
             this.indicator = indicator;
 
-            string indicator_name = indicator.get_name ();
-            string entry_name = get_entry_name ();
-
             var image = entry.image;
             if (image != null && image is Gtk.Image)
                 set_widget (WidgetSlot.IMAGE, image);
@@ -64,6 +61,9 @@
             show ();
 
             if (entry.menu == null) {
+                string indicator_name = indicator.get_name ();
+                string entry_name = get_entry_name ();
+
                 critical ("Indicator: %s (%s) has no menu widget.", indicator_name, entry_name);
                 return;
             }
@@ -78,7 +78,7 @@
         }
 
         public string get_entry_name () {
-            return entry.name_hint;
+            return entry.name_hint ?? "";
         }
 
         private void setup_drawing () {