Merge branch 'sasl'

[empathy.git] / data / org.gnome.Empathy.gschema.xml.in

diff --git a/data/org.gnome.Empathy.gschema.xml.in b/data/org.gnome.Empathy.gschema.xml.in
index 607530870dcf4a3c7eaba9f02f2a148d63a0a157..f889adf95118885110a6001dcd37ea0ab65b6b2d 100644 (file)
--- a/data/org.gnome.Empathy.gschema.xml.in
+++ b/data/org.gnome.Empathy.gschema.xml.in
@@ -13,12 +13,7 @@
     <key name="autoaway" type="b">
       <default>true</default>
       <_summary>Empathy should auto-away when idle</_summary>
-      <_description>Whether Empathy should go into away mode automatically if user is idle.</_description>
-    </key>
-    <key name="import-asked" type="b">
-      <default>false</default>
-      <_summary>Empathy has asked about importing accounts</_summary>
-      <_description>Whether Empathy has asked about importing accounts from other programs.</_description>
+      <_description>Whether Empathy should go into away mode automatically if the user is idle.</_description>
     </key>
     <key name="butterfly-logs-migrated" type="b">
       <default>false</default>
@@ -75,6 +70,12 @@
       <_summary>Open new chats in separate windows</_summary>
       <_description>Always open a separate chat window for new chats.</_description>
     </key>
+    <key name="events-notify-area" type="b">
+      <default>true</default>
+      <_summary>Display incoming events in the status area</_summary>
+      <_description>Display incoming events in the status area. If false,
+present them to the user immediately.</_description>
+    </key>
     <key name="chat-window-paned-pos" type="i">
       <default>0</default>
       <_summary>The position for the chat window side pane</_summary>
@@ -221,13 +222,6 @@
       <_description>Whether to show the message dialog about closing the main window with the 'x' button in the title bar.</_description>
     </key>
   </schema>
-  <schema id="org.gnome.Empathy.accounts" path="/apps/empathy/accounts/">
-    <key name="imported-mc4-accounts" type="b">
-      <default>false</default>
-      <_summary>MC 4 accounts have been imported</_summary>
-      <_description>MC 4 accounts have been imported.</_description>
-    </key>
-  </schema>
   <schema id="org.gnome.Empathy.location" path="/apps/empathy/location/">
     <key name="publish" type="b">
       <default>false</default>