remove the salut_created gconf key (#611817)

2 files changed, 0 insertions, 25 deletions

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;
 }