Merge lp:~donadigo/wingpanel-indicator-sound/hide-in-greeter into lp:~wingpanel-devs/wingpanel-indicator-sound/trunk

[Adam Bieńkowski]

Fixes bug #1472002. Hide indicator in greeter.

[lp:~donadigo/wingpanel-indicator-sound/hide-in-greeter]

26. By Adam Bieńkowski on 2015-08-02

Remove unneded spaces

[Felipe Escoto (philip.scott)]

review: Approve

=== modified file 'src/Indicator.vala'
--- src/Indicator.vala	2015-06-25 22:03:56 +0000
+++ src/Indicator.vala	2015-08-02 17:22:25 +0000
@@ -397,8 +397,12 @@
     }
 }
 
-public Wingpanel.Indicator get_indicator (Module module) {
+public Wingpanel.Indicator? get_indicator (Module module, Wingpanel.IndicatorManager.ServerType server_type) {
     debug ("Activating Sound Indicator");
+    if (server_type != Wingpanel.IndicatorManager.ServerType.SESSION) {
+        return null;
+    }
+
     var indicator = new Sound.Indicator ();
     return indicator;
 }