From 5a20cd1f342ab4ae4dd7caacf2cec8d61bfe54be Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Tue, 1 Apr 2014 16:12:58 -0400 Subject: Use specified greeter bus name if available --- src/volume-control.vala | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/volume-control.vala b/src/volume-control.vala index 889c2d6..4c543f6 100644 --- a/src/volume-control.vala +++ b/src/volume-control.vala @@ -372,7 +372,7 @@ public class VolumeControl : Object } /* AccountsService operations */ - private void accountsservice_props_changed_cb (DBusProxy proxy, Variant changed_properties, string[] invalidated_properties) + private void accountsservice_props_changed_cb (DBusProxy proxy, Variant changed_properties, string[]? invalidated_properties) { Variant volume_variant = changed_properties.lookup_value ("Volume", new VariantType ("d")); if (volume_variant != null) { @@ -441,8 +441,11 @@ 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, "com.canonical.UnityGreeter", "/list"); + _greeter_proxy = yield Bus.get_proxy (BusType.SESSION, bus_name, "/list"); } catch (GLib.Error e) { warning ("unable to get greeter proxy: %s", e.message); return; -- cgit v1.2.3 From 0bc794899a7d4500d76b2a9ec3c6f311d6c25312 Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Tue, 1 Apr 2014 16:37:35 -0400 Subject: And fix media player usage too --- src/media-player-list-greeter.vala | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/media-player-list-greeter.vala b/src/media-player-list-greeter.vala index 15e4c55..a36e970 100644 --- a/src/media-player-list-greeter.vala +++ b/src/media-player-list-greeter.vala @@ -29,9 +29,12 @@ public class MediaPlayerListGreeter : MediaPlayerList { HashTable players = new HashTable(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 ( BusType.SESSION, - "com.canonical.Unity", + bus_name, "/list", DBusProxyFlags.NONE, null, -- cgit v1.2.3 From 47ca0f8c9af7c41e884ff696c0ee05addd9f0ae8 Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Tue, 1 Apr 2014 17:08:28 -0400 Subject: Go back to useing correct name for unity greeter (especially in media player) --- src/media-player-list-greeter.vala | 5 +---- 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 players = new HashTable(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 ( 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; -- cgit v1.2.3 From d9cf9a4ea0f449506bc4b39ce9e72b26d8783962 Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Tue, 1 Apr 2014 17:13:13 -0400 Subject: Drop minor null-allowed fix; let's not mix changes --- src/volume-control.vala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/volume-control.vala b/src/volume-control.vala index 71fdefa..889c2d6 100644 --- a/src/volume-control.vala +++ b/src/volume-control.vala @@ -372,7 +372,7 @@ public class VolumeControl : Object } /* AccountsService operations */ - private void accountsservice_props_changed_cb (DBusProxy proxy, Variant changed_properties, string[]? invalidated_properties) + private void accountsservice_props_changed_cb (DBusProxy proxy, Variant changed_properties, string[] invalidated_properties) { Variant volume_variant = changed_properties.lookup_value ("Volume", new VariantType ("d")); if (volume_variant != null) { -- cgit v1.2.3