From cea054cd54d84479352a43bbabc19c9ce9af5efb Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@src.gnome.org>
Date: Fri, 8 Aug 2008 04:26:12 +0000
Subject: Merge revisions 35747:35930 from trunk.

svn path=/branches/kill-bonobo/; revision=35931
---
 plugins/mail-notification/apps-evolution-mail-notification.schemas.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins/mail-notification/apps-evolution-mail-notification.schemas.in')

diff --git a/plugins/mail-notification/apps-evolution-mail-notification.schemas.in b/plugins/mail-notification/apps-evolution-mail-notification.schemas.in
index 4bdafcfec1..c0a038068d 100644
--- a/plugins/mail-notification/apps-evolution-mail-notification.schemas.in
+++ b/plugins/mail-notification/apps-evolution-mail-notification.schemas.in
@@ -77,7 +77,7 @@
       <default>true</default>
       <locale name="C">
         <short>Beep or play sound file.</short>
-        <long>If true, then beep, otherwise will play sound file when new messages arrive.</long>
+        <long>If "true", then beep, otherwise will play sound file when new messages arrive.</long>
       </locale>
     </schema>
     <schema>
-- 
cgit v1.2.3


From ff7084ffe4a935a4cfafc9cd44a9b9daf43cb976 Mon Sep 17 00:00:00 2001
From: "H.Habighorst" <tearofadragon@googlemail.com>
Date: Sun, 23 Aug 2009 08:31:14 -0400
Subject: Bug 571488 - Migrate from deprecated gnome_sound to libcanberra

---
 .../apps-evolution-mail-notification.schemas.in               | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'plugins/mail-notification/apps-evolution-mail-notification.schemas.in')

diff --git a/plugins/mail-notification/apps-evolution-mail-notification.schemas.in b/plugins/mail-notification/apps-evolution-mail-notification.schemas.in
index c0a038068d..ad7dd91615 100644
--- a/plugins/mail-notification/apps-evolution-mail-notification.schemas.in
+++ b/plugins/mail-notification/apps-evolution-mail-notification.schemas.in
@@ -91,6 +91,17 @@
         <long>Sound file to be played when new messages arrive, if not in beep mode.</long>
       </locale>
     </schema>
+    <schema>
+      <key>/schemas/apps/evolution/eplugin/mail-notification/sound-use-theme</key>
+      <applyto>/apps/evolution/eplugin/mail-notification/sound-use-theme</applyto>
+      <owner>evolution-mail</owner>
+      <type>bool</type>
+      <default>false</default>	
+      <locale name="C">
+        <short>Use sound theme</short>
+        <long>Play themed sound when new messages arrive, if not in beep mode.</long>
+      </locale>
+    </schema>	
   </schemalist>
 </gconfschemafile>
 
-- 
cgit v1.2.3