diff options
| author | Michael Terry <michael.terry@canonical.com> | 2014-04-01 17:08:28 -0400 |
|---|---|---|
| committer | Michael Terry <michael.terry@canonical.com> | 2014-04-01 17:08:28 -0400 |
| commit | 47ca0f8c9af7c41e884ff696c0ee05addd9f0ae8 (patch) | |
| tree | b2e281944d19f0cb82a85bab0450d3708adb4592 | |
| parent | 0bc794899a7d4500d76b2a9ec3c6f311d6c25312 (diff) | |
| download | ayatana-indicator-sound-47ca0f8c9af7c41e884ff696c0ee05addd9f0ae8.tar.gz ayatana-indicator-sound-47ca0f8c9af7c41e884ff696c0ee05addd9f0ae8.tar.bz2 ayatana-indicator-sound-47ca0f8c9af7c41e884ff696c0ee05addd9f0ae8.zip | |
Go back to useing correct name for unity greeter (especially in media player)
| -rw-r--r-- | src/media-player-list-greeter.vala | 5 | ||||
| -rw-r--r-- | src/volume-control.vala | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/src/media-player-list-greeter.vala b/src/media-player-list-greeter.vala index a36e970..4842dc3 100644 --- a/src/media-player-list-greeter.vala +++ b/src/media-player-list-greeter.vala @@ -29,12 +29,9 @@ public class MediaPlayerListGreeter : MediaPlayerList { HashTable<string, MediaPlayerUser> players = new HashTable<string, MediaPlayerUser>(str_hash, str_equal); public MediaPlayerListGreeter () { - var bus_name = Environment.get_variable ("UNITY_GREETER_DBUS_NAME"); - if (bus_name == null) - bus_name = "com.canonical.UnityGreeter"; Bus.get_proxy.begin<UnityGreeterList> ( BusType.SESSION, - bus_name, + "com.canonical.UnityGreeter", "/list", DBusProxyFlags.NONE, null, diff --git a/src/volume-control.vala b/src/volume-control.vala index 4c543f6..71fdefa 100644 --- a/src/volume-control.vala +++ b/src/volume-control.vala @@ -441,11 +441,8 @@ public class VolumeControl : Object private async void setup_accountsservice () { if (Environment.get_variable ("XDG_SESSION_CLASS") == "greeter") { - var bus_name = Environment.get_variable ("UNITY_GREETER_DBUS_NAME"); - if (bus_name == null) - bus_name = "com.canonical.UnityGreeter"; try { - _greeter_proxy = yield Bus.get_proxy (BusType.SESSION, bus_name, "/list"); + _greeter_proxy = yield Bus.get_proxy (BusType.SESSION, "com.canonical.UnityGreeter", "/list"); } catch (GLib.Error e) { warning ("unable to get greeter proxy: %s", e.message); return; |