diff options
Diffstat (limited to 'libempathy/empathy-account-manager.c')
| -rw-r--r-- | libempathy/empathy-account-manager.c | 694 |
1 files changed, 347 insertions, 347 deletions
diff --git a/libempathy/empathy-account-manager.c b/libempathy/empathy-account-manager.c index 2eab490ac..aeef880bc 100644 --- a/libempathy/empathy-account-manager.c +++ b/libempathy/empathy-account-manager.c @@ -1,4 +1,4 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ +/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2; -*- */ /* * Copyright (C) 2008 Collabora Ltd. * @@ -30,31 +30,31 @@ #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyAccountManager) typedef struct { - McAccountMonitor *monitor; - MissionControl *mc; + McAccountMonitor *monitor; + MissionControl *mc; - GHashTable *accounts; - int connected; - int connecting; + GHashTable *accounts; + int connected; + int connecting; } EmpathyAccountManagerPriv; typedef struct { - McPresence presence; - TpConnectionStatus connection; - gboolean is_enabled; + McPresence presence; + TpConnectionStatus connection; + gboolean is_enabled; - guint source_id; + guint source_id; } AccountData; enum { - ACCOUNT_CREATED, - ACCOUNT_DELETED, - ACCOUNT_ENABLED, - ACCOUNT_DISABLED, - ACCOUNT_CHANGED, - ACCOUNT_CONNECTION_CHANGED, - ACCOUNT_PRESENCE_CHANGED, - LAST_SIGNAL + ACCOUNT_CREATED, + ACCOUNT_DELETED, + ACCOUNT_ENABLED, + ACCOUNT_DISABLED, + ACCOUNT_CHANGED, + ACCOUNT_CONNECTION_CHANGED, + ACCOUNT_PRESENCE_CHANGED, + LAST_SIGNAL }; static guint signals[LAST_SIGNAL]; @@ -64,406 +64,406 @@ G_DEFINE_TYPE (EmpathyAccountManager, empathy_account_manager, G_TYPE_OBJECT); static AccountData * account_data_new (McPresence presence, TpConnectionStatus connection, - gboolean is_enabled) + gboolean is_enabled) { - AccountData *retval; + AccountData *retval; - retval = g_slice_new0 (AccountData); - retval->presence = presence; - retval->connection = connection; - retval->is_enabled = is_enabled; - retval->source_id = 0; + retval = g_slice_new0 (AccountData); + retval->presence = presence; + retval->connection = connection; + retval->is_enabled = is_enabled; + retval->source_id = 0; - return retval; + return retval; } static AccountData * account_data_new_default (MissionControl *mc, - McAccount *account) + McAccount *account) { - McPresence actual_p; - TpConnectionStatus actual_c; - GError *err = NULL; - - actual_p = mission_control_get_presence_actual (mc, &err); - if (err) { - actual_p = MC_PRESENCE_UNSET; - g_clear_error (&err); - } - - actual_c = mission_control_get_connection_status (mc, - account, &err); - if (err) { - actual_c = TP_CONNECTION_STATUS_DISCONNECTED; - } - - return account_data_new (actual_p, actual_c, mc_account_is_enabled (account)); + McPresence actual_p; + TpConnectionStatus actual_c; + GError *err = NULL; + + actual_p = mission_control_get_presence_actual (mc, &err); + if (err) { + actual_p = MC_PRESENCE_UNSET; + g_clear_error (&err); + } + + actual_c = mission_control_get_connection_status (mc, + account, &err); + if (err) { + actual_c = TP_CONNECTION_STATUS_DISCONNECTED; + } + + return account_data_new (actual_p, actual_c, mc_account_is_enabled (account)); } static void account_data_free (AccountData *data) { - if (data->source_id > 0) { - g_source_remove (data->source_id); - data->source_id = 0; - } + if (data->source_id > 0) { + g_source_remove (data->source_id); + data->source_id = 0; + } - g_slice_free (AccountData, data); + g_slice_free (AccountData, data); } static void account_created_cb (McAccountMonitor *mon, - gchar *account_name, - EmpathyAccountManager *manager) + gchar *account_name, + EmpathyAccountManager *manager) { - McAccount *account; - EmpathyAccountManagerPriv *priv = GET_PRIV (manager); + McAccount *account; + EmpathyAccountManagerPriv *priv = GET_PRIV (manager); - account = mc_account_lookup (account_name); + account = mc_account_lookup (account_name); - if (account) { - AccountData *data; + if (account) { + AccountData *data; - data = account_data_new_default (priv->mc, account); + data = account_data_new_default (priv->mc, account); - g_hash_table_insert (priv->accounts, account, data); + g_hash_table_insert (priv->accounts, account, data); - g_signal_emit (manager, signals[ACCOUNT_CREATED], 0, account); - } + g_signal_emit (manager, signals[ACCOUNT_CREATED], 0, account); + } } static void account_deleted_cb (McAccountMonitor *mon, - gchar *account_name, - EmpathyAccountManager *manager) + gchar *account_name, + EmpathyAccountManager *manager) { - McAccount *account; - EmpathyAccountManagerPriv *priv = GET_PRIV (manager); + McAccount *account; + EmpathyAccountManagerPriv *priv = GET_PRIV (manager); - account = mc_account_lookup (account_name); + account = mc_account_lookup (account_name); - if (account) { - g_signal_emit (manager, signals[ACCOUNT_DELETED], 0, account); - - g_hash_table_remove (priv->accounts, account); - g_object_unref (account); - } + if (account) { + g_signal_emit (manager, signals[ACCOUNT_DELETED], 0, account); + + g_hash_table_remove (priv->accounts, account); + g_object_unref (account); + } } static void account_changed_cb (McAccountMonitor *mon, - gchar *account_name, - EmpathyAccountManager *manager) + gchar *account_name, + EmpathyAccountManager *manager) { - McAccount *account; + McAccount *account; - account = mc_account_lookup (account_name); + account = mc_account_lookup (account_name); - if (account) { - g_signal_emit (manager, signals[ACCOUNT_CHANGED], 0, account); - g_object_unref (account); - } + if (account) { + g_signal_emit (manager, signals[ACCOUNT_CHANGED], 0, account); + g_object_unref (account); + } } static void account_disabled_cb (McAccountMonitor *mon, - gchar *account_name, - EmpathyAccountManager *manager) + gchar *account_name, + EmpathyAccountManager *manager) { - McAccount *account; - EmpathyAccountManagerPriv *priv = GET_PRIV (manager); - AccountData *data; + McAccount *account; + EmpathyAccountManagerPriv *priv = GET_PRIV (manager); + AccountData *data; - account = mc_account_lookup (account_name); + account = mc_account_lookup (account_name); - if (account) { - data = g_hash_table_lookup (priv->accounts, account); - g_assert (data); - data->is_enabled = FALSE; + if (account) { + data = g_hash_table_lookup (priv->accounts, account); + g_assert (data); + data->is_enabled = FALSE; - g_signal_emit (manager, signals[ACCOUNT_DISABLED], 0, account); - } + g_signal_emit (manager, signals[ACCOUNT_DISABLED], 0, account); + } } static void account_enabled_cb (McAccountMonitor *mon, - gchar *account_name, - EmpathyAccountManager *manager) + gchar *account_name, + EmpathyAccountManager *manager) { - McAccount *account; - EmpathyAccountManagerPriv *priv = GET_PRIV (manager); - AccountData *data; + McAccount *account; + EmpathyAccountManagerPriv *priv = GET_PRIV (manager); + AccountData *data; - account = mc_account_lookup (account_name); + account = mc_account_lookup (account_name); - if (account) { - data = g_hash_table_lookup (priv->accounts, account); - g_assert (data); - data->is_enabled = TRUE; + if (account) { + data = g_hash_table_lookup (priv->accounts, account); + g_assert (data); + data->is_enabled = TRUE; - g_signal_emit (manager, signals[ACCOUNT_ENABLED], 0, account); - g_object_unref (account); - } + g_signal_emit (manager, signals[ACCOUNT_ENABLED], 0, account); + g_object_unref (account); + } } static void update_connection_numbers (EmpathyAccountManager *manager, - TpConnectionStatus conn, - TpConnectionStatus old_c) + TpConnectionStatus conn, + TpConnectionStatus old_c) { - EmpathyAccountManagerPriv *priv = GET_PRIV (manager); - - if (conn == TP_CONNECTION_STATUS_CONNECTED) { - priv->connected++; - if (old_c == TP_CONNECTION_STATUS_CONNECTING) { - priv->connecting--; - } - } - - if (conn == TP_CONNECTION_STATUS_CONNECTING) { - priv->connecting++; - if (old_c == TP_CONNECTION_STATUS_CONNECTED) { - priv->connected--; - } - } - - if (conn == TP_CONNECTION_STATUS_DISCONNECTED) { - if (old_c == TP_CONNECTION_STATUS_CONNECTED) { - priv->connected--; - } - if (old_c == TP_CONNECTION_STATUS_CONNECTING) { - priv->connecting--; - } - } + EmpathyAccountManagerPriv *priv = GET_PRIV (manager); + + if (conn == TP_CONNECTION_STATUS_CONNECTED) { + priv->connected++; + if (old_c == TP_CONNECTION_STATUS_CONNECTING) { + priv->connecting--; + } + } + + if (conn == TP_CONNECTION_STATUS_CONNECTING) { + priv->connecting++; + if (old_c == TP_CONNECTION_STATUS_CONNECTED) { + priv->connected--; + } + } + + if (conn == TP_CONNECTION_STATUS_DISCONNECTED) { + if (old_c == TP_CONNECTION_STATUS_CONNECTED) { + priv->connected--; + } + if (old_c == TP_CONNECTION_STATUS_CONNECTING) { + priv->connecting--; + } + } } static gboolean remove_data_timeout (gpointer _data) { - AccountData *data = _data; + AccountData *data = _data; - data->source_id = 0; + data->source_id = 0; - return FALSE; + return FALSE; } static void account_status_changed_cb (MissionControl *mc, - TpConnectionStatus connection, - McPresence presence, - TpConnectionStatusReason reason, - const gchar *unique_name, - EmpathyAccountManager *manager) + TpConnectionStatus connection, + McPresence presence, + TpConnectionStatusReason reason, + const gchar *unique_name, + EmpathyAccountManager *manager) { - McAccount *account; - EmpathyAccountManagerPriv *priv = GET_PRIV (manager); - AccountData *data; - McPresence old_p; - TpConnectionStatus old_c; - - account = mc_account_lookup (unique_name); - - if (account) { - data = g_hash_table_lookup (priv->accounts, account); - g_assert (data); - - old_p = data->presence; - old_c = data->connection; - - if (old_p != presence) { - data->presence = presence; - g_signal_emit (manager, signals[ACCOUNT_PRESENCE_CHANGED], 0, - account, presence, old_p); - } - - if (old_c != connection) { - data->connection = connection; - update_connection_numbers (manager, connection, old_c); - - g_signal_emit (manager, signals[ACCOUNT_CONNECTION_CHANGED], 0, - account, reason, connection, old_c); - - if (old_c == TP_CONNECTION_STATUS_CONNECTING && - connection == TP_CONNECTION_STATUS_CONNECTED) { - if (data->source_id > 0) { - g_source_remove (data->source_id); - data->source_id = 0; - } - - data->source_id = g_timeout_add_seconds (10, - remove_data_timeout, - data); - } - } - - g_object_unref (account); - } + McAccount *account; + EmpathyAccountManagerPriv *priv = GET_PRIV (manager); + AccountData *data; + McPresence old_p; + TpConnectionStatus old_c; + + account = mc_account_lookup (unique_name); + + if (account) { + data = g_hash_table_lookup (priv->accounts, account); + g_assert (data); + + old_p = data->presence; + old_c = data->connection; + + if (old_p != presence) { + data->presence = presence; + g_signal_emit (manager, signals[ACCOUNT_PRESENCE_CHANGED], 0, + account, presence, old_p); + } + + if (old_c != connection) { + data->connection = connection; + update_connection_numbers (manager, connection, old_c); + + g_signal_emit (manager, signals[ACCOUNT_CONNECTION_CHANGED], 0, + account, reason, connection, old_c); + + if (old_c == TP_CONNECTION_STATUS_CONNECTING && + connection == TP_CONNECTION_STATUS_CONNECTED) { + if (data->source_id > 0) { + g_source_remove (data->source_id); + data->source_id = 0; + } + + data->source_id = g_timeout_add_seconds (10, + remove_data_timeout, + data); + } + } + + g_object_unref (account); + } } static void empathy_account_manager_init (EmpathyAccountManager *manager) { - EmpathyAccountManagerPriv *priv = - G_TYPE_INSTANCE_GET_PRIVATE (manager, - EMPATHY_TYPE_ACCOUNT_MANAGER, EmpathyAccountManagerPriv); - GList *mc_accounts, *l; - AccountData *data; - - manager->priv = priv; - priv->monitor = mc_account_monitor_new (); - priv->mc = empathy_mission_control_new (); - priv->connected = priv->connecting = 0; - - priv->accounts = g_hash_table_new_full (empathy_account_hash, - empathy_account_equal, - g_object_unref, - (GDestroyNotify) account_data_free); - - mc_accounts = mc_accounts_list (); - - for (l = mc_accounts; l; l = l->next) { - data = account_data_new_default (priv->mc, l->data); - - g_hash_table_insert (priv->accounts, g_object_ref (l->data), - data); - } - - g_signal_connect (priv->monitor, "account-created", - G_CALLBACK (account_created_cb), manager); - g_signal_connect (priv->monitor, "account-deleted", - G_CALLBACK (account_deleted_cb), manager); - g_signal_connect (priv->monitor, "account-disabled", - G_CALLBACK (account_disabled_cb), manager); - g_signal_connect (priv->monitor, "account-enabled", - G_CALLBACK (account_enabled_cb), manager); - g_signal_connect (priv->monitor, "account-changed", - G_CALLBACK (account_changed_cb), manager); - - dbus_g_proxy_connect_signal (DBUS_G_PROXY (priv->mc), "AccountStatusChanged", - G_CALLBACK (account_status_changed_cb), - manager, NULL); + EmpathyAccountManagerPriv *priv = + G_TYPE_INSTANCE_GET_PRIVATE (manager, + EMPATHY_TYPE_ACCOUNT_MANAGER, EmpathyAccountManagerPriv); + GList *mc_accounts, *l; + AccountData *data; + + manager->priv = priv; + priv->monitor = mc_account_monitor_new (); + priv->mc = empathy_mission_control_new (); + priv->connected = priv->connecting = 0; + + priv->accounts = g_hash_table_new_full (empathy_account_hash, + empathy_account_equal, + g_object_unref, + (GDestroyNotify) account_data_free); + + mc_accounts = mc_accounts_list (); + + for (l = mc_accounts; l; l = l->next) { + data = account_data_new_default (priv->mc, l->data); + + g_hash_table_insert (priv->accounts, g_object_ref (l->data), + data); + } + + g_signal_connect (priv->monitor, "account-created", + G_CALLBACK (account_created_cb), manager); + g_signal_connect (priv->monitor, "account-deleted", + G_CALLBACK (account_deleted_cb), manager); + g_signal_connect (priv->monitor, "account-disabled", + G_CALLBACK (account_disabled_cb), manager); + g_signal_connect (priv->monitor, "account-enabled", + G_CALLBACK (account_enabled_cb), manager); + g_signal_connect (priv->monitor, "account-changed", + G_CALLBACK (account_changed_cb), manager); + + dbus_g_proxy_connect_signal (DBUS_G_PROXY (priv->mc), "AccountStatusChanged", + G_CALLBACK (account_status_changed_cb), + manager, NULL); } static void disconnect_monitor_signals (McAccountMonitor *monitor, - GObject *obj) + 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); + 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); } - + static void do_finalize (GObject *obj) { - EmpathyAccountManager *manager = EMPATHY_ACCOUNT_MANAGER (obj); - EmpathyAccountManagerPriv *priv = GET_PRIV (manager); + EmpathyAccountManager *manager = EMPATHY_ACCOUNT_MANAGER (obj); + EmpathyAccountManagerPriv *priv = GET_PRIV (manager); - dbus_g_proxy_disconnect_signal (DBUS_G_PROXY (priv->mc), - "AccountStatusChanged", - G_CALLBACK (account_status_changed_cb), - obj); + dbus_g_proxy_disconnect_signal (DBUS_G_PROXY (priv->mc), + "AccountStatusChanged", + G_CALLBACK (account_status_changed_cb), + obj); - disconnect_monitor_signals (priv->monitor, obj); + disconnect_monitor_signals (priv->monitor, obj); - g_object_unref (priv->monitor); - g_object_unref (priv->mc); + g_object_unref (priv->monitor); + g_object_unref (priv->mc); - g_hash_table_destroy (priv->accounts); + g_hash_table_destroy (priv->accounts); - G_OBJECT_CLASS (empathy_account_manager_parent_class)->finalize (obj); + G_OBJECT_CLASS (empathy_account_manager_parent_class)->finalize (obj); } static void empathy_account_manager_class_init (EmpathyAccountManagerClass *klass) { - GObjectClass *oclass = G_OBJECT_CLASS (klass); - - oclass->finalize = do_finalize; - - signals[ACCOUNT_CREATED] = - g_signal_new ("account-created", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - 0, - NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, - G_TYPE_NONE, - 1, MC_TYPE_ACCOUNT); - signals[ACCOUNT_DELETED] = - g_signal_new ("account-deleted", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - 0, - NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, - G_TYPE_NONE, - 1, MC_TYPE_ACCOUNT); - - signals[ACCOUNT_ENABLED] = - g_signal_new ("account-enabled", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - 0, - NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, - G_TYPE_NONE, - 1, MC_TYPE_ACCOUNT); - - signals[ACCOUNT_DISABLED] = - g_signal_new ("account-disabled", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - 0, - NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, - G_TYPE_NONE, - 1, MC_TYPE_ACCOUNT); - - signals[ACCOUNT_CHANGED] = - g_signal_new ("account-changed", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - 0, - NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, - G_TYPE_NONE, - 1, MC_TYPE_ACCOUNT); - - signals[ACCOUNT_CONNECTION_CHANGED] = - g_signal_new ("account-connection-changed", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - 0, - NULL, NULL, - _empathy_marshal_VOID__OBJECT_INT_UINT_UINT, - G_TYPE_NONE, - 4, MC_TYPE_ACCOUNT, - G_TYPE_INT, /* reason */ - G_TYPE_UINT, /* actual connection */ - G_TYPE_UINT); /* previous connection */ - - signals[ACCOUNT_PRESENCE_CHANGED] = - g_signal_new ("account-presence-changed", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - 0, - NULL, NULL, - _empathy_marshal_VOID__OBJECT_INT_INT, - G_TYPE_NONE, - 3, MC_TYPE_ACCOUNT, - G_TYPE_INT, /* actual presence */ - G_TYPE_INT); /* previous presence */ - - - g_type_class_add_private (oclass, sizeof (EmpathyAccountManagerPriv)); + GObjectClass *oclass = G_OBJECT_CLASS (klass); + + oclass->finalize = do_finalize; + + signals[ACCOUNT_CREATED] = + g_signal_new ("account-created", + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST, + 0, + NULL, NULL, + g_cclosure_marshal_VOID__OBJECT, + G_TYPE_NONE, + 1, MC_TYPE_ACCOUNT); + + signals[ACCOUNT_DELETED] = + g_signal_new ("account-deleted", + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST, + 0, + NULL, NULL, + g_cclosure_marshal_VOID__OBJECT, + G_TYPE_NONE, + 1, MC_TYPE_ACCOUNT); + + signals[ACCOUNT_ENABLED] = + g_signal_new ("account-enabled", + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST, + 0, + NULL, NULL, + g_cclosure_marshal_VOID__OBJECT, + G_TYPE_NONE, + 1, MC_TYPE_ACCOUNT); + + signals[ACCOUNT_DISABLED] = + g_signal_new ("account-disabled", + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST, + 0, + NULL, NULL, + g_cclosure_marshal_VOID__OBJECT, + G_TYPE_NONE, + 1, MC_TYPE_ACCOUNT); + + signals[ACCOUNT_CHANGED] = + g_signal_new ("account-changed", + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST, + 0, + NULL, NULL, + g_cclosure_marshal_VOID__OBJECT, + G_TYPE_NONE, + 1, MC_TYPE_ACCOUNT); + + signals[ACCOUNT_CONNECTION_CHANGED] = + g_signal_new ("account-connection-changed", + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST, + 0, + NULL, NULL, + _empathy_marshal_VOID__OBJECT_INT_UINT_UINT, + G_TYPE_NONE, + 4, MC_TYPE_ACCOUNT, + G_TYPE_INT, /* reason */ + G_TYPE_UINT, /* actual connection */ + G_TYPE_UINT); /* previous connection */ + + signals[ACCOUNT_PRESENCE_CHANGED] = + g_signal_new ("account-presence-changed", + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST, + 0, + NULL, NULL, + _empathy_marshal_VOID__OBJECT_INT_INT, + G_TYPE_NONE, + 3, MC_TYPE_ACCOUNT, + G_TYPE_INT, /* actual presence */ + G_TYPE_INT); /* previous presence */ + + g_type_class_add_private (oclass, sizeof (EmpathyAccountManagerPriv)); } /* public methods */ @@ -471,53 +471,53 @@ empathy_account_manager_class_init (EmpathyAccountManagerClass *klass) EmpathyAccountManager * empathy_account_manager_new (void) { - if (!manager) { - manager = g_object_new (EMPATHY_TYPE_ACCOUNT_MANAGER, NULL); - g_object_add_weak_pointer (G_OBJECT (manager), (gpointer) &manager); - } else { - g_object_ref (manager); - } - - return manager; + if (!manager) { + manager = g_object_new (EMPATHY_TYPE_ACCOUNT_MANAGER, NULL); + g_object_add_weak_pointer (G_OBJECT (manager), (gpointer) &manager); + } else { + g_object_ref (manager); + } + + return manager; } int empathy_account_manager_get_connected_accounts (EmpathyAccountManager *manager) { - EmpathyAccountManagerPriv *priv; + EmpathyAccountManagerPriv *priv; - g_assert (EMPATHY_IS_ACCOUNT_MANAGER (manager)); + g_assert (EMPATHY_IS_ACCOUNT_MANAGER (manager)); - priv = GET_PRIV (manager); + priv = GET_PRIV (manager); - return priv->connected; + return priv->connected; } int empathy_account_manager_get_connecting_accounts (EmpathyAccountManager *manager) { - EmpathyAccountManagerPriv *priv; + EmpathyAccountManagerPriv *priv; - g_assert (EMPATHY_IS_ACCOUNT_MANAGER (manager)); + g_assert (EMPATHY_IS_ACCOUNT_MANAGER (manager)); - priv = GET_PRIV (manager); + priv = GET_PRIV (manager); - return priv->connecting; + return priv->connecting; } gboolean empathy_account_manager_is_account_just_connected (EmpathyAccountManager *manager, - McAccount *account) + McAccount *account) { - EmpathyAccountManagerPriv *priv; - AccountData *data; + EmpathyAccountManagerPriv *priv; + AccountData *data; - g_assert (EMPATHY_IS_ACCOUNT_MANAGER (manager)); + g_assert (EMPATHY_IS_ACCOUNT_MANAGER (manager)); - priv = GET_PRIV (manager); - data = g_hash_table_lookup (priv->accounts, account); + priv = GET_PRIV (manager); + data = g_hash_table_lookup (priv->accounts, account); - g_assert (data); + g_assert (data); - return (data->source_id > 0); + return (data->source_id > 0); } |