Merge lp:~tintou/wingpanel-indicator-ayatana/fix-duplicates-names into lp:~wingpanel-devs/wingpanel-indicator-ayatana/trunk

[Corentin Noël]

catch null names from ayatana indicators

[Adam Bieńkowski (donadigo)]

Hm, are you confident about using random numbers here? I think a simple static int current_id would be a better solution here.

=== modified file 'src/AyatanaIndicator.vala'
--- src/AyatanaIndicator.vala	2016-06-09 20:00:44 +0000
+++ src/AyatanaIndicator.vala	2016-07-18 15:35:35 +0000
@@ -33,25 +33,23 @@
     const int MAX_ICON_SIZE = 24;
 
     public Indicator (IndicatorAyatana.ObjectEntry entry, IndicatorAyatana.Object obj, IndicatorIface indicator) {
-        Object (code_name: "%s%s".printf ("ayatana-", entry.name_hint),
-                display_name: "%s%s".printf ("ayatana-", entry.name_hint),
+        string name_hint = entry.name_hint;
+        if (name_hint == null) {
+            var rand = new GLib.Rand ();
+            name_hint = rand.next_int ().to_string ();
+        }
+
+        Object (code_name: "%s%s".printf ("ayatana-", name_hint),
+                display_name: "%s%s".printf ("ayatana-", name_hint),
                 description: _("Ayatana compatibility indicator"));
         this.entry = entry;
         this.indicator = indicator;
         this.parent_object = obj;
         this.menu_map = new Gee.HashMap<Gtk.Widget, Gtk.Widget> ();
-
-        unowned string name_hint = entry.name_hint;
-
-        if (name_hint == null) {
-            warning ("NULL name hint");
-        }
-
-        entry_name_hint = name_hint != null ? name_hint.dup () : "";
+        entry_name_hint = name_hint;
 
         if (entry.menu == null) {
             critical ("Indicator: %s has no menu widget.", entry_name_hint);
-
             return;
         }
 
@@ -325,4 +323,4 @@
                                                 MAX_ICON_SIZE, Gdk.InterpType.HYPER);
         }
     }
-}
 \ No newline at end of file
+}
 
=== modified file 'src/IndicatorObject.vala'
--- src/IndicatorObject.vala	2015-05-05 19:47:59 +0000
+++ src/IndicatorObject.vala	2016-07-18 15:35:35 +0000
@@ -32,11 +32,6 @@
         object.entry_removed.connect (on_entry_removed);
     }
 
-    ~IndicatorObject () {
-        object.entry_added.disconnect (on_entry_added);
-        object.entry_removed.disconnect (on_entry_removed);
-    }
-
     public string get_name () {
         return name;
     }