aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd.simons@collabora.co.uk>2010-03-02 03:01:54 +0800
committerSjoerd Simons <sjoerd.simons@collabora.co.uk>2010-03-02 03:01:54 +0800
commit7210d151056d3c0a1b0469f7af1aee06b7805538 (patch)
tree2859c8449ad012019bad4e681959d0018fc4387c /src
parentb0de7c5d5d8c93dd7b74a77b4892c331f37f5441 (diff)
downloadgsoc2013-empathy-7210d151056d3c0a1b0469f7af1aee06b7805538.tar
gsoc2013-empathy-7210d151056d3c0a1b0469f7af1aee06b7805538.tar.gz
gsoc2013-empathy-7210d151056d3c0a1b0469f7af1aee06b7805538.tar.bz2
gsoc2013-empathy-7210d151056d3c0a1b0469f7af1aee06b7805538.tar.lz
gsoc2013-empathy-7210d151056d3c0a1b0469f7af1aee06b7805538.tar.xz
gsoc2013-empathy-7210d151056d3c0a1b0469f7af1aee06b7805538.tar.zst
gsoc2013-empathy-7210d151056d3c0a1b0469f7af1aee06b7805538.zip
Simplify empathy_accounts_import
Diffstat (limited to 'src')
-rw-r--r--src/empathy-accounts-common.c25
-rw-r--r--src/empathy-accounts-common.h2
2 files changed, 7 insertions, 20 deletions
diff --git a/src/empathy-accounts-common.c b/src/empathy-accounts-common.c
index ff9c8c438..3032e065e 100644
--- a/src/empathy-accounts-common.c
+++ b/src/empathy-accounts-common.c
@@ -71,29 +71,16 @@ empathy_accounts_has_non_salut_accounts (TpAccountManager *manager)
return ret;
}
-/* Try to import accounts from MC4 and returns TRUE if we should display the
- * accounts assistant. */
-gboolean
+void
empathy_accounts_import (TpAccountManager *account_mgr,
EmpathyConnectionManagers *cm_mgr)
{
- g_return_val_if_fail (tp_account_manager_is_prepared (account_mgr,
- TP_ACCOUNT_MANAGER_FEATURE_CORE), FALSE);
- g_return_val_if_fail (empathy_connection_managers_is_ready (cm_mgr), FALSE);
-
- if (empathy_import_mc4_has_imported ())
- return FALSE;
-
- if (empathy_import_mc4_accounts (cm_mgr))
- return FALSE;
-
- if (empathy_accounts_has_non_salut_accounts (account_mgr))
- return FALSE;
-
- if (!should_create_salut_account (account_mgr))
- return FALSE;
+ g_return_if_fail (tp_account_manager_is_prepared (account_mgr,
+ TP_ACCOUNT_MANAGER_FEATURE_CORE));
+ g_return_if_fail (empathy_connection_managers_is_ready (cm_mgr));
- return TRUE;
+ if (!empathy_import_mc4_has_imported ())
+ empathy_import_mc4_accounts (cm_mgr);
}
static void
diff --git a/src/empathy-accounts-common.h b/src/empathy-accounts-common.h
index c8e5c654c..2bd51bf0d 100644
--- a/src/empathy-accounts-common.h
+++ b/src/empathy-accounts-common.h
@@ -28,7 +28,7 @@ void empathy_accounts_show_accounts_ui (TpAccountManager *manager,
TpAccount *account,
GCallback window_destroyed_cb);
-gboolean empathy_accounts_import (TpAccountManager *account_mgr,
+void empathy_accounts_import (TpAccountManager *account_mgr,
EmpathyConnectionManagers *cm_mgr);