remove butterfly-logs-migrated gsettings key

https://bugzilla.gnome.org/show_bug.cgi?id=612555

diff --git a/data/empathy.convert b/data/empathy.convert
index 71353248ac316b0625a3b93c94adc7d259217ab1..b6a1d2d3aad60a0bf58fdd0505f5805fc23903de 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
-butterfly-logs-migrated = /apps/empathy/butterfly_logs_migrated
 file-transfer-default-folder = /apps/empathy/file_transfer_default_folder
 
   

diff --git a/data/org.gnome.Empathy.gschema.xml.in b/data/org.gnome.Empathy.gschema.xml.in
index 972d734345393fa621cd3bfd370fe7946191b7f2..de57af80c97a192e21f7a20b1c331bb43f9de9b2 100644 (file)
--- a/data/org.gnome.Empathy.gschema.xml.in
+++ b/data/org.gnome.Empathy.gschema.xml.in
@@ -23,11 +23,6 @@
       <_summary>Empathy should auto-away when idle</_summary>
       <_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>
-      <_summary>Empathy has migrated butterfly logs</_summary>
-      <_description>Whether Empathy has migrated butterfly logs.</_description>
-    </key>
     <key name="file-transfer-default-folder" type="s">
       <default>''</default>
       <_summary>Empathy default download folder</_summary>

diff --git a/libempathy/empathy-gsettings.h b/libempathy/empathy-gsettings.h
index 995eaaaa711503f50114fa9ce27b78c0cdbe73b9..fb44b5893d12011f298b3d743681e0c519f28de9 100644 (file)
--- a/libempathy/empathy-gsettings.h
+++ b/libempathy/empathy-gsettings.h
@@ -29,7 +29,6 @@ G_BEGIN_DECLS
 #define EMPATHY_PREFS_USE_CONN                     "use-conn"
 #define EMPATHY_PREFS_AUTOCONNECT                  "autoconnect"
 #define EMPATHY_PREFS_AUTOAWAY                     "autoaway"
-#define EMPATHY_PREFS_BUTTERFLY_LOGS_MIGRATED      "butterfly-logs-migrated"
 #define EMPATHY_PREFS_FILE_TRANSFER_DEFAULT_FOLDER "file-transfer-default-folder"
 
 #define EMPATHY_PREFS_NOTIFICATIONS_SCHEMA EMPATHY_PREFS_SCHEMA ".notifications"