From a27a6f8621c1f054c39e0ee1c0b8334434b10c97 Mon Sep 17 00:00:00 2001
From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Wed, 13 Jun 2012 09:45:28 +0200
Subject: remove deprecated gsettings keys

Those are not supported by the new roster UI and so can be removed.

https://bugzilla.gnome.org/show_bug.cgi?id=677949
---
 data/empathy.convert               |  7 -------
 data/org.gnome.Empathy.gschema.xml | 26 --------------------------
 2 files changed, 33 deletions(-)

(limited to 'data')

diff --git a/data/empathy.convert b/data/empathy.convert
index b6a1d2d3..eabc9e48 100644
--- a/data/empathy.convert
+++ b/data/empathy.convert
@@ -9,19 +9,12 @@ file-transfer-default-folder = /apps/empathy/file_transfer_default_folder
   
 [org.gnome.Empathy.ui]
 show-offline = /apps/empathy/ui/show_offline
-show-avatars = /apps/empathy/ui/show_avatars
-show-protocols = /apps/empathy/ui/show_protocols
-compact-contact-list = /apps/empathy/ui/compact_contact_list
 main-window-hidden = /apps/empathy/ui/main_window_hidden
 avatar-directory = /apps/empathy/ui/avatar_directory
 separate-chat-windows = /apps/empathy/ui/separate_chat_windows
 chat-window-paned-pos = /apps/empathy/ui/chat_window_paned_pos
 
   
-[org.gnome.Empathy.contacts]
-sort-criterium = /apps/empathy/contacts/sort_criterium
-
-  
 [org.gnome.Empathy.sounds]
 sounds-enabled = /apps/empathy/sounds/sounds_enabled
 sounds-disabled-away = /apps/empathy/sounds/sounds_disabled_away
diff --git a/data/org.gnome.Empathy.gschema.xml b/data/org.gnome.Empathy.gschema.xml
index e7597d7f..6deaffaf 100644
--- a/data/org.gnome.Empathy.gschema.xml
+++ b/data/org.gnome.Empathy.gschema.xml
@@ -48,26 +48,11 @@
       <summary>Show offline contacts</summary>
       <description>Whether to show contacts that are offline in the contact list.</description>
     </key>
-    <key name="show-avatars" type="b">
-      <default>true</default>
-      <summary>Show avatars</summary>
-      <description>Whether to show avatars for contacts in the contact list and chat windows.</description>
-    </key>
-    <key name="show-protocols" type="b">
-      <default>false</default>
-      <summary>Show protocols</summary>
-      <description>Whether to show protocols for contacts in the contact list.</description>
-    </key>
     <key name="show-balance-in-roster" type="b">
       <default>true</default>
       <summary>Show Balance in contact list</summary>
       <description>Whether to show account balances in the contact list.</description>
     </key>
-    <key name="compact-contact-list" type="b">
-      <default>false</default>
-      <summary>Compact contact list</summary>
-      <description>Whether to show the contact list in compact mode.</description>
-    </key>
     <key name="main-window-hidden" type="b">
       <default>false</default>
       <summary>Hide main window</summary>
@@ -100,17 +85,6 @@ present them to the user immediately.</description>
       <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>
-      <choices>
-        <choice value='state'/>
-        <choice value='name'/>
-      </choices>
-      <summary>Contact list sort criterion</summary>
-      <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/">
     <key name="sounds-enabled" type="b">
       <default>true</default>
-- 
cgit v1.2.1