From d6445f8abfa78c0a9c8680a3ba7422d331391f8f Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@src.gnome.org>
Date: Fri, 7 Nov 2008 22:04:53 +0000
Subject: Merge revisions 36685:36729 from trunk.

svn path=/branches/kill-bonobo/; revision=36763
---
 calendar/gui/apps_evolution_calendar.schemas.in | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

(limited to 'calendar/gui/apps_evolution_calendar.schemas.in')

diff --git a/calendar/gui/apps_evolution_calendar.schemas.in b/calendar/gui/apps_evolution_calendar.schemas.in
index 96bcf173f1..bae4b65ba4 100644
--- a/calendar/gui/apps_evolution_calendar.schemas.in
+++ b/calendar/gui/apps_evolution_calendar.schemas.in
@@ -603,5 +603,30 @@
       </locale>
     </schema>
 
+    <schema>
+      <key>/schemas/apps/evolution/calendar/display/error_timeout</key>
+      <applyto>/apps/evolution/calendar/display/error_timeout</applyto>
+      <owner>evolution-calendar</owner>
+      <type>int</type>
+      <default>60</default>
+      <locale name="C">
+          <short>Amount of time in seconds the error should be shown on the status bar.</short>
+          <long> Amount of time in seconds the error should be shown on the status bar.
+          </long>
+      </locale>
+    </schema>
+    <schema>
+      <key>/schemas/apps/evolution/calendar/display/error_level</key>
+      <applyto>/apps/evolution/calendar/display/error_level</applyto>
+      <owner>evolution-calendar</owner>
+      <type>int</type>
+      <default>0</default>
+      <locale name="C">
+         <short>Level beyond which the message should be logged.</short>
+         <long> This can have three possible values. 0 for errors. 1 for warnings.
+                2 for debug messages.
+         </long>
+      </locale>
+    </schema>
   </schemalist>
 </gconfschemafile>
-- 
cgit v1.2.3