aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Tari <robert@tari.in>2021-11-05 09:48:24 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-11-08 13:09:50 +0100
commit0efe14ff8a00cc73a68a10898609c235ac1f4148 (patch)
tree678e48035c4b1edf5a708ee49bbdfc4a8a5e7d9c
parentcd92695742511cd0fb7d035ce6a681e2395dbb3f (diff)
downloadayatana-indicator-sound-0efe14ff8a00cc73a68a10898609c235ac1f4148.tar.gz
ayatana-indicator-sound-0efe14ff8a00cc73a68a10898609c235ac1f4148.tar.bz2
ayatana-indicator-sound-0efe14ff8a00cc73a68a10898609c235ac1f4148.zip
Restrict com.canonical.settings.sound code to Unity
-rw-r--r--src/volume-control-pulse.vala14
-rw-r--r--src/volume-warning-pulse.vala16
2 files changed, 20 insertions, 10 deletions
diff --git a/src/volume-control-pulse.vala b/src/volume-control-pulse.vala
index fdb939e..706b0fe 100644
--- a/src/volume-control-pulse.vala
+++ b/src/volume-control-pulse.vala
@@ -520,12 +520,16 @@ public class VolumeControlPulse : VolumeControl
this.ready = false;
}
- /* FIXME: Ubuntu Settings Daemon specifics */
+ /* Ubuntu Settings Daemon specifics */
var props = new Proplist ();
- props.sets (Proplist.PROP_APPLICATION_NAME, "Ubuntu Audio Settings");
- props.sets (Proplist.PROP_APPLICATION_ID, "com.canonical.settings.sound");
- props.sets (Proplist.PROP_APPLICATION_ICON_NAME, "multimedia-volume-control");
- props.sets (Proplist.PROP_APPLICATION_VERSION, "0.1");
+
+ if (AyatanaCommon.utils_is_unity())
+ {
+ props.sets (Proplist.PROP_APPLICATION_NAME, "Ubuntu Audio Settings");
+ props.sets (Proplist.PROP_APPLICATION_ID, "com.canonical.settings.sound");
+ props.sets (Proplist.PROP_APPLICATION_ICON_NAME, "multimedia-volume-control");
+ props.sets (Proplist.PROP_APPLICATION_VERSION, "0.1");
+ }
reconnect_pulse_dbus ();
diff --git a/src/volume-warning-pulse.vala b/src/volume-warning-pulse.vala
index 9e7d775..8531c68 100644
--- a/src/volume-warning-pulse.vala
+++ b/src/volume-warning-pulse.vala
@@ -2,6 +2,7 @@
* -*- Mode:Vala; indent-tabs-mode:t; tab-width:4; encoding:utf8 -*-
*
* Copyright 2015 Canonical Ltd.
+ * Copyright 2021 Robert Tari
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -17,6 +18,7 @@
*
* Authors:
* Charles Kerr <charles.kerr@canonical.com>
+ * Robert Tari <robert@tari.in>
*/
using PulseAudio;
@@ -195,12 +197,16 @@ public class VolumeWarningPulse : VolumeWarning
void pulse_reconnect () {
pulse_disconnect ();
- /* FIXME: Unity Settings Daemon specifics */
+ /* Unity Settings Daemon specifics */
var props = new Proplist ();
- props.sets (Proplist.PROP_APPLICATION_NAME, "Ubuntu Audio Settings");
- props.sets (Proplist.PROP_APPLICATION_ID, "com.canonical.settings.sound");
- props.sets (Proplist.PROP_APPLICATION_ICON_NAME, "multimedia-volume-control");
- props.sets (Proplist.PROP_APPLICATION_VERSION, "0.1");
+
+ if (AyatanaCommon.utils_is_unity())
+ {
+ props.sets (Proplist.PROP_APPLICATION_NAME, "Ubuntu Audio Settings");
+ props.sets (Proplist.PROP_APPLICATION_ID, "com.canonical.settings.sound");
+ props.sets (Proplist.PROP_APPLICATION_ICON_NAME, "multimedia-volume-control");
+ props.sets (Proplist.PROP_APPLICATION_VERSION, "0.1");
+ }
_pulse_context = new PulseAudio.Context (_pgloop.get_api(), null, props);
_pulse_context.set_state_callback (pulse_context_state_callback);