diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-06-24 17:52:45 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-06-24 18:11:08 +0800 |
| commit | 17460b3291e61861ed56cbb5d5867d910297da58 (patch) | |
| tree | b93b79c25b55c9d59faf5ff8c3a1200fbc5eba4f /src/empathy.c | |
| parent | 45ca662701afa1fd92d26c587e56b6e1ade16e83 (diff) | |
| download | gsoc2013-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/empathy.c')
| -rw-r--r-- | src/empathy.c | 7 |
1 files changed, 2 insertions, 5 deletions
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); |