From 36e8870de17b9dffab299e3f4f099a10db6e67af Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Fri, 1 Oct 2010 12:01:41 +0200 Subject: remove 'import-asked' gsettings key --- data/empathy.convert | 1 - data/org.gnome.Empathy.gschema.xml.in | 5 ----- libempathy/empathy-gsettings.h | 1 - 3 files changed, 7 deletions(-) diff --git a/data/empathy.convert b/data/empathy.convert index 02ef97137..71353248a 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 -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..f889adf95 100644 --- a/data/org.gnome.Empathy.gschema.xml.in +++ b/data/org.gnome.Empathy.gschema.xml.in @@ -15,11 +15,6 @@ <_summary>Empathy should auto-away when idle <_description>Whether Empathy should go into away mode automatically if the user is idle. - - false - <_summary>Empathy has asked about importing accounts - <_description>Whether Empathy has asked about importing accounts from other programs. - false <_summary>Empathy has migrated butterfly logs diff --git a/libempathy/empathy-gsettings.h b/libempathy/empathy-gsettings.h index 21d08ed5d..aba78c880 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_IMPORT_ASKED "import-asked" #define EMPATHY_PREFS_BUTTERFLY_LOGS_MIGRATED "butterfly-logs-migrated" #define EMPATHY_PREFS_FILE_TRANSFER_DEFAULT_FOLDER "file-transfer-default-folder" -- cgit v1.2.3