diff options
| author | Michael Terry <michael.terry@canonical.com> | 2014-03-13 14:58:51 -0400 |
|---|---|---|
| committer | Michael Terry <michael.terry@canonical.com> | 2014-03-13 14:58:51 -0400 |
| commit | bd6be42fcddd0eef33eca033503e15c73abb023e (patch) | |
| tree | 60d4662bdbb201d72c6b57bc86832faafbbeb456 | |
| parent | 9d812a8e5f4e079e19135ceebfcef22bafdfb0a1 (diff) | |
| parent | e2fdd75b6e7fd1c8572dd10356272668b99d33dd (diff) | |
| download | ayatana-indicator-sound-bd6be42fcddd0eef33eca033503e15c73abb023e.tar.gz ayatana-indicator-sound-bd6be42fcddd0eef33eca033503e15c73abb023e.tar.bz2 ayatana-indicator-sound-bd6be42fcddd0eef33eca033503e15c73abb023e.zip | |
Merge from trunk
| -rw-r--r-- | data/com.canonical.indicator.sound | 3 | ||||
| -rw-r--r-- | debian/changelog | 14 | ||||
| -rw-r--r-- | src/service.vala | 7 |
3 files changed, 23 insertions, 1 deletions
diff --git a/data/com.canonical.indicator.sound b/data/com.canonical.indicator.sound index ae5fd5d..fca15be 100644 --- a/data/com.canonical.indicator.sound +++ b/data/com.canonical.indicator.sound @@ -12,6 +12,9 @@ ObjectPath=/com/canonical/indicator/sound/phone [desktop_greeter] ObjectPath=/com/canonical/indicator/sound/desktop_greeter +[desktop_lockscreen] +ObjectPath=/com/canonical/indicator/sound/desktop_greeter + [ubiquity] ObjectPath=/com/canonical/indicator/sound/desktop_greeter diff --git a/debian/changelog b/debian/changelog index 818a735..bc53fe2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +indicator-sound (12.10.2+14.04.20140311.1-0ubuntu1) trusty; urgency=low + + [ Lars Uebernickel ] + * Add desktop_lockscreen profile + + -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Tue, 11 Mar 2014 18:26:29 +0000 + +indicator-sound (12.10.2+14.04.20140305-0ubuntu1) trusty; urgency=low + + [ Lars Uebernickel ] + * Honor com.canonical.indicator.sound visible (LP: #829648) + + -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 05 Mar 2014 08:44:14 +0000 + indicator-sound (12.10.2+14.04.20140224-0ubuntu1) trusty; urgency=low [ Sebastien Bacher ] diff --git a/src/service.vala b/src/service.vala index 22e5f1c..2b21275 100644 --- a/src/service.vala +++ b/src/service.vala @@ -22,6 +22,9 @@ public class IndicatorSound.Service: Object { this.settings = new Settings ("com.canonical.indicator.sound"); this.sharedsettings = new Settings ("com.ubuntu.sound"); + this.settings.bind ("visible", this, "visible", SettingsBindFlags.GET); + this.notify["visible"].connect ( () => this.update_root_icon () ); + this.volume_control = new VolumeControl (); this.players = new MediaPlayerList (); @@ -74,6 +77,8 @@ public class IndicatorSound.Service: Object { return 0; } + public bool visible { get; set; } + public bool allow_amplified_volume { get { return this.max_volume > 1.0; @@ -204,7 +209,7 @@ public class IndicatorSound.Service: Object { builder.add ("{sv}", "title", new Variant.string (_("Sound"))); builder.add ("{sv}", "accessible-desc", new Variant.string (accessible_name)); builder.add ("{sv}", "icon", serialize_themed_icon (icon)); - builder.add ("{sv}", "visible", new Variant.boolean (true)); + builder.add ("{sv}", "visible", new Variant.boolean (this.visible)); root_action.set_state (builder.end()); } |