#include <telepathy-glib/enums.h>
#include "empathy-contact-manager.h"
+#include "empathy-account-manager.h"
+#include "empathy-contact-monitor.h"
#include "empathy-contact-list.h"
#include "empathy-utils.h"
#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyContactManager)
typedef struct {
GHashTable *lists;
- MissionControl *mc;
- gpointer token;
+ EmpathyAccountManager *account_manager;
+ EmpathyContactMonitor *contact_monitor;
} EmpathyContactManagerPriv;
static void contact_manager_iface_init (EmpathyContactListIface *iface);
G_IMPLEMENT_INTERFACE (EMPATHY_TYPE_CONTACT_LIST,
contact_manager_iface_init));
+static EmpathyContactManager *manager_singleton = NULL;
+
static void
contact_manager_members_changed_cb (EmpathyTpContactList *list,
EmpathyContact *contact,
contact, group, is_member);
}
-static void contact_manager_destroy_cb (EmpathyTpContactList *list,
- EmpathyContactManager *manager);
-
static void
contact_manager_disconnect_foreach (gpointer key,
gpointer value,
g_signal_handlers_disconnect_by_func (list,
contact_manager_groups_changed_cb,
manager);
- g_signal_handlers_disconnect_by_func (list,
- contact_manager_destroy_cb,
- manager);
}
static void
-contact_manager_destroy_cb (EmpathyTpContactList *list,
- EmpathyContactManager *manager)
+contact_manager_invalidated_cb (TpProxy *connection,
+ guint domain,
+ gint code,
+ gchar *message,
+ EmpathyContactManager *manager)
{
EmpathyContactManagerPriv *priv = GET_PRIV (manager);
- McAccount *account;
-
- account = empathy_tp_contact_list_get_account (list);
+ EmpathyTpContactList *list;
- DEBUG ("Removing account: %s", mc_account_get_display_name (account));
+ DEBUG ("Removing connection: %s (%s)",
+ tp_proxy_get_object_path (TP_PROXY (connection)),
+ message);
- contact_manager_disconnect_foreach (account, list, manager);
- g_hash_table_remove (priv->lists, account);
+ list = g_hash_table_lookup (priv->lists, connection);
+ if (list) {
+ empathy_tp_contact_list_remove_all (list);
+ g_hash_table_remove (priv->lists, connection);
+ }
}
static void
-contact_manager_add_account (EmpathyContactManager *manager,
- McAccount *account)
+contact_manager_new_connection_cb (EmpathyAccountManager *manager,
+ TpConnection *connection,
+ EmpathyContactManager *self)
{
EmpathyContactManagerPriv *priv = GET_PRIV (manager);
EmpathyTpContactList *list;
- if (g_hash_table_lookup (priv->lists, account)) {
+ if (g_hash_table_lookup (priv->lists, connection)) {
return;
}
- DEBUG ("Adding new account: %s", mc_account_get_display_name (account));
-
- list = empathy_tp_contact_list_new (account);
- if (!list) {
- return;
- }
+ DEBUG ("Adding new connection: %s",
+ tp_proxy_get_object_path (TP_PROXY (connection)));
- g_hash_table_insert (priv->lists, g_object_ref (account), list);
+ list = empathy_tp_contact_list_new (connection);
+ g_hash_table_insert (priv->lists, g_object_ref (connection), list);
+ g_signal_connect (connection, "invalidated",
+ G_CALLBACK (contact_manager_invalidated_cb),
+ manager);
/* Connect signals */
g_signal_connect (list, "members-changed",
g_signal_connect (list, "groups-changed",
G_CALLBACK (contact_manager_groups_changed_cb),
manager);
- g_signal_connect (list, "destroy",
- G_CALLBACK (contact_manager_destroy_cb),
- manager);
-}
-
-static void
-contact_manager_status_changed_cb (MissionControl *mc,
- TpConnectionStatus status,
- McPresence presence,
- TpConnectionStatusReason reason,
- const gchar *unique_name,
- EmpathyContactManager *manager)
-{
- McAccount *account;
-
- if (status != TP_CONNECTION_STATUS_CONNECTED) {
- /* We only care about newly connected accounts */
- return;
- }
-
- account = mc_account_lookup (unique_name);
- contact_manager_add_account (manager, account);
- g_object_unref (account);
}
static void
{
EmpathyContactManagerPriv *priv = GET_PRIV (object);
- empathy_disconnect_account_status_changed (priv->token);
g_hash_table_foreach (priv->lists,
contact_manager_disconnect_foreach,
object);
g_hash_table_destroy (priv->lists);
- g_object_unref (priv->mc);
+
+ g_signal_handlers_disconnect_by_func (priv->account_manager,
+ contact_manager_new_connection_cb,
+ object);
+ g_object_unref (priv->account_manager);
+
+ if (priv->contact_monitor) {
+ g_object_unref (priv->contact_monitor);
+ }
+}
+
+static GObject *
+contact_manager_constructor (GType type,
+ guint n_props,
+ GObjectConstructParam *props)
+{
+ GObject *retval;
+
+ if (manager_singleton) {
+ retval = g_object_ref (manager_singleton);
+ } else {
+ retval = G_OBJECT_CLASS (empathy_contact_manager_parent_class)->constructor
+ (type, n_props, props);
+
+ manager_singleton = EMPATHY_CONTACT_MANAGER (retval);
+ g_object_add_weak_pointer (retval, (gpointer) &manager_singleton);
+ }
+
+ return retval;
}
static void
GObjectClass *object_class = G_OBJECT_CLASS (klass);
object_class->finalize = contact_manager_finalize;
+ object_class->constructor = contact_manager_constructor;
g_type_class_add_private (object_class, sizeof (EmpathyContactManagerPriv));
}
static void
empathy_contact_manager_init (EmpathyContactManager *manager)
{
- GSList *accounts, *l;
+ GList *connections, *l;
EmpathyContactManagerPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (manager,
EMPATHY_TYPE_CONTACT_MANAGER, EmpathyContactManagerPriv);
manager->priv = priv;
- priv->lists = g_hash_table_new_full (empathy_account_hash,
- empathy_account_equal,
+ priv->lists = g_hash_table_new_full (empathy_proxy_hash,
+ empathy_proxy_equal,
(GDestroyNotify) g_object_unref,
(GDestroyNotify) g_object_unref);
+ priv->account_manager = empathy_account_manager_dup_singleton ();
+ priv->contact_monitor = NULL;
- priv->mc = empathy_mission_control_new ();
- priv->token = empathy_connect_to_account_status_changed (priv->mc,
- G_CALLBACK (contact_manager_status_changed_cb),
- manager, NULL);
+ g_signal_connect (priv->account_manager, "new-connection",
+ G_CALLBACK (contact_manager_new_connection_cb),
+ manager);
/* Get ContactList for existing connections */
- accounts = mission_control_get_online_connections (priv->mc, NULL);
- for (l = accounts; l; l = l->next) {
- contact_manager_add_account (manager, l->data);
+ connections = empathy_account_manager_dup_connections (priv->account_manager);
+ for (l = connections; l; l = l->next) {
+ contact_manager_new_connection_cb (priv->account_manager,
+ l->data, manager);
g_object_unref (l->data);
}
- g_slist_free (accounts);
+ g_list_free (connections);
}
EmpathyContactManager *
-empathy_contact_manager_new (void)
+empathy_contact_manager_dup_singleton (void)
{
- static EmpathyContactManager *manager = NULL;
-
- if (!manager) {
- manager = g_object_new (EMPATHY_TYPE_CONTACT_MANAGER, NULL);
- g_object_add_weak_pointer (G_OBJECT (manager), (gpointer) &manager);
- } else {
- g_object_ref (manager);
- }
-
- return manager;
+ return g_object_new (EMPATHY_TYPE_CONTACT_MANAGER, NULL);
}
EmpathyTpContactList *
empathy_contact_manager_get_list (EmpathyContactManager *manager,
- McAccount *account)
+ TpConnection *connection)
{
EmpathyContactManagerPriv *priv = GET_PRIV (manager);
g_return_val_if_fail (EMPATHY_IS_CONTACT_MANAGER (manager), NULL);
- g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL);
+ g_return_val_if_fail (TP_IS_CONNECTION (connection), NULL);
- return g_hash_table_lookup (priv->lists, account);
+ return g_hash_table_lookup (priv->lists, connection);
}
static void
{
EmpathyContactManagerPriv *priv = GET_PRIV (manager);
EmpathyContactList *list;
- McAccount *account;
+ TpConnection *connection;
g_return_if_fail (EMPATHY_IS_CONTACT_MANAGER (manager));
- account = empathy_contact_get_account (contact);
- list = g_hash_table_lookup (priv->lists, account);
+ connection = empathy_contact_get_connection (contact);
+ list = g_hash_table_lookup (priv->lists, connection);
if (list) {
empathy_contact_list_add (list, contact, message);
static void
contact_manager_remove (EmpathyContactList *manager,
- EmpathyContact *contact,
+ EmpathyContact *contact,
const gchar *message)
{
EmpathyContactManagerPriv *priv = GET_PRIV (manager);
EmpathyContactList *list;
- McAccount *account;
+ TpConnection *connection;
g_return_if_fail (EMPATHY_IS_CONTACT_MANAGER (manager));
- account = empathy_contact_get_account (contact);
- list = g_hash_table_lookup (priv->lists, account);
+ connection = empathy_contact_get_connection (contact);
+ list = g_hash_table_lookup (priv->lists, connection);
if (list) {
empathy_contact_list_remove (list, contact, message);
}
static void
-contact_manager_get_members_foreach (McAccount *account,
+contact_manager_get_members_foreach (TpConnection *connection,
EmpathyTpContactList *list,
GList **contacts)
{
return contacts;
}
+static EmpathyContactMonitor *
+contact_manager_get_monitor (EmpathyContactList *manager)
+{
+ EmpathyContactManagerPriv *priv = GET_PRIV (manager);
+
+ if (priv->contact_monitor == NULL) {
+ priv->contact_monitor = empathy_contact_monitor_new_for_iface (manager);
+ }
+
+ return priv->contact_monitor;
+}
+
static void
-contact_manager_get_pendings_foreach (McAccount *account,
+contact_manager_get_pendings_foreach (TpConnection *connection,
EmpathyTpContactList *list,
GList **contacts)
{
}
static void
-contact_manager_get_all_groups_foreach (McAccount *account,
+contact_manager_get_all_groups_foreach (TpConnection *connection,
EmpathyTpContactList *list,
GList **all_groups)
{
{
EmpathyContactManagerPriv *priv = GET_PRIV (manager);
EmpathyContactList *list;
- McAccount *account;
+ TpConnection *connection;
g_return_val_if_fail (EMPATHY_IS_CONTACT_MANAGER (manager), NULL);
- account = empathy_contact_get_account (contact);
- list = g_hash_table_lookup (priv->lists, account);
+ connection = empathy_contact_get_connection (contact);
+ list = g_hash_table_lookup (priv->lists, connection);
if (list) {
return empathy_contact_list_get_groups (list, contact);
{
EmpathyContactManagerPriv *priv = GET_PRIV (manager);
EmpathyContactList *list;
- McAccount *account;
+ TpConnection *connection;
g_return_if_fail (EMPATHY_IS_CONTACT_MANAGER (manager));
- account = empathy_contact_get_account (contact);
- list = g_hash_table_lookup (priv->lists, account);
+ connection = empathy_contact_get_connection (contact);
+ list = g_hash_table_lookup (priv->lists, connection);
if (list) {
empathy_contact_list_add_to_group (list, contact, group);
{
EmpathyContactManagerPriv *priv = GET_PRIV (manager);
EmpathyContactList *list;
- McAccount *account;
+ TpConnection *connection;
g_return_if_fail (EMPATHY_IS_CONTACT_MANAGER (manager));
- account = empathy_contact_get_account (contact);
- list = g_hash_table_lookup (priv->lists, account);
+ connection = empathy_contact_get_connection (contact);
+ list = g_hash_table_lookup (priv->lists, connection);
if (list) {
empathy_contact_list_remove_from_group (list, contact, group);
} RenameGroupData;
static void
-contact_manager_rename_group_foreach (McAccount *account,
+contact_manager_rename_group_foreach (TpConnection *connection,
EmpathyTpContactList *list,
RenameGroupData *data)
{
&data);
}
-static void contact_manager_remove_group_foreach (McAccount *account,
+static void contact_manager_remove_group_foreach (TpConnection *connection,
EmpathyTpContactList *list,
const gchar *group)
{
iface->add = contact_manager_add;
iface->remove = contact_manager_remove;
iface->get_members = contact_manager_get_members;
+ iface->get_monitor = contact_manager_get_monitor;
iface->get_pendings = contact_manager_get_pendings;
iface->get_all_groups = contact_manager_get_all_groups;
iface->get_groups = contact_manager_get_groups;
gboolean
empathy_contact_manager_can_add (EmpathyContactManager *manager,
- McAccount *account)
+ TpConnection *connection)
{
EmpathyContactManagerPriv *priv = GET_PRIV (manager);
- EmpathyTpContactList *list;
+ EmpathyTpContactList *list;
g_return_val_if_fail (EMPATHY_IS_CONTACT_MANAGER (manager), FALSE);
- list = g_hash_table_lookup (priv->lists, account);
- if (list == NULL)
- return FALSE;
+ list = g_hash_table_lookup (priv->lists, connection);
+ if (list == NULL)
+ return FALSE;
return empathy_tp_contact_list_can_add (list);
}
+