aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-06-24 17:52:45 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-06-24 18:11:08 +0800
commit17460b3291e61861ed56cbb5d5867d910297da58 (patch)
treeb93b79c25b55c9d59faf5ff8c3a1200fbc5eba4f /src
parent45ca662701afa1fd92d26c587e56b6e1ade16e83 (diff)
downloadgsoc2013-empathy-17460b3291e61861ed56cbb5d5867d910297da58.tar
gsoc2013-empathy-17460b3291e61861ed56cbb5d5867d910297da58.tar.gz
gsoc2013-empathy-17460b3291e61861ed56cbb5d5867d910297da58.tar.bz2
gsoc2013-empathy-17460b3291e61861ed56cbb5d5867d910297da58.tar.lz
gsoc2013-empathy-17460b3291e61861ed56cbb5d5867d910297da58.tar.xz
gsoc2013-empathy-17460b3291e61861ed56cbb5d5867d910297da58.tar.zst
gsoc2013-empathy-17460b3291e61861ed56cbb5d5867d910297da58.zip
stop importing MC4 accounts
Diffstat (limited to 'src')
-rw-r--r--src/empathy-accounts-common.c13
-rw-r--r--src/empathy-accounts.c33
-rw-r--r--src/empathy.c7
3 files changed, 3 insertions, 50 deletions
diff --git a/src/empathy-accounts-common.c b/src/empathy-accounts-common.c
index a214f284a..a14a95c59 100644
--- a/src/empathy-accounts-common.c
+++ b/src/empathy-accounts-common.c
@@ -43,7 +43,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
@@ -84,18 +83,6 @@ empathy_accounts_has_accounts (TpAccountManager *manager)
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,
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
@@ -89,25 +88,6 @@ maybe_show_accounts_ui (TpAccountManager *manager)
}
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,
gpointer user_data)
@@ -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);
}
}
diff --git a/src/empathy.c b/src/empathy.c
index e1b6528eb..f700c5fbd 100644
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -64,7 +64,6 @@
#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"
@@ -363,10 +362,8 @@ account_manager_ready_cb (GObject *source_object,
/* 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);