Merge remote-tracking branch 'glassrose/add-All-service-selection-in-debug-window'

[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 de57af80c97a192e21f7a20b1c331bb43f9de9b2..8e7d9fd1b55cb38d66baa29fd312f39ecb3caf15 100644 (file)
--- a/data/org.gnome.Empathy.gschema.xml.in
+++ b/data/org.gnome.Empathy.gschema.xml.in
@@ -88,12 +88,17 @@ present them to the user immediately.</_description>
       <_summary>The position for the chat window side pane</_summary>
       <_description>The stored position (in pixels) of the chat window side pane.</_description>
     </key>
+    <key name="show-groups" type="b">
+      <default>true</default>
+      <_summary>Show contact groups</_summary>
+      <_description>Whether to show groups in the contact list.</_description>
+    </key>
   </schema>
   <schema id="org.gnome.Empathy.contacts" path="/org/gnome/empathy/contacts/">
     <key name="sort-criterium" type="s">
       <default>'state'</default>
       <_summary>Contact list sort criterion</_summary>
-      <_description>Which criterion to use when sorting the contact list. Default is to sort by the contact's name with the value "name". A value of "state" will sort the contact list by state.</_description>
+      <_description>Which criterion to use when sorting the contact list. Default is to sort by the contact's state with the value "state". A value of "name" will sort the contact list by name.</_description>
     </key>
   </schema>
   <schema id="org.gnome.Empathy.sounds" path="/org/gnome/empathy/sounds/">
@@ -201,6 +206,11 @@ present them to the user immediately.</_description>
       <_summary>Enable WebKit Developer Tools</_summary>
       <_description>Whether WebKit developer tools, such as the Web Inspector, should be enabled.</_description>
     </key>
+    <key name="send-chat-states" type="b">
+      <default>true</default>
+      <_summary>Inform other users when you are typing to them</_summary>
+      <_description>Whether to send the 'composing' or 'paused' chat states. Does not currently affect the 'gone' state.</_description>
+    </key>
     <key name="theme-chat-room" type="b">
       <default>true</default>
       <_summary>Use theme for chat rooms</_summary>
@@ -233,12 +243,6 @@ present them to the user immediately.</_description>
     </key>
   </schema>
   <schema id="org.gnome.Empathy.call" path="/org/gnome/empathy/call/">
-    <key name="volume" type="d">
-      <range min="0" max="150"/>
-      <default>100.0</default>
-      <_summary>Call volume</_summary>
-      <_description>Call volume, as a percentage.</_description>
-    </key>
     <key name="camera-device" type="s">
       <default>''</default>
       <_summary>Camera device</_summary>