Merge branch 'sasl'

[empathy.git] / data / empathy.convert

diff --git a/data/empathy.convert b/data/empathy.convert
index 4016965c4a0be60178116fbed05227a55fc0c38a..71353248ac316b0625a3b93c94adc7d259217ab1 100644 (file)
--- a/data/empathy.convert
+++ b/data/empathy.convert
@@ -4,7 +4,6 @@
 use-conn = /apps/empathy/use_conn
 autoconnect = /apps/empathy/autoconnect
 autoaway = /apps/empathy/autoaway
-import-asked = /apps/empathy/import_asked
 butterfly-logs-migrated = /apps/empathy/butterfly_logs_migrated
 file-transfer-default-folder = /apps/empathy/file_transfer_default_folder
 
@@ -61,10 +60,6 @@ avatar-in-icon = /apps/empathy/conversation/avatar_in_icon
 close-main-window = /apps/empathy/hints/close_main_window
 
   
-[org.gnome.Empathy.accounts]
-imported-mc4-accounts = /apps/empathy/accounts/imported_mc4_accounts
-
-  
 [org.gnome.Empathy.location]
 publish = /apps/empathy/location/publish
 resource-network = /apps/empathy/location/resource_network