remove the salut_created gconf key (#611817)

4 files changed, 0 insertions, 41 deletions

diff --git a/data/empathy.schemas.in b/data/empathy.schemas.in
index a99fbfd8b..0a6b4f118 100644
--- a/data/empathy.schemas.in
+++ b/data/empathy.schemas.in
@@ -479,21 +479,6 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/empathy/accounts/salut_created</key>
-      <applyto>/apps/empathy/accounts/salut_created</applyto>
-      <owner>empathy</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-        <short>Salut account is created</short>
-        <long>
-        Whether the Salut account has been created on the first
-      Empathy run.
-        </long>
-      </locale>
-    </schema>
-
-    <schema>
       <key>/schemas/apps/empathy/accounts/imported_mc4_accounts</key>
       <applyto>/apps/empathy/accounts/imported_mc4_accounts</applyto>
       <owner>empathy</owner>
diff --git a/libempathy-gtk/empathy-conf.h b/libempathy-gtk/empathy-conf.h
index 551627364..2a74c1da5 100644
--- a/libempathy-gtk/empathy-conf.h
+++ b/libempathy-gtk/empathy-conf.h
@@ -79,7 +79,6 @@ struct _EmpathyConfClass {
 #define EMPATHY_PREFS_CONTACTS_SHOW_OFFLINE        EMPATHY_PREFS_PATH "/contacts/show_offline"
 #define EMPATHY_PREFS_CONTACTS_SORT_CRITERIUM      EMPATHY_PREFS_PATH "/contacts/sort_criterium"
 #define EMPATHY_PREFS_HINTS_CLOSE_MAIN_WINDOW      EMPATHY_PREFS_PATH "/hints/close_main_window"
-#define EMPATHY_PREFS_SALUT_ACCOUNT_CREATED        EMPATHY_PREFS_PATH "/accounts/salut_created"
 #define EMPATHY_PREFS_USE_CONN                     EMPATHY_PREFS_PATH "/use_conn"
 #define EMPATHY_PREFS_AUTOCONNECT                  EMPATHY_PREFS_PATH "/autoconnect"
 #define EMPATHY_PREFS_IMPORT_ASKED                 EMPATHY_PREFS_PATH "/import_asked"
diff --git a/src/empathy-account-assistant.c b/src/empathy-account-assistant.c
index c944ccc98..089b11f64 100644
--- a/src/empathy-account-assistant.c
+++ b/src/empathy-account-assistant.c
@@ -291,12 +291,6 @@ account_assistant_account_enabled_cb (GObject *source,
   protocol = tp_account_get_protocol (account);
   if (!tp_strdiff (protocol, "local-xmpp"))
     {
-      DEBUG ("Salut account has been created; update gconf key");
-
-      empathy_conf_set_bool (empathy_conf_get (),
-          EMPATHY_PREFS_SALUT_ACCOUNT_CREATED,
-          TRUE);
-
       salut_created = TRUE;
     }
 
diff --git a/src/empathy-auto-salut-account-helper.c b/src/empathy-auto-salut-account-helper.c
index ad4d6cbc0..37aedb325 100644
--- a/src/empathy-auto-salut-account-helper.c
+++ b/src/empathy-auto-salut-account-helper.c
@@ -42,17 +42,6 @@ should_create_salut_account (TpAccountManager *manager)
   gboolean salut_created = FALSE;
   GList *accounts, *l;
 
-  /* Check if we already created a salut account */
-  empathy_conf_get_bool (empathy_conf_get (),
-      EMPATHY_PREFS_SALUT_ACCOUNT_CREATED,
-      &salut_created);
-
-  if (salut_created)
-    {
-      DEBUG ("Gconf says we already created a salut account once");
-      return FALSE;
-    }
-
   accounts = tp_account_manager_get_valid_accounts (manager);
 
   for (l = accounts; l != NULL;  l = g_list_next (l))
@@ -68,14 +57,6 @@ should_create_salut_account (TpAccountManager *manager)
 
   g_list_free (accounts);
 
-  if (salut_created)
-    {
-      DEBUG ("Existing salut account already exists, flagging so in gconf");
-      empathy_conf_set_bool (empathy_conf_get (),
-          EMPATHY_PREFS_SALUT_ACCOUNT_CREATED,
-          TRUE);
-    }
-
   return !salut_created;
 }