From dcde0e28f8cd4d674ba744fad1779f6e9f91eb6e Mon Sep 17 00:00:00 2001
From: Conor Curran <conor.curran@canonical.com>
Date: Thu, 21 Jun 2012 17:45:16 +0100
Subject: manually merge of lp:~victored/indicator-sound/lp-1014955

---
 data/com.canonical.indicator.sound.gschema.xml | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'data')

diff --git a/data/com.canonical.indicator.sound.gschema.xml b/data/com.canonical.indicator.sound.gschema.xml
index a3ec770..86de36a 100644
--- a/data/com.canonical.indicator.sound.gschema.xml
+++ b/data/com.canonical.indicator.sound.gschema.xml
@@ -18,6 +18,13 @@
         have at some point appeared in the menU. This allows the menu remember and display offlined applications.
       </description>
     </key>
+    <key name="preferred-media-players" type="as">
+      <summary>A list of applications that will have player controls visible all the time</summary>
+      <default>[ 'rhythmbox' ]</default>
+      <description>
+        A list of applications that will have player controls visible all the time
+      </description>
+    </key>
     <key name="global-mute" type="b">
       <default>false</default>
       <summary>Initial setting for global mute (mute all) on the menu </summary>
-- 
cgit v1.2.3