Be more compatible with Facebook emoticon codes

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

diff --git a/data/org.gnome.Empathy.gschema.xml b/data/org.gnome.Empathy.gschema.xml
index d9810feb9c4d6af4e9ae189061576173e5c462ac..f695431afdd633d84fe9a75c7ffca8863db01a61 100644 (file)
--- a/data/org.gnome.Empathy.gschema.xml
+++ b/data/org.gnome.Empathy.gschema.xml
@@ -44,7 +44,7 @@
   </schema>
   <schema id="org.gnome.Empathy.ui" path="/org/gnome/empathy/ui/">
     <key name="show-offline" type="b">
-      <default>true</default>
+      <default>false</default>
       <summary>Show offline contacts</summary>
       <description>Whether to show contacts that are offline in the contact list.</description>
     </key>
@@ -144,7 +144,7 @@ present them to the user immediately.</description>
       <description>Whether to show popup notifications when away or busy.</description>
     </key>
     <key name="notifications-focus" type="b">
-      <default>false</default>
+      <default>true</default>
       <summary>Pop up notifications if the chat isn't focused</summary>
       <description>Whether to show a popup notification when receiving a new message even if the chat is already opened, but not focused.</description>
     </key>
@@ -170,6 +170,11 @@ present them to the user immediately.</description>
       <summary>Show contact list in rooms</summary>
       <description>Whether to show the contact list in chat rooms.</description>
     </key>
+    <key name="theme" type="s">
+      <default>'Classic'</default>
+      <summary>Chat window theme</summary>
+      <description>The theme that is used to display the conversation in chat windows.</description>
+    </key>
     <key name="theme-variant" type="s">
       <default>''</default>
       <summary>Chat window theme variant</summary>
@@ -178,7 +183,7 @@ present them to the user immediately.</description>
     <key name="adium-path" type="s">
       <default>''</default>
       <summary>Path of the Adium theme to use</summary>
-      <description>Path of the Adium theme to use if the theme used for chat is Adium.</description>
+      <description>Path of the Adium theme to use if the theme used for chat is Adium. Deprecated.</description>
     </key>
     <key name="enable-webkit-developer-tools" type="b">
       <default>false</default>
@@ -251,21 +256,6 @@ present them to the user immediately.</description>
       <summary>Empathy can publish the user's location</summary>
       <description>Whether Empathy can publish the user's location to their contacts.</description>
     </key>
-    <key name="resource-network" type="b">
-      <default>true</default>
-      <summary>Empathy can use the network to guess the location</summary>
-      <description>Whether Empathy can use the network to guess the location.</description>
-    </key>
-    <key name="resource-cell" type="b">
-      <default>true</default>
-      <summary>Empathy can use the cellular network to guess the location</summary>
-      <description>Whether Empathy can use the cellular network to guess the location.</description>
-    </key>
-    <key name="resource-gps" type="b">
-      <default>false</default>
-      <summary>Empathy can use the GPS to guess the location</summary>
-      <description>Whether Empathy can use the GPS to guess the location.</description>
-    </key>
     <key name="reduce-accuracy" type="b">
       <default>true</default>
       <summary>Empathy should reduce the location's accuracy</summary>