From 29180e8d44fdb0231819cf59c4a5c749f03c8132 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 10 Nov 2020 08:55:16 +0100 Subject: src/service.vala: Properly recognize a MATE desktop session when launched via LightDM's default lighdm-xsession. --- src/service.vala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/service.vala b/src/service.vala index 76f2574..d5eacdf 100644 --- a/src/service.vala +++ b/src/service.vala @@ -251,6 +251,7 @@ public class IndicatorSound.Service: Object { void activate_desktop_settings (SimpleAction action, Variant? param) { unowned string env = Environment.get_variable ("DESKTOP_SESSION"); + unowned string xdg_desktop = Environment.get_variable ("XDG_CURRENT_DESKTOP"); string cmd; #if HAS_URLDISPATCHER @@ -263,7 +264,7 @@ public class IndicatorSound.Service: Object { if (env == "xubuntu" || env == "xfce" || env == "ubuntustudio") cmd = "pavucontrol"; - else if (env == "mate") + else if (env == "mate" || xdg_desktop == "MATE") cmd = "mate-volume-control"; else if (desktop_is_unity() && Environment.find_program_in_path ("unity-control-center") != null) cmd = "unity-control-center sound"; -- cgit v1.2.3 From 7fe2596dc5b0bb0f913e8443eb0e378bdbec8092 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 11 Nov 2020 08:59:10 +0100 Subject: src/service.vala: Check if mate-volume-control exists before executing it. --- src/service.vala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/service.vala b/src/service.vala index d5eacdf..8acdc39 100644 --- a/src/service.vala +++ b/src/service.vala @@ -264,7 +264,7 @@ public class IndicatorSound.Service: Object { if (env == "xubuntu" || env == "xfce" || env == "ubuntustudio") cmd = "pavucontrol"; - else if (env == "mate" || xdg_desktop == "MATE") + else if ((env == "mate" || xdg_desktop == "MATE") && Environment.find_program_in_path ("mate-volume-control") != null) cmd = "mate-volume-control"; else if (desktop_is_unity() && Environment.find_program_in_path ("unity-control-center") != null) cmd = "unity-control-center sound"; -- cgit v1.2.3 From 0ae4bef7c23be98acbd608d14bee842d311216cf Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 11 Nov 2020 08:59:48 +0100 Subject: src/service.vala: Add FIXME to remind us that the -sound indicator also uses code that needs to be moved into libayatana-common (new shared lib). --- src/service.vala | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src') diff --git a/src/service.vala b/src/service.vala index 8acdc39..4c9579a 100644 --- a/src/service.vala +++ b/src/service.vala @@ -254,6 +254,8 @@ public class IndicatorSound.Service: Object { unowned string xdg_desktop = Environment.get_variable ("XDG_CURRENT_DESKTOP"); string cmd; + /* FIXME: the below code needs to be moved into libayatana-common!!! */ + #if HAS_URLDISPATCHER if (Environment.get_variable ("MIR_SOCKET") != null) { -- cgit v1.2.3