diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-09-23 00:26:37 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-09-26 18:25:04 +0800 |
| commit | 3a459b35bd5b7a29b308d729fe82b203f777b99f (patch) | |
| tree | 556acb85fbc91ac19d39699e8d97260f7f4aba3a | |
| parent | 38e4f668b25cefbdc161f9c17f61a904c67c0c79 (diff) | |
| download | gsoc2013-empathy-3a459b35bd5b7a29b308d729fe82b203f777b99f.tar gsoc2013-empathy-3a459b35bd5b7a29b308d729fe82b203f777b99f.tar.gz gsoc2013-empathy-3a459b35bd5b7a29b308d729fe82b203f777b99f.tar.bz2 gsoc2013-empathy-3a459b35bd5b7a29b308d729fe82b203f777b99f.tar.lz gsoc2013-empathy-3a459b35bd5b7a29b308d729fe82b203f777b99f.tar.xz gsoc2013-empathy-3a459b35bd5b7a29b308d729fe82b203f777b99f.tar.zst gsoc2013-empathy-3a459b35bd5b7a29b308d729fe82b203f777b99f.zip | |
remove butterfly-logs-migrated gsettings key
https://bugzilla.gnome.org/show_bug.cgi?id=612555
| -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 71353248a..b6a1d2d3a 100644 --- 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 972d73434..de57af80c 100644 --- 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 995eaaaa7..fb44b5893 100644 --- 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" |