diff options
author | Jonny Lamb <jonnylamb@gnome.org> | 2010-12-08 17:32:06 +0800 |
---|---|---|
committer | Jonny Lamb <jonnylamb@gnome.org> | 2011-01-26 21:30:58 +0800 |
commit | baa5833e00509339a9c650d1f09db9932aa6a6cb (patch) | |
tree | d98ede7b778ed6701a2022da255a149ef50e77d3 /libempathy/empathy-account-settings.c | |
parent | 09b0b0823b06c9d5411fe930e7d05e158ae0a2b8 (diff) | |
download | gsoc2013-empathy-baa5833e00509339a9c650d1f09db9932aa6a6cb.tar gsoc2013-empathy-baa5833e00509339a9c650d1f09db9932aa6a6cb.tar.gz gsoc2013-empathy-baa5833e00509339a9c650d1f09db9932aa6a6cb.tar.bz2 gsoc2013-empathy-baa5833e00509339a9c650d1f09db9932aa6a6cb.tar.lz gsoc2013-empathy-baa5833e00509339a9c650d1f09db9932aa6a6cb.tar.xz gsoc2013-empathy-baa5833e00509339a9c650d1f09db9932aa6a6cb.tar.zst gsoc2013-empathy-baa5833e00509339a9c650d1f09db9932aa6a6cb.zip |
account-settings: store the TpProtocol object and notify::ready when it's prepared
Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>
Diffstat (limited to 'libempathy/empathy-account-settings.c')
-rw-r--r-- | libempathy/empathy-account-settings.c | 50 |
1 files changed, 47 insertions, 3 deletions
diff --git a/libempathy/empathy-account-settings.c b/libempathy/empathy-account-settings.c index 1278bb441..6e32568c5 100644 --- a/libempathy/empathy-account-settings.c +++ b/libempathy/empathy-account-settings.c @@ -58,6 +58,7 @@ struct _EmpathyAccountSettingsPriv TpAccountManager *account_manager; TpConnectionManager *manager; + TpProtocol *protocol_obj; TpAccount *account; gchar *cm_name; @@ -72,6 +73,7 @@ struct _EmpathyAccountSettingsPriv GArray *required_params; gulong managers_ready_id; + gboolean preparing_protocol; GSimpleAsyncResult *apply_result; }; @@ -302,6 +304,10 @@ empathy_account_settings_dispose (GObject *object) g_object_unref (priv->account); priv->account = NULL; + if (priv->protocol_obj != NULL) + g_object_unref (priv->protocol_obj); + priv->protocol_obj = NULL; + /* release any references held by the object here */ if (G_OBJECT_CLASS (empathy_account_settings_parent_class)->dispose) G_OBJECT_CLASS (empathy_account_settings_parent_class)->dispose (object); @@ -344,10 +350,29 @@ empathy_account_settings_finalize (GObject *object) } static void +empathy_account_settings_protocol_obj_prepared_cb (GObject *source, + GAsyncResult *result, + gpointer user_data) +{ + EmpathyAccountSettings *self = user_data; + GError *error = NULL; + + if (!tp_proxy_prepare_finish (source, result, &error)) + { + DEBUG ("Failed to prepare protocol object: %s", error->message); + g_clear_error (&error); + return; + } + + empathy_account_settings_check_readyness (self); +} + +static void empathy_account_settings_check_readyness (EmpathyAccountSettings *self) { EmpathyAccountSettingsPriv *priv = GET_PRIV (self); const TpConnectionManagerProtocol *tp_protocol; + GQuark features[] = { TP_PROTOCOL_FEATURE_CORE, 0 }; if (priv->ready) return; @@ -359,12 +384,17 @@ empathy_account_settings_check_readyness (EmpathyAccountSettings *self) if (!empathy_connection_managers_is_ready (priv->managers)) return; - priv->manager = empathy_connection_managers_get_cm ( - priv->managers, priv->cm_name); + if (priv->manager == NULL) + { + priv->manager = empathy_connection_managers_get_cm ( + priv->managers, priv->cm_name); + } if (priv->manager == NULL) return; + g_object_ref (priv->manager); + if (priv->account != NULL) { g_free (priv->display_name); @@ -402,7 +432,21 @@ empathy_account_settings_check_readyness (EmpathyAccountSettings *self) } } - g_object_ref (priv->manager); + if (priv->protocol_obj == NULL) + { + priv->protocol_obj = g_object_ref ( + tp_connection_manager_get_protocol_object (priv->manager, + priv->protocol)); + } + + if (!tp_proxy_is_prepared (priv->protocol_obj, TP_PROTOCOL_FEATURE_CORE) + && !priv->preparing_protocol) + { + priv->preparing_protocol = TRUE; + tp_proxy_prepare_async (priv->protocol_obj, features, + empathy_account_settings_protocol_obj_prepared_cb, self); + return; + } priv->ready = TRUE; g_object_notify (G_OBJECT (self), "ready"); |