diff options
| author | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2010-10-18 06:14:11 +0800 |
|---|---|---|
| committer | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2010-10-18 06:14:11 +0800 |
| commit | 643dc00f6a6e60f1dae91647301505169e8c7791 (patch) | |
| tree | 27ccb1cdb5e3ea31b505320dc7ef3486a8641df9 /libempathy | |
| parent | 2a7871af19764420ad2fa78dfa97dca517a130da (diff) | |
| parent | 53ca6d2ca5de5401e55171bc71a3d75cc7e18fb8 (diff) | |
| download | gsoc2013-empathy-643dc00f6a6e60f1dae91647301505169e8c7791.tar gsoc2013-empathy-643dc00f6a6e60f1dae91647301505169e8c7791.tar.gz gsoc2013-empathy-643dc00f6a6e60f1dae91647301505169e8c7791.tar.bz2 gsoc2013-empathy-643dc00f6a6e60f1dae91647301505169e8c7791.tar.lz gsoc2013-empathy-643dc00f6a6e60f1dae91647301505169e8c7791.tar.xz gsoc2013-empathy-643dc00f6a6e60f1dae91647301505169e8c7791.tar.zst gsoc2013-empathy-643dc00f6a6e60f1dae91647301505169e8c7791.zip | |
Merge branch 'external-accounts'
Diffstat (limited to 'libempathy')
| -rw-r--r-- | libempathy/empathy-account-settings.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/libempathy/empathy-account-settings.c b/libempathy/empathy-account-settings.c index 1e63aede9..e5191a96c 100644 --- a/libempathy/empathy-account-settings.c +++ b/libempathy/empathy-account-settings.c @@ -221,7 +221,12 @@ empathy_account_settings_constructed (GObject *object) if (!priv->ready) { - tp_account_prepare_async (priv->account, NULL, + GQuark features[] = { + TP_ACCOUNT_FEATURE_CORE, + TP_ACCOUNT_FEATURE_STORAGE, + 0 }; + + tp_proxy_prepare_async (priv->account, features, empathy_account_settings_account_ready_cb, self); tp_g_signal_connect_object (priv->managers, "notify::ready", G_CALLBACK (empathy_account_settings_managers_ready_cb), object, 0); @@ -450,7 +455,7 @@ empathy_account_settings_account_ready_cb (GObject *source_object, TpAccount *account = TP_ACCOUNT (source_object); GError *error = NULL; - if (!tp_account_prepare_finish (account, result, &error)) + if (!tp_proxy_prepare_finish (account, result, &error)) { DEBUG ("Failed to prepare account: %s", error->message); g_error_free (error); |