#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
return has_accounts;
}
-void
-empathy_accounts_import (TpAccountManager *account_mgr,
- EmpathyConnectionManagers *cm_mgr)
-{
- 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));
-
- if (!empathy_import_mc4_has_imported ())
- empathy_import_mc4_accounts (cm_mgr);
-}
-
static void
do_show_accounts_ui (TpAccountManager *manager,
TpAccount *account,
#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
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,
}
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);
}
}
#include <libempathy-gtk/empathy-location-manager.h>
#include "empathy-main-window.h"
-#include "empathy-import-mc4-accounts.h"
#include "empathy-accounts-common.h"
#include "empathy-accounts-dialog.h"
#include "empathy-chat-manager.h"
/* if current state is Offline, then put it online */
empathy_idle_set_state (idle, TP_CONNECTION_PRESENCE_TYPE_AVAILABLE);
- /* Pop up the accounts dialog if it's needed (either when we don't have any
- * accounts yet or when we haven't imported mc4 accounts yet */
- if (!empathy_accounts_has_accounts (manager)
- || !empathy_import_mc4_has_imported ())
+ /* Pop up the accounts dialog if we don't have any account */
+ if (!empathy_accounts_has_accounts (manager))
show_accounts_ui (gdk_screen_get_default (), TRUE);
g_object_unref (idle);