diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-09-22 18:26:37 +0200 |
|---|---|---|
| committer | Jonny Lamb <jonnylamb@gnome.org> | 2010-09-22 18:29:52 +0100 |
| commit | 05c35b634db58c7833b97bc8afe599a32fbf32cb (patch) | |
| tree | dea413b0d04d52b017d360b37507cb6bca48e179 | |
| parent | 826c11c0c10a662945cb6e971fa4537bcd404804 (diff) | |
remove butterfly-logs-migrated gsettings keybutterfly
| -rw-r--r-- | data/empathy.convert | 1 | ||||
| -rw-r--r-- | data/org.gnome.Empathy.gschema.xml.in | 5 | ||||
| -rw-r--r-- | libempathy/empathy-gsettings.h | 1 |
3 files changed, 0 insertions, 7 deletions
diff --git a/data/empathy.convert b/data/empathy.convert index 02ef97137..08550fb2d 100644 --- a/data/empathy.convert +++ b/data/empathy.convert @@ -5,7 +5,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 diff --git a/data/org.gnome.Empathy.gschema.xml.in b/data/org.gnome.Empathy.gschema.xml.in index 27a8cb375..1e7f2b19b4 100644 --- a/data/org.gnome.Empathy.gschema.xml.in +++ b/data/org.gnome.Empathy.gschema.xml.in @@ -20,11 +20,6 @@ <_summary>Empathy has asked about importing accounts</_summary> <_description>Whether Empathy has asked about importing accounts from other programs.</_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 21d08ed5d..cb7a08782 100644 --- a/libempathy/empathy-gsettings.h +++ b/libempathy/empathy-gsettings.h @@ -30,7 +30,6 @@ G_BEGIN_DECLS #define EMPATHY_PREFS_AUTOCONNECT "autoconnect" #define EMPATHY_PREFS_AUTOAWAY "autoaway" #define EMPATHY_PREFS_IMPORT_ASKED "import-asked" -#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" |