From 5303e17a0d7389aad4263346a1e9cee2b08eaba4 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Mon, 16 Feb 2009 00:06:35 +0100 Subject: [PATCH] Keep a ref to all TpConnection objects. Map account<>connection. --- libempathy/empathy-account-manager.c | 149 +++++++++++++++++++++++++++ libempathy/empathy-account-manager.h | 10 ++ 2 files changed, 159 insertions(+) diff --git a/libempathy/empathy-account-manager.c b/libempathy/empathy-account-manager.c index 5962a867..9fc6786d 100644 --- a/libempathy/empathy-account-manager.c +++ b/libempathy/empathy-account-manager.c @@ -26,6 +26,9 @@ #include "empathy-marshal.h" #include "empathy-utils.h" +#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT +#include + #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyAccountManager) typedef struct { @@ -33,12 +36,14 @@ typedef struct { MissionControl *mc; GHashTable *accounts; + GHashTable *connections; int connected; int connecting; gboolean dispose_run; } EmpathyAccountManagerPriv; typedef struct { + TpConnection *connection; McPresence presence; TpConnectionStatus status; gboolean is_enabled; @@ -54,6 +59,7 @@ enum { ACCOUNT_CHANGED, ACCOUNT_CONNECTION_CHANGED, ACCOUNT_PRESENCE_CHANGED, + NEW_CONNECTION, LAST_SIGNAL }; @@ -104,6 +110,25 @@ account_data_new_default (MissionControl *mc, return account_data_new (actual_p, actual_c, mc_account_is_enabled (account)); } +static void +connection_invalidated_cb (TpProxy *connection, + guint domain, + gint code, + gchar *message, + EmpathyAccountManager *manager) +{ + EmpathyAccountManagerPriv *priv = GET_PRIV (manager); + McAccount *account; + AccountData *data; + + DEBUG ("Message: %s", message); + account = g_hash_table_lookup (priv->connections, connection); + data = g_hash_table_lookup (priv->accounts, account); + g_object_unref (data->connection); + data->connection = NULL; + g_hash_table_remove (priv->connections, connection); +} + static void account_data_free (AccountData *data) { @@ -112,6 +137,11 @@ account_data_free (AccountData *data) g_source_remove (data->source_id); data->source_id = 0; } + if (data->connection != NULL) + { + g_object_unref (data->connection); + data->connection = NULL; + } g_slice_free (AccountData, data); } @@ -269,6 +299,18 @@ remove_data_timeout (gpointer _data) return FALSE; } +static void +connection_ready_cb (TpConnection *connection, + const GError *error, + gpointer manager) +{ + /* Errors will be handled in invalidated callback */ + if (error != NULL) + return; + + g_signal_emit (manager, signals[NEW_CONNECTION], 0, connection); +} + typedef struct { TpConnectionStatus status; McPresence presence; @@ -325,6 +367,21 @@ account_status_changed_idle_cb (ChangedSignalData *signal_data) emit_connection = TRUE; } + if (data->connection == NULL) + { + data->connection = mission_control_get_tpconnection (priv->mc, + account, NULL); + if (data->connection != NULL) + { + g_signal_connect (data->connection, "invalidated", + G_CALLBACK (connection_invalidated_cb), manager); + g_hash_table_insert (priv->connections, + g_object_ref (data->connection), g_object_ref (account)); + tp_connection_call_when_ready (data->connection, + connection_ready_cb, manager); + } + } + if (emit_presence) g_signal_emit (manager, signals[ACCOUNT_PRESENCE_CHANGED], 0, account, presence, old_p); @@ -381,6 +438,8 @@ empathy_account_manager_init (EmpathyAccountManager *manager) empathy_account_equal, g_object_unref, (GDestroyNotify) account_data_free); + priv->connections = g_hash_table_new_full (g_direct_hash, g_direct_equal, + g_object_unref, g_object_unref); mc_accounts = mc_accounts_list (); @@ -412,6 +471,7 @@ do_finalize (GObject *obj) EmpathyAccountManagerPriv *priv = GET_PRIV (manager); g_hash_table_unref (priv->accounts); + g_hash_table_unref (priv->connections); G_OBJECT_CLASS (empathy_account_manager_parent_class)->finalize (obj); } @@ -562,6 +622,16 @@ empathy_account_manager_class_init (EmpathyAccountManagerClass *klass) 3, MC_TYPE_ACCOUNT, G_TYPE_INT, /* actual presence */ G_TYPE_INT); /* previous presence */ + + signals[NEW_CONNECTION] = + g_signal_new ("new-connection", + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST, + 0, + NULL, NULL, + g_cclosure_marshal_VOID__OBJECT, + G_TYPE_NONE, + 1, TP_TYPE_CONNECTION); g_type_class_add_private (oclass, sizeof (EmpathyAccountManagerPriv)); } @@ -634,3 +704,82 @@ empathy_account_manager_get_count (EmpathyAccountManager *manager) return g_hash_table_size (priv->accounts); } + +McAccount * +empathy_account_manager_get_account (EmpathyAccountManager *manager, + TpConnection *connection) +{ + EmpathyAccountManagerPriv *priv; + + g_return_val_if_fail (EMPATHY_IS_ACCOUNT_MANAGER (manager), 0); + + priv = GET_PRIV (manager); + + return g_hash_table_lookup (priv->connections, connection); +} + +GList * +empathy_account_manager_dup_accounts (EmpathyAccountManager *manager) +{ + EmpathyAccountManagerPriv *priv; + GList *ret; + + g_return_val_if_fail (EMPATHY_IS_ACCOUNT_MANAGER (manager), NULL); + + priv = GET_PRIV (manager); + + ret = g_hash_table_get_keys (priv->accounts); + g_list_foreach (ret, (GFunc) g_object_ref, NULL); + + return ret; +} + +/** + * empathy_account_manager_get_connection: + * @manager: a #EmpathyAccountManager + * @account: a #McAccount + * + * Get the connection of the accounts, or NULL if account is offline or the + * connection is not yet ready. + * + * Returns: the connection of the accounts. + **/ +TpConnection * +empathy_account_manager_get_connection (EmpathyAccountManager *manager, + McAccount *account) +{ + EmpathyAccountManagerPriv *priv; + AccountData *data; + + g_return_val_if_fail (EMPATHY_IS_ACCOUNT_MANAGER (manager), NULL); + g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL); + + priv = GET_PRIV (manager); + + data = g_hash_table_lookup (priv->accounts, account); + if (data && data->connection && tp_connection_is_ready (data->connection)) + return data->connection; + + return NULL; +} + +GList * +empathy_account_manager_dup_connections (EmpathyAccountManager *manager) +{ + EmpathyAccountManagerPriv *priv; + GHashTableIter iter; + gpointer connection; + GList *ret = NULL; + + g_return_val_if_fail (EMPATHY_IS_ACCOUNT_MANAGER (manager), NULL); + + priv = GET_PRIV (manager); + + g_hash_table_iter_init (&iter, priv->connections); + while (g_hash_table_iter_next (&iter, &connection, NULL)) + if (connection != NULL && tp_connection_is_ready (connection)) + ret = g_list_prepend (ret, g_object_ref (connection)); + + return ret; +} + diff --git a/libempathy/empathy-account-manager.h b/libempathy/empathy-account-manager.h index b9aecb09..ac90a34f 100644 --- a/libempathy/empathy-account-manager.h +++ b/libempathy/empathy-account-manager.h @@ -61,6 +61,16 @@ gboolean empathy_account_manager_is_account_just_connected McAccount *account); int empathy_account_manager_get_count (EmpathyAccountManager *manager); +McAccount * empathy_account_manager_get_account + (EmpathyAccountManager *manager, + TpConnection *connection); +GList * empathy_account_manager_dup_accounts + (EmpathyAccountManager *manager); +TpConnection * empathy_account_manager_get_connection + (EmpathyAccountManager *manager, + McAccount *account); +GList * empathy_account_manager_dup_connections + (EmpathyAccountManager *manager); G_END_DECLS -- 2.39.2