typedef struct {
McPresence presence;
- TpConnectionStatus connection;
+ TpConnectionStatus status;
gboolean is_enabled;
guint source_id;
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;
{
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.
*/
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);
}
}
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--;
}
}
return FALSE;
}
-static void
-account_status_changed_cb (MissionControl *mc,
- TpConnectionStatus connection,
- McPresence presence,
- TpConnectionStatusReason reason,
- const gchar *unique_name,
- EmpathyAccountManager *manager)
+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);
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;
- guint initial_connection;
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;
{
data = account_data_new_default (priv->mc, l->data);
- initial_connection = mission_control_get_connection_status (priv->mc,
- l->data, NULL);
- if (initial_connection == TP_CONNECTION_STATUS_CONNECTED) {
- priv->connected++;
- } else if (initial_connection == TP_CONNECTION_STATUS_CONNECTING) {
- priv->connecting++;
- }
-
- /* 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_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
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;
}
retval = G_OBJECT_CLASS (empathy_account_manager_parent_class)->constructor (type,
n_construct_params,
construct_params);
- g_object_add_weak_pointer (retval, (gpointer *) &retval);
manager_singleton = EMPATHY_ACCOUNT_MANAGER (retval);
- }
+ g_object_add_weak_pointer (retval, (gpointer) &manager_singleton);
+ }
else
{
retval = g_object_ref (manager_singleton);
{
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);
+}
projects / empathy.git / blobdiff