From 17460b3291e61861ed56cbb5d5867d910297da58 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Thu, 24 Jun 2010 11:52:45 +0200 Subject: stop importing MC4 accounts --- src/empathy-accounts.c | 33 +-------------------------------- 1 file changed, 1 insertion(+), 32 deletions(-) (limited to 'src/empathy-accounts.c') diff --git a/src/empathy-accounts.c b/src/empathy-accounts.c index 62fcaa0e8..89c304bff 100644 --- a/src/empathy-accounts.c +++ b/src/empathy-accounts.c @@ -45,7 +45,6 @@ #include "empathy-accounts-common.h" #include "empathy-accounts-dialog.h" #include "empathy-account-assistant.h" -#include "empathy-import-mc4-accounts.h" #include "empathy-auto-salut-account-helper.h" #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT @@ -88,25 +87,6 @@ maybe_show_accounts_ui (TpAccountManager *manager) empathy_accounts_show_accounts_ui (manager, NULL, gtk_main_quit); } -static void -cm_manager_prepared_cb (GObject *source, - GAsyncResult *result, - gpointer user_data) -{ - if (!empathy_connection_managers_prepare_finish ( - EMPATHY_CONNECTION_MANAGERS (source), result, NULL)) - { - g_warning ("Failed to prepare connection managers singleton"); - gtk_main_quit (); - return; - } - - empathy_accounts_import (TP_ACCOUNT_MANAGER (user_data), - EMPATHY_CONNECTION_MANAGERS (source)); - - maybe_show_accounts_ui (TP_ACCOUNT_MANAGER (user_data)); -} - static void account_manager_ready_for_accounts_cb (GObject *source_object, GAsyncResult *result, @@ -151,18 +131,7 @@ account_manager_ready_for_accounts_cb (GObject *source_object, } else { - if (empathy_import_mc4_has_imported ()) - { - maybe_show_accounts_ui (manager); - } - else - { - EmpathyConnectionManagers *cm_mgr = - empathy_connection_managers_dup_singleton (); - - empathy_connection_managers_prepare_async ( - cm_mgr, cm_manager_prepared_cb, manager); - } + maybe_show_accounts_ui (manager); } } -- cgit v1.2.3