Merge lp:~davidmhewitt/wingpanel/fix-empty-indicator into lp:~wingpanel-devs/wingpanel/trunk

[David Hewitt]

Prevent adding an indicator with the same code_name twice

Was experiencing the linked bug with the Slack indicator. There would be an empty space to the right of it which opened an empty popover when you clicked it.

It seems like two Indicator objects are created for some of the Ayatana indicators. To prevent them both being added, we now compare the code name instead of just the object reference to prevent the same indicator being added twice.

[Djax (parnold-x)]

Hey, they were after the iterate before and we moved it up because this was a issue in some case. Don't remember why.

I think the core issue with this problem is that the ayatana indicator is loaded. It loads again all the ayatana indicators and register them. So while it iterates over the get_indicators () the ayatana register new indicators to the list and so it iterates over the new ones in the forach and the indicator_added signal is triggered.

So I think the get_indicators of the manager should maybe return something not modifiable.

[David Hewitt (davidmhewitt)]

Here is the merge where the signals were moved above the iterate for reference:
https://code.launchpad.net/~parnold-x/wingpanel/fix_ayatana_reload/+merge/300977

I'll take another look at this later and see if I can propose a better solution. Thanks.

[David Hewitt (davidmhewitt)]

Ok, so I've reverted the change to the ordering of when the signals were connected as I was able to confirm that it introduced a regression.

I've now changed the check that's used before adding the indicator to ensure we don't add the same one twice. Let me know if it works for you.

[lp:~davidmhewitt/wingpanel/fix-empty-indicator]

175. By David Hewitt on 2017-03-18

Merged trunk

[Kirill Romanov (djaler1)]

It works good!

review: Approve (test)

=== modified file 'src/Widgets/IndicatorMenuBar.vala'
--- src/Widgets/IndicatorMenuBar.vala	2015-10-20 14:06:58 +0000
+++ src/Widgets/IndicatorMenuBar.vala	2017-03-18 10:30:41 +0000
@@ -26,8 +26,10 @@
     }
 
     public void insert_sorted (IndicatorEntry item) {
-        if (item in sorted_items) {
-            return; /* item already added */
+        foreach (var indicator in sorted_items) {
+            if (item.base_indicator.code_name == indicator.base_indicator.code_name) {
+                return; /* item already added */
+            }
         }
 
         item.menu_bar = this;
@@ -68,4 +70,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}