#include "empathy-marshal.h"
#include "empathy-utils.h"
+#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
+#include <libempathy/empathy-debug.h>
+
#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyAccountManager)
typedef struct {
MissionControl *mc;
GHashTable *accounts;
+ GHashTable *connections;
int connected;
int connecting;
gboolean dispose_run;
} EmpathyAccountManagerPriv;
typedef struct {
+ TpConnection *connection;
McPresence presence;
- TpConnectionStatus connection;
+ TpConnectionStatus status;
gboolean is_enabled;
guint source_id;
ACCOUNT_CHANGED,
ACCOUNT_CONNECTION_CHANGED,
ACCOUNT_PRESENCE_CHANGED,
+ NEW_CONNECTION,
LAST_SIGNAL
};
static AccountData *
account_data_new (McPresence presence,
- TpConnectionStatus connection,
+ TpConnectionStatus status,
gboolean is_enabled)
{
AccountData *retval;
retval = g_slice_new0 (AccountData);
retval->presence = presence;
- retval->connection = connection;
+ retval->status = status;
retval->is_enabled = is_enabled;
retval->source_id = 0;
actual_c = mission_control_get_connection_status (mc, account, &err);
if (err != NULL)
- actual_c = TP_CONNECTION_STATUS_DISCONNECTED;
+ {
+ actual_c = TP_CONNECTION_STATUS_DISCONNECTED;
+ g_error_free (err);
+ }
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)
{
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);
}
{
McAccount *account;
EmpathyAccountManagerPriv *priv = GET_PRIV (manager);
+ TpConnectionStatus initial_status;
account = mc_account_lookup (account_name);
data = account_data_new_default (priv->mc, account);
+ initial_status = mission_control_get_connection_status (priv->mc,
+ account, NULL);
+
+ if (initial_status == TP_CONNECTION_STATUS_CONNECTED)
+ priv->connected++;
+ else if (initial_status == TP_CONNECTION_STATUS_CONNECTING)
+ priv->connecting++;
+
+ /* the reference returned by mc_account_lookup is owned by the
+ * hash table.
+ */
g_hash_table_insert (priv->accounts, account, data);
g_signal_emit (manager, signals[ACCOUNT_CREATED], 0, account);
if (account)
{
- g_signal_emit (manager, signals[ACCOUNT_DELETED], 0, account);
-
g_hash_table_remove (priv->accounts, account);
+ g_signal_emit (manager, signals[ACCOUNT_DELETED], 0, account);
g_object_unref (account);
}
}
data->is_enabled = FALSE;
g_signal_emit (manager, signals[ACCOUNT_DISABLED], 0, account);
+ g_object_unref (account);
}
}
static void
update_connection_numbers (EmpathyAccountManager *manager,
- TpConnectionStatus conn,
- TpConnectionStatus old_c)
+ TpConnectionStatus status,
+ TpConnectionStatus old_s)
{
EmpathyAccountManagerPriv *priv = GET_PRIV (manager);
- if (conn == TP_CONNECTION_STATUS_CONNECTED)
+ if (status == TP_CONNECTION_STATUS_CONNECTED)
{
priv->connected++;
- if (old_c == TP_CONNECTION_STATUS_CONNECTING)
+ if (old_s == TP_CONNECTION_STATUS_CONNECTING)
priv->connecting--;
}
- if (conn == TP_CONNECTION_STATUS_CONNECTING)
+ if (status == TP_CONNECTION_STATUS_CONNECTING)
{
priv->connecting++;
- if (old_c == TP_CONNECTION_STATUS_CONNECTED)
+ if (old_s == TP_CONNECTION_STATUS_CONNECTED)
priv->connected--;
}
- if (conn == TP_CONNECTION_STATUS_DISCONNECTED)
+ if (status == TP_CONNECTION_STATUS_DISCONNECTED)
{
- if (old_c == TP_CONNECTION_STATUS_CONNECTED)
+ if (old_s == TP_CONNECTION_STATUS_CONNECTED)
priv->connected--;
- if (old_c == TP_CONNECTION_STATUS_CONNECTING)
+ if (old_s == TP_CONNECTION_STATUS_CONNECTING)
priv->connecting--;
}
}
}
static void
-account_status_changed_cb (MissionControl *mc,
- TpConnectionStatus connection,
- McPresence presence,
- TpConnectionStatusReason reason,
- const gchar *unique_name,
- EmpathyAccountManager *manager)
+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;
+ TpConnectionStatusReason reason;
+ gchar *unique_name;
+ EmpathyAccountManager *manager;
+} ChangedSignalData;
+
+static gboolean
+account_status_changed_idle_cb (ChangedSignalData *signal_data)
{
McAccount *account;
- EmpathyAccountManagerPriv *priv = GET_PRIV (manager);
AccountData *data;
- McPresence old_p;
- TpConnectionStatus old_c;
+ McPresence presence, old_p;
+ TpConnectionStatus status, old_s;
gboolean emit_presence = FALSE, emit_connection = FALSE;
+ EmpathyAccountManager *manager = signal_data->manager;
+ EmpathyAccountManagerPriv *priv = GET_PRIV (manager);
- account = mc_account_lookup (unique_name);
+ presence = signal_data->presence;
+ status = signal_data->status;
+ account = mc_account_lookup (signal_data->unique_name);
if (account)
{
g_assert (data);
old_p = data->presence;
- old_c = data->connection;
+ old_s = data->status;
if (old_p != presence)
{
emit_presence = TRUE;
}
- if (old_c != connection)
+ if (old_s != status)
{
- data->connection = connection;
- update_connection_numbers (manager, connection, old_c);
+ data->status = status;
+ update_connection_numbers (manager, status, old_s);
- if (old_c == TP_CONNECTION_STATUS_CONNECTING &&
- connection == TP_CONNECTION_STATUS_CONNECTED)
+ if (status == TP_CONNECTION_STATUS_CONNECTED)
{
if (data->source_id > 0) {
g_source_remove (data->source_id);
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);
if (emit_connection)
g_signal_emit (manager, signals[ACCOUNT_CONNECTION_CHANGED], 0,
- account, reason, connection, old_c);
+ account, signal_data->reason, status, old_s);
g_object_unref (account);
}
+
+ g_object_unref (signal_data->manager);
+ g_free (signal_data->unique_name);
+ g_slice_free (ChangedSignalData, signal_data);
+
+ return FALSE;
+}
+
+static void
+account_status_changed_cb (MissionControl *mc,
+ TpConnectionStatus status,
+ McPresence presence,
+ TpConnectionStatusReason reason,
+ const gchar *unique_name,
+ EmpathyAccountManager *manager)
+{
+ ChangedSignalData *data;
+
+ data = g_slice_new0 (ChangedSignalData);
+ data->status = status;
+ data->presence = presence;
+ data->reason = reason;
+ data->unique_name = g_strdup (unique_name);
+ data->manager = g_object_ref (manager);
+
+ g_idle_add ((GSourceFunc) account_status_changed_idle_cb, data);
}
static void
empathy_account_manager_init (EmpathyAccountManager *manager)
{
- EmpathyAccountManagerPriv *priv =
- G_TYPE_INSTANCE_GET_PRIVATE (manager,
- EMPATHY_TYPE_ACCOUNT_MANAGER, EmpathyAccountManagerPriv);
+ EmpathyAccountManagerPriv *priv;
GList *mc_accounts, *l;
- AccountData *data;
+ priv = G_TYPE_INSTANCE_GET_PRIVATE (manager,
+ EMPATHY_TYPE_ACCOUNT_MANAGER, EmpathyAccountManagerPriv);
manager->priv = priv;
priv->monitor = mc_account_monitor_new ();
- priv->mc = empathy_mission_control_new ();
+ priv->mc = empathy_mission_control_dup_singleton ();
priv->connected = priv->connecting = 0;
priv->dispose_run = FALSE;
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 ();
for (l = mc_accounts; l; l = l->next)
- {
- data = account_data_new_default (priv->mc, l->data);
-
- /* no need to g_object_ref () the account here, as mc_accounts_list ()
- * already increases the refcount.
- */
- g_hash_table_insert (priv->accounts, l->data, data);
- }
+ account_created_cb (priv->monitor, (char *) mc_account_get_unique_name (l->data), manager);
g_signal_connect (priv->monitor, "account-created",
G_CALLBACK (account_created_cb), manager);
G_CALLBACK (account_status_changed_cb),
manager, NULL);
- g_list_free (mc_accounts);
-}
-
-static void
-disconnect_monitor_signals (McAccountMonitor *monitor,
- GObject *obj)
-{
- g_signal_handlers_disconnect_by_func (monitor,
- account_created_cb, obj);
- g_signal_handlers_disconnect_by_func (monitor,
- account_deleted_cb, obj);
- g_signal_handlers_disconnect_by_func (monitor,
- account_disabled_cb, obj);
- g_signal_handlers_disconnect_by_func (monitor,
- account_enabled_cb, obj);
- g_signal_handlers_disconnect_by_func (monitor,
- account_changed_cb, obj);
+ mc_accounts_list_free (mc_accounts);
}
static void
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);
}
G_CALLBACK (account_status_changed_cb),
obj);
- disconnect_monitor_signals (priv->monitor, obj);
-
if (priv->monitor)
{
+ g_signal_handlers_disconnect_by_func (priv->monitor,
+ account_created_cb, obj);
+ g_signal_handlers_disconnect_by_func (priv->monitor,
+ account_deleted_cb, obj);
+ g_signal_handlers_disconnect_by_func (priv->monitor,
+ account_disabled_cb, obj);
+ g_signal_handlers_disconnect_by_func (priv->monitor,
+ account_enabled_cb, obj);
+ g_signal_handlers_disconnect_by_func (priv->monitor,
+ account_changed_cb, obj);
g_object_unref (priv->monitor);
priv->monitor = NULL;
}
n_construct_params,
construct_params);
manager_singleton = EMPATHY_ACCOUNT_MANAGER (retval);
- }
+ g_object_add_weak_pointer (retval, (gpointer) &manager_singleton);
+ }
else
{
retval = g_object_ref (manager_singleton);
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));
}
/* public methods */
EmpathyAccountManager *
-empathy_account_manager_new (void)
+empathy_account_manager_dup_singleton (void)
{
return g_object_new (EMPATHY_TYPE_ACCOUNT_MANAGER, NULL);
}
{
EmpathyAccountManagerPriv *priv;
- g_assert (EMPATHY_IS_ACCOUNT_MANAGER (manager));
+ g_return_val_if_fail (EMPATHY_IS_ACCOUNT_MANAGER (manager), 0);
priv = GET_PRIV (manager);
{
EmpathyAccountManagerPriv *priv;
- g_assert (EMPATHY_IS_ACCOUNT_MANAGER (manager));
+ g_return_val_if_fail (EMPATHY_IS_ACCOUNT_MANAGER (manager), 0);
priv = GET_PRIV (manager);
EmpathyAccountManagerPriv *priv;
AccountData *data;
- g_assert (EMPATHY_IS_ACCOUNT_MANAGER (manager));
+ g_return_val_if_fail (EMPATHY_IS_ACCOUNT_MANAGER (manager), FALSE);
priv = GET_PRIV (manager);
data = g_hash_table_lookup (priv->accounts, account);
return (data->source_id > 0);
}
+/**
+ * empathy_account_manager_get_count:
+ * @manager: a #EmpathyAccountManager
+ *
+ * Get the number of accounts.
+ *
+ * Returns: the number of accounts.
+ **/
+int
+empathy_account_manager_get_count (EmpathyAccountManager *manager)
+{
+ EmpathyAccountManagerPriv *priv;
+
+ g_return_val_if_fail (EMPATHY_IS_ACCOUNT_MANAGER (manager), 0);
+
+ priv = GET_PRIV (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;
+}
+
projects / empathy.git / blobdiff