/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
* Copyright (C) 2007 Xavier Claessens <xclaesse@gmail.com>
- * Copyright (C) 2007 Collabora Ltd.
+ * Copyright (C) 2007-2009 Collabora Ltd.
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
* Authors: Xavier Claessens <xclaesse@gmail.com>
*/
#include <config.h>
#include <string.h>
+#include <glib/gi18n-lib.h>
-#include <libtelepathy/tp-helpers.h>
-#include <libtelepathy/tp-conn.h>
-#include <libtelepathy/tp-chan.h>
-#include <libtelepathy/tp-chan-type-contact-list-gen.h>
-#include <libtelepathy/tp-conn-iface-aliasing-gen.h>
-#include <libtelepathy/tp-conn-iface-presence-gen.h>
-#include <libtelepathy/tp-conn-iface-avatars-gen.h>
+#include <telepathy-glib/channel.h>
+#include <telepathy-glib/connection.h>
+#include <telepathy-glib/util.h>
+#include <telepathy-glib/dbus.h>
#include "empathy-tp-contact-list.h"
+#include "empathy-tp-contact-factory.h"
#include "empathy-contact-list.h"
-#include "gossip-telepathy-group.h"
-#include "gossip-debug.h"
-#include "gossip-utils.h"
+#include "empathy-utils.h"
-#define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \
- EMPATHY_TYPE_TP_CONTACT_LIST, EmpathyTpContactListPriv))
+#define DEBUG_FLAG EMPATHY_DEBUG_TP | EMPATHY_DEBUG_CONTACT
+#include "empathy-debug.h"
-#define DEBUG_DOMAIN "TpContactList"
-#define MAX_AVATAR_REQUESTS 10
-
-struct _EmpathyTpContactListPriv {
- TpConn *tp_conn;
- McAccount *account;
- MissionControl *mc;
- GossipContact *user_contact;
- gboolean setup;
-
- GossipTelepathyGroup *known;
- GossipTelepathyGroup *publish;
- GossipTelepathyGroup *subscribe;
-
- GHashTable *groups;
- GHashTable *contacts;
-
- DBusGProxy *aliasing_iface;
- DBusGProxy *avatars_iface;
- DBusGProxy *presence_iface;
+#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyTpContactList)
+typedef struct {
+ EmpathyTpContactFactory *factory;
+ TpConnection *connection;
+ const gchar *protocol_group;
- GList *avatar_requests_queue;
-};
+ TpChannel *publish;
+ TpChannel *subscribe;
+ GHashTable *members;
+ GHashTable *pendings;
+ GHashTable *groups;
+} EmpathyTpContactListPriv;
typedef enum {
- TP_CONTACT_LIST_TYPE_KNOWN,
TP_CONTACT_LIST_TYPE_PUBLISH,
TP_CONTACT_LIST_TYPE_SUBSCRIBE,
- TP_CONTACT_LIST_TYPE_UNKNOWN,
- TP_CONTACT_LIST_TYPE_COUNT
+ TP_CONTACT_LIST_TYPE_UNKNOWN
} TpContactListType;
-typedef struct {
- guint handle;
- GList *new_groups;
-} TpContactListData;
-
-typedef struct {
- EmpathyTpContactList *list;
- guint handle;
-} TpContactListAvatarRequestData;
-
-typedef struct {
- EmpathyTpContactList *list;
- guint *handles;
-} TpContactListAliasesRequestData;
-
-static void empathy_tp_contact_list_class_init (EmpathyTpContactListClass *klass);
-static void tp_contact_list_iface_init (EmpathyContactListIface *iface);
-static void empathy_tp_contact_list_init (EmpathyTpContactList *list);
-static void tp_contact_list_finalize (GObject *object);
-static void tp_contact_list_finalize_proxies (EmpathyTpContactList *list);
-static void tp_contact_list_setup (EmpathyContactList *list);
-static GossipContact * tp_contact_list_find (EmpathyContactList *list,
- const gchar *id);
-static void tp_contact_list_add (EmpathyContactList *list,
- GossipContact *contact,
- const gchar *message);
-static void tp_contact_list_remove (EmpathyContactList *list,
- GossipContact *contact,
- const gchar *message);
-static GList * tp_contact_list_get_contacts (EmpathyContactList *list);
-static void tp_contact_list_contact_removed_foreach (guint handle,
- GossipContact *contact,
- EmpathyTpContactList *list);
-static void tp_contact_list_destroy_cb (DBusGProxy *proxy,
- EmpathyTpContactList *list);
-static gboolean tp_contact_list_find_foreach (guint handle,
- GossipContact *contact,
- gchar *id);
-static void tp_contact_list_newchannel_cb (DBusGProxy *proxy,
- const gchar *object_path,
- const gchar *channel_type,
- TelepathyHandleType handle_type,
- guint channel_handle,
- gboolean suppress_handle,
- EmpathyTpContactList *list);
-static TpContactListType tp_contact_list_get_type (EmpathyTpContactList *list,
- TpChan *list_chan);
-static void tp_contact_list_contact_added_cb (GossipTelepathyGroup *group,
- GArray *handles,
- guint actor_handle,
- guint reason,
- const gchar *message,
- EmpathyTpContactList *list);
-static void tp_contact_list_contact_removed_cb (GossipTelepathyGroup *group,
- GArray *handles,
- guint actor_handle,
- guint reason,
- const gchar *message,
- EmpathyTpContactList *list);
-static void tp_contact_list_local_pending_cb (GossipTelepathyGroup *group,
- GArray *handles,
- guint actor_handle,
- guint reason,
- const gchar *message,
- EmpathyTpContactList *list);
-static void tp_contact_list_groups_updated_cb (GossipContact *contact,
- GParamSpec *param,
- EmpathyTpContactList *list);
-static void tp_contact_list_subscription_updated_cb (GossipContact *contact,
- GParamSpec *param,
- EmpathyTpContactList *list);
-static void tp_contact_list_name_updated_cb (GossipContact *contact,
- GParamSpec *param,
- EmpathyTpContactList *list);
-static void tp_contact_list_update_groups_foreach (gchar *object_path,
- GossipTelepathyGroup *group,
- TpContactListData *data);
-static GossipTelepathyGroup * tp_contact_list_get_group (EmpathyTpContactList *list,
- const gchar *name);
-static gboolean tp_contact_list_find_group (gchar *key,
- GossipTelepathyGroup *group,
- gchar *group_name);
-static void tp_contact_list_get_groups_foreach (gchar *key,
- GossipTelepathyGroup *group,
- GList **groups);
-static void tp_contact_list_group_channel_closed_cb (TpChan *channel,
- EmpathyTpContactList *list);
-static void tp_contact_list_group_members_added_cb (GossipTelepathyGroup *group,
- GArray *members,
- guint actor_handle,
- guint reason,
- const gchar *message,
- EmpathyTpContactList *list);
-static void tp_contact_list_group_members_removed_cb (GossipTelepathyGroup *group,
- GArray *members,
- guint actor_handle,
- guint reason,
- const gchar *message,
- EmpathyTpContactList *list);
-static void tp_contact_list_get_contacts_foreach (guint handle,
- GossipContact *contact,
- GList **contacts);
-static void tp_contact_list_get_info (EmpathyTpContactList *list,
- GArray *handles);
-static void tp_contact_list_request_avatar (EmpathyTpContactList *list,
- guint handle);
-static void tp_contact_list_start_avatar_requests (EmpathyTpContactList *list);
-static void tp_contact_list_avatar_update_cb (DBusGProxy *proxy,
- guint handle,
- gchar *new_token,
- EmpathyTpContactList *list);
-static void tp_contact_list_request_avatar_cb (DBusGProxy *proxy,
- GArray *avatar_data,
- gchar *mime_type,
- GError *error,
- TpContactListAvatarRequestData *data);
-static void tp_contact_list_aliases_update_cb (DBusGProxy *proxy,
- GPtrArray *handlers,
- EmpathyTpContactList *list);
-static void tp_contact_list_request_aliases_cb (DBusGProxy *proxy,
- gchar **contact_names,
- GError *error,
- TpContactListAliasesRequestData *data);
-static void tp_contact_list_presence_update_cb (DBusGProxy *proxy,
- GHashTable *handle_table,
- EmpathyTpContactList *list);
-static void tp_contact_list_parse_presence_foreach (guint handle,
- GValueArray *presence_struct,
- EmpathyTpContactList *list);
-static void tp_contact_list_presences_table_foreach (const gchar *state_str,
- GHashTable *presences_table,
- GossipPresence **presence);
-static void tp_contact_list_status_changed_cb (MissionControl *mc,
- TelepathyConnectionStatus status,
- McPresence presence,
- TelepathyConnectionStatusReason reason,
- const gchar *unique_name,
- EmpathyTpContactList *list);
+static void tp_contact_list_iface_init (EmpathyContactListIface *iface);
enum {
- DESTROY,
- LAST_SIGNAL
+ PROP_0,
+ PROP_CONNECTION,
};
-static guint signals[LAST_SIGNAL];
-static guint n_avatar_requests = 0;
-
G_DEFINE_TYPE_WITH_CODE (EmpathyTpContactList, empathy_tp_contact_list, G_TYPE_OBJECT,
G_IMPLEMENT_INTERFACE (EMPATHY_TYPE_CONTACT_LIST,
tp_contact_list_iface_init));
static void
-empathy_tp_contact_list_class_init (EmpathyTpContactListClass *klass)
+tp_contact_list_group_invalidated_cb (TpChannel *channel,
+ guint domain,
+ gint code,
+ gchar *message,
+ EmpathyTpContactList *list)
{
- GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ EmpathyTpContactListPriv *priv = GET_PRIV (list);
+ const TpIntSet *members;
+ TpIntSetIter iter;
+ const gchar *group_name;
- object_class->finalize = tp_contact_list_finalize;
+ group_name = tp_channel_get_identifier (channel);
+ DEBUG ("Group %s invalidated. Message: %s", group_name, message);
- signals[DESTROY] =
- g_signal_new ("destroy",
- G_TYPE_FROM_CLASS (klass),
- G_SIGNAL_RUN_LAST,
- 0,
- NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE,
- 0);
+ /* Signal that all members are not in that group anymore */
+ members = tp_channel_group_get_members (channel);
+ tp_intset_iter_init (&iter, members);
+ while (tp_intset_iter_next (&iter)) {
+ EmpathyContact *contact;
- g_type_class_add_private (object_class, sizeof (EmpathyTpContactListPriv));
-}
+ contact = g_hash_table_lookup (priv->members,
+ GUINT_TO_POINTER (iter.element));
+ if (contact == NULL) {
+ continue;
+ }
-static void
-tp_contact_list_iface_init (EmpathyContactListIface *iface)
-{
- iface->setup = tp_contact_list_setup;
- iface->find = tp_contact_list_find;
- iface->add = tp_contact_list_add;
- iface->remove = tp_contact_list_remove;
- iface->get_contacts = tp_contact_list_get_contacts;
+ DEBUG ("Contact %s (%d) removed from group %s",
+ empathy_contact_get_id (contact), iter.element,
+ group_name);
+ g_signal_emit_by_name (list, "groups-changed", contact,
+ group_name,
+ FALSE);
+ }
+
+ g_hash_table_remove (priv->groups, group_name);
}
static void
-empathy_tp_contact_list_init (EmpathyTpContactList *list)
+tp_contact_list_group_ready_cb (TpChannel *channel,
+ const GError *error,
+ gpointer list)
{
- EmpathyTpContactListPriv *priv;
+ EmpathyTpContactListPriv *priv = GET_PRIV (list);
- priv = GET_PRIV (list);
+ if (error) {
+ DEBUG ("Error: %s", error->message);
+ g_object_unref (channel);
+ return;
+ }
+
+ DEBUG ("Add group %s", tp_channel_get_identifier (channel));
+ g_hash_table_insert (priv->groups,
+ (gpointer) tp_channel_get_identifier (channel),
+ channel);
- priv->groups = g_hash_table_new_full (g_str_hash,
- g_str_equal,
- (GDestroyNotify) g_free,
- (GDestroyNotify) g_object_unref);
- priv->contacts = g_hash_table_new_full (g_direct_hash,
- g_direct_equal,
- NULL,
- (GDestroyNotify) g_object_unref);
+ g_signal_connect (channel, "invalidated",
+ G_CALLBACK (tp_contact_list_group_invalidated_cb),
+ list);
}
static void
-tp_contact_list_finalize (GObject *object)
+tp_contact_list_group_members_changed_cb (TpChannel *channel,
+ gchar *message,
+ GArray *added,
+ GArray *removed,
+ GArray *local_pending,
+ GArray *remote_pending,
+ guint actor,
+ guint reason,
+ EmpathyTpContactList *list)
{
- EmpathyTpContactListPriv *priv;
- EmpathyTpContactList *list;
-
- list = EMPATHY_TP_CONTACT_LIST (object);
- priv = GET_PRIV (list);
-
- gossip_debug (DEBUG_DOMAIN, "finalize: %p", object);
+ EmpathyTpContactListPriv *priv = GET_PRIV (list);
+ const gchar *group_name;
+ gint i;
- dbus_g_proxy_disconnect_signal (DBUS_G_PROXY (priv->mc),
- "AccountStatusChanged",
- G_CALLBACK (tp_contact_list_status_changed_cb),
- list);
+ group_name = tp_channel_get_identifier (channel);
- tp_contact_list_finalize_proxies (list);
+ for (i = 0; i < added->len; i++) {
+ EmpathyContact *contact;
+ TpHandle handle;
- if (priv->tp_conn) {
- g_object_unref (priv->tp_conn);
- }
+ handle = g_array_index (added, TpHandle, i);
+ contact = g_hash_table_lookup (priv->members,
+ GUINT_TO_POINTER (handle));
+ if (contact == NULL) {
+ continue;
+ }
- if (priv->known) {
- g_object_unref (priv->known);
- }
+ DEBUG ("Contact %s (%d) added to group %s",
+ empathy_contact_get_id (contact), handle, group_name);
+ g_signal_emit_by_name (list, "groups-changed", contact,
+ group_name,
+ TRUE);
+ }
- if (priv->subscribe) {
- g_object_unref (priv->subscribe);
- }
+ for (i = 0; i < removed->len; i++) {
+ EmpathyContact *contact;
+ TpHandle handle;
- if (priv->publish) {
- g_object_unref (priv->publish);
- }
+ handle = g_array_index (removed, TpHandle, i);
+ contact = g_hash_table_lookup (priv->members,
+ GUINT_TO_POINTER (handle));
+ if (contact == NULL) {
+ continue;
+ }
- g_object_unref (priv->account);
- g_object_unref (priv->user_contact);
- g_object_unref (priv->mc);
- g_hash_table_destroy (priv->groups);
- g_hash_table_destroy (priv->contacts);
+ DEBUG ("Contact %s (%d) removed from group %s",
+ empathy_contact_get_id (contact), handle, group_name);
- G_OBJECT_CLASS (empathy_tp_contact_list_parent_class)->finalize (object);
+ g_signal_emit_by_name (list, "groups-changed", contact,
+ group_name,
+ FALSE);
+ }
}
-EmpathyTpContactList *
-empathy_tp_contact_list_new (McAccount *account)
+static TpChannel *
+tp_contact_list_group_add_channel (EmpathyTpContactList *list,
+ const gchar *object_path,
+ const gchar *channel_type,
+ TpHandleType handle_type,
+ guint handle)
{
- EmpathyTpContactListPriv *priv;
- EmpathyTpContactList *list;
- MissionControl *mc;
- guint handle;
- GError *error = NULL;
-
- g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL);
+ EmpathyTpContactListPriv *priv = GET_PRIV (list);
+ TpChannel *channel;
- mc = gossip_mission_control_new ();
-
- if (mission_control_get_connection_status (mc, account, NULL) != 0) {
- /* The account is not connected, nothing to do. */
+ /* Only accept server-side contact groups */
+ if (tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_CONTACT_LIST) ||
+ handle_type != TP_HANDLE_TYPE_GROUP) {
return NULL;
}
- list = g_object_new (EMPATHY_TYPE_TP_CONTACT_LIST, NULL);
- priv = GET_PRIV (list);
-
- priv->tp_conn = mission_control_get_connection (mc, account, NULL);
- priv->account = g_object_ref (account);
- priv->mc = mc;
+ channel = tp_channel_new (priv->connection,
+ object_path, channel_type,
+ handle_type, handle, NULL);
- g_signal_connect (priv->tp_conn, "destroy",
- G_CALLBACK (tp_contact_list_destroy_cb),
+ /* TpChannel emits initial set of members just before being ready */
+ g_signal_connect (channel, "group-members-changed",
+ G_CALLBACK (tp_contact_list_group_members_changed_cb),
list);
- dbus_g_proxy_connect_signal (DBUS_G_PROXY (priv->mc),
- "AccountStatusChanged",
- G_CALLBACK (tp_contact_list_status_changed_cb),
- list, NULL);
-
- priv->aliasing_iface = tp_conn_get_interface (priv->tp_conn,
- TELEPATHY_CONN_IFACE_ALIASING_QUARK);
- priv->avatars_iface = tp_conn_get_interface (priv->tp_conn,
- TELEPATHY_CONN_IFACE_AVATARS_QUARK);
- priv->presence_iface = tp_conn_get_interface (priv->tp_conn,
- TELEPATHY_CONN_IFACE_PRESENCE_QUARK);
-
- if (priv->aliasing_iface) {
- dbus_g_proxy_connect_signal (priv->aliasing_iface,
- "AliasesChanged",
- G_CALLBACK (tp_contact_list_aliases_update_cb),
- list, NULL);
- }
-
- if (priv->avatars_iface) {
- dbus_g_proxy_connect_signal (priv->avatars_iface,
- "AvatarUpdated",
- G_CALLBACK (tp_contact_list_avatar_update_cb),
- list, NULL);
- }
- if (priv->presence_iface) {
- dbus_g_proxy_connect_signal (priv->presence_iface,
- "PresenceUpdate",
- G_CALLBACK (tp_contact_list_presence_update_cb),
- list, NULL);
- }
-
- /* Get our own handle and contact */
- if (!tp_conn_get_self_handle (DBUS_G_PROXY (priv->tp_conn),
- &handle, &error)) {
- gossip_debug (DEBUG_DOMAIN, "GetSelfHandle Error: %s",
- error ? error->message : "No error given");
- g_clear_error (&error);
- } else {
- priv->user_contact = empathy_tp_contact_list_get_from_handle (list, handle);
- }
+ /* Give the ref to the callback */
+ tp_channel_call_when_ready (channel,
+ tp_contact_list_group_ready_cb,
+ list);
- return list;
+ return channel;
}
+typedef struct {
+ GArray *handles;
+ TpHandle channel_handle;
+ guint ref_count;
+} GroupAddData;
+
static void
-tp_contact_list_setup (EmpathyContactList *list)
+tp_contact_list_group_add_data_unref (gpointer user_data)
{
- EmpathyTpContactListPriv *priv;
- GPtrArray *channels;
- GError *error = NULL;
- guint i;
-
- g_return_if_fail (EMPATHY_IS_TP_CONTACT_LIST (list));
+ GroupAddData *data = user_data;
- priv = GET_PRIV (list);
-
- gossip_debug (DEBUG_DOMAIN, "setup contact list: %p", list);
-
- priv->setup = TRUE;
- dbus_g_proxy_connect_signal (DBUS_G_PROXY (priv->tp_conn), "NewChannel",
- G_CALLBACK (tp_contact_list_newchannel_cb),
- list, NULL);
-
- /* Get existing channels */
- if (!tp_conn_list_channels (DBUS_G_PROXY (priv->tp_conn),
- &channels,
- &error)) {
- gossip_debug (DEBUG_DOMAIN,
- "Failed to get list of open channels: %s",
- error ? error->message : "No error given");
- g_clear_error (&error);
- return;
+ if (--data->ref_count == 0) {
+ g_array_free (data->handles, TRUE);
+ g_slice_free (GroupAddData, data);
}
-
- for (i = 0; channels->len > i; i++) {
- GValueArray *chan_struct;
- const gchar *object_path;
- const gchar *chan_iface;
- TelepathyHandleType handle_type;
- guint handle;
-
- chan_struct = g_ptr_array_index (channels, i);
- object_path = g_value_get_boxed (g_value_array_get_nth (chan_struct, 0));
- chan_iface = g_value_get_string (g_value_array_get_nth (chan_struct, 1));
- handle_type = g_value_get_uint (g_value_array_get_nth (chan_struct, 2));
- handle = g_value_get_uint (g_value_array_get_nth (chan_struct, 3));
-
- tp_contact_list_newchannel_cb (DBUS_G_PROXY (priv->tp_conn),
- object_path, chan_iface,
- handle_type, handle,
- FALSE,
- EMPATHY_TP_CONTACT_LIST (list));
-
- g_value_array_free (chan_struct);
- }
-
- g_ptr_array_free (channels, TRUE);
-}
-
-static GossipContact *
-tp_contact_list_find (EmpathyContactList *list,
- const gchar *id)
-{
- EmpathyTpContactListPriv *priv;
-
- g_return_val_if_fail (EMPATHY_IS_TP_CONTACT_LIST (list), NULL);
-
- priv = GET_PRIV (list);
-
- return g_hash_table_find (priv->contacts,
- (GHRFunc) tp_contact_list_find_foreach,
- (gchar*) id);
}
static void
-tp_contact_list_add (EmpathyContactList *list,
- GossipContact *contact,
- const gchar *message)
+tp_contact_list_group_add_ready_cb (TpChannel *channel,
+ const GError *error,
+ gpointer user_data)
{
- EmpathyTpContactListPriv *priv;
- guint handle;
-
- g_return_if_fail (EMPATHY_IS_TP_CONTACT_LIST (list));
+ GroupAddData *data = user_data;
- priv = GET_PRIV (list);
+ if (error) {
+ tp_contact_list_group_add_data_unref (data);
+ return;
+ }
- handle = gossip_contact_get_handle (contact);
- gossip_telepathy_group_add_member (priv->subscribe, handle, message);
+ tp_cli_channel_interface_group_call_add_members (channel, -1,
+ data->handles, NULL, NULL, NULL, NULL, NULL);
+ tp_contact_list_group_add_data_unref (data);
}
static void
-tp_contact_list_remove (EmpathyContactList *list,
- GossipContact *contact,
- const gchar *message)
-{
- EmpathyTpContactListPriv *priv;
- guint handle;
-
- g_return_if_fail (EMPATHY_IS_TP_CONTACT_LIST (list));
-
- priv = GET_PRIV (list);
-
- handle = gossip_contact_get_handle (contact);
- gossip_telepathy_group_remove_member (priv->subscribe, handle, message);
- gossip_telepathy_group_remove_member (priv->publish, handle, message);
- gossip_telepathy_group_remove_member (priv->known, handle, message);
-}
-
-static GList *
-tp_contact_list_get_contacts (EmpathyContactList *list)
-{
- EmpathyTpContactListPriv *priv;
- GList *contacts = NULL;
-
- g_return_val_if_fail (EMPATHY_IS_TP_CONTACT_LIST (list), NULL);
-
- priv = GET_PRIV (list);
-
- /* FIXME: we should only return contacts that are in the contact list */
- g_hash_table_foreach (priv->contacts,
- (GHFunc) tp_contact_list_get_contacts_foreach,
- &contacts);
-
- return contacts;
-}
-
-McAccount *
-empathy_tp_contact_list_get_account (EmpathyTpContactList *list)
+tp_contact_list_group_request_channel_cb (TpConnection *connection,
+ const gchar *object_path,
+ const GError *error,
+ gpointer user_data,
+ GObject *list)
{
- EmpathyTpContactListPriv *priv;
+ GroupAddData *data = user_data;
+ TpChannel *channel;
- g_return_val_if_fail (EMPATHY_IS_TP_CONTACT_LIST (list), NULL);
-
- priv = GET_PRIV (list);
-
- return priv->account;
-}
-
-GossipContact *
-empathy_tp_contact_list_get_user (EmpathyTpContactList *list)
-{
- EmpathyTpContactListPriv *priv;
+ if (error) {
+ DEBUG ("Error: %s", error->message);
+ return;
+ }
- g_return_val_if_fail (EMPATHY_IS_TP_CONTACT_LIST (list), NULL);
+ channel = tp_contact_list_group_add_channel (EMPATHY_TP_CONTACT_LIST (list),
+ object_path,
+ TP_IFACE_CHANNEL_TYPE_CONTACT_LIST,
+ TP_HANDLE_TYPE_GROUP,
+ data->channel_handle);
- priv = GET_PRIV (list);
-
- return priv->user_contact;
+ data->ref_count++;
+ tp_channel_call_when_ready (channel,
+ tp_contact_list_group_add_ready_cb,
+ data);
}
-GossipContact *
-empathy_tp_contact_list_get_from_id (EmpathyTpContactList *list,
- const gchar *id)
+static void
+tp_contact_list_group_request_handles_cb (TpConnection *connection,
+ const GArray *handles,
+ const GError *error,
+ gpointer user_data,
+ GObject *list)
{
- EmpathyTpContactListPriv *priv;
- GossipContact *contact;
- const gchar *contact_ids[] = {id, NULL};
- GArray *handles;
- guint handle;
- GError *error = NULL;
-
- g_return_val_if_fail (EMPATHY_IS_TP_CONTACT_LIST (list), NULL);
- g_return_val_if_fail (id != NULL, NULL);
-
- priv = GET_PRIV (list);
-
- contact = tp_contact_list_find (EMPATHY_CONTACT_LIST (list), id);
- if (contact) {
- return contact;
- }
+ GroupAddData *data = user_data;
- /* The id is unknown, requests a new handle */
- if (!tp_conn_request_handles (DBUS_G_PROXY (priv->tp_conn),
- TP_HANDLE_TYPE_CONTACT,
- contact_ids,
- &handles, &error)) {
- gossip_debug (DEBUG_DOMAIN,
- "RequestHandle for %s failed: %s", id,
- error ? error->message : "No error given");
- g_clear_error (&error);
- return 0;
+ if (error) {
+ DEBUG ("Error: %s", error->message);
+ return;
}
- handle = g_array_index(handles, guint, 0);
- g_array_free (handles, TRUE);
-
- return empathy_tp_contact_list_get_from_handle (list, handle);
+ data->channel_handle = g_array_index (handles, TpHandle, 0);
+ data->ref_count++;
+ tp_cli_connection_call_request_channel (connection, -1,
+ TP_IFACE_CHANNEL_TYPE_CONTACT_LIST,
+ TP_HANDLE_TYPE_GROUP,
+ data->channel_handle,
+ TRUE,
+ tp_contact_list_group_request_channel_cb,
+ data, tp_contact_list_group_add_data_unref,
+ list);
}
-GossipContact *
-empathy_tp_contact_list_get_from_handle (EmpathyTpContactList *list,
- guint handle)
+static void
+tp_contact_list_group_add (EmpathyTpContactList *list,
+ const gchar *group_name,
+ GArray *handles)
{
- GossipContact *contact;
- GArray *handles;
- GList *contacts;
-
- g_return_val_if_fail (EMPATHY_IS_TP_CONTACT_LIST (list), NULL);
-
- handles = g_array_new (FALSE, FALSE, sizeof (guint));
- g_array_append_val (handles, handle);
-
- contacts = empathy_tp_contact_list_get_from_handles (list, handles);
- g_array_free (handles, TRUE);
-
- if (!contacts) {
- return NULL;
+ EmpathyTpContactListPriv *priv = GET_PRIV (list);
+ TpChannel *channel;
+ const gchar *names[] = {group_name, NULL};
+ GroupAddData *data;
+
+ channel = g_hash_table_lookup (priv->groups, group_name);
+ if (channel) {
+ tp_cli_channel_interface_group_call_add_members (channel, -1,
+ handles, NULL, NULL, NULL, NULL, NULL);
+ g_array_free (handles, TRUE);
+ return;
}
- contact = contacts->data;
- g_list_free (contacts);
-
- return contact;
+ data = g_slice_new0 (GroupAddData);
+ data->handles = handles;
+ data->ref_count = 1;
+ tp_cli_connection_call_request_handles (priv->connection, -1,
+ TP_HANDLE_TYPE_GROUP, names,
+ tp_contact_list_group_request_handles_cb,
+ data, tp_contact_list_group_add_data_unref,
+ G_OBJECT (list));
}
-GList *
-empathy_tp_contact_list_get_from_handles (EmpathyTpContactList *list,
- GArray *handles)
+static void
+tp_contact_list_got_added_members_cb (EmpathyTpContactFactory *factory,
+ guint n_contacts,
+ EmpathyContact * const * contacts,
+ guint n_failed,
+ const TpHandle *failed,
+ const GError *error,
+ gpointer user_data,
+ GObject *list)
{
- EmpathyTpContactListPriv *priv;
- gchar **handles_names;
- gchar **id;
- GArray *new_handles;
- GList *contacts = NULL;
- guint i;
- GError *error = NULL;
-
- g_return_val_if_fail (EMPATHY_IS_TP_CONTACT_LIST (list), NULL);
- g_return_val_if_fail (handles != NULL, NULL);
+ EmpathyTpContactListPriv *priv = GET_PRIV (list);
+ guint i;
- priv = GET_PRIV (list);
-
- /* Search all handles we already have */
- new_handles = g_array_new (FALSE, FALSE, sizeof (guint));
- for (i = 0; i < handles->len; i++) {
- GossipContact *contact;
- guint handle;
+ if (error) {
+ DEBUG ("Error: %s", error->message);
+ return;
+ }
- handle = g_array_index (handles, guint, i);
+ for (i = 0; i < n_contacts; i++) {
+ EmpathyContact *contact = contacts[i];
+ TpHandle handle;
- if (handle == 0) {
+ handle = empathy_contact_get_handle (contact);
+ if (g_hash_table_lookup (priv->members, GUINT_TO_POINTER (handle)))
continue;
- }
- contact = g_hash_table_lookup (priv->contacts,
- GUINT_TO_POINTER (handle));
+ /* Add to the list and emit signal */
+ g_hash_table_insert (priv->members, GUINT_TO_POINTER (handle),
+ g_object_ref (contact));
+ g_signal_emit_by_name (list, "members-changed", contact,
+ 0, 0, NULL, TRUE);
- if (contact) {
- contacts = g_list_prepend (contacts,
- g_object_ref (contact));
- } else {
- g_array_append_val (new_handles, handle);
- }
- }
+ /* This contact is now member, implicitly accept pending. */
+ if (g_hash_table_lookup (priv->pendings, GUINT_TO_POINTER (handle))) {
+ GArray handles = {(gchar*) &handle, 1};
- if (new_handles->len == 0) {
- g_array_free (new_handles, TRUE);
- return contacts;
+ tp_cli_channel_interface_group_call_add_members (priv->publish,
+ -1, &handles, NULL, NULL, NULL, NULL, NULL);
+ }
}
+}
- /* Holds all handles we don't have yet.
- * FIXME: We should release them at some point. */
- if (!tp_conn_hold_handles (DBUS_G_PROXY (priv->tp_conn),
- TP_HANDLE_TYPE_CONTACT,
- new_handles, &error)) {
- gossip_debug (DEBUG_DOMAIN,
- "HoldHandles Error: %s",
- error ? error->message : "No error given");
- g_clear_error (&error);
- g_array_free (new_handles, TRUE);
- return contacts;
- }
+static void
+tp_contact_list_got_local_pending_cb (EmpathyTpContactFactory *factory,
+ guint n_contacts,
+ EmpathyContact * const * contacts,
+ guint n_failed,
+ const TpHandle *failed,
+ const GError *error,
+ gpointer user_data,
+ GObject *list)
+{
+ EmpathyTpContactListPriv *priv = GET_PRIV (list);
+ guint i;
- /* Get the IDs of all new handles */
- if (!tp_conn_inspect_handles (DBUS_G_PROXY (priv->tp_conn),
- TP_HANDLE_TYPE_CONTACT,
- new_handles,
- &handles_names,
- &error)) {
- gossip_debug (DEBUG_DOMAIN,
- "InspectHandle Error: %s",
- error ? error->message : "No error given");
- g_clear_error (&error);
- g_array_free (new_handles, TRUE);
- return contacts;
+ if (error) {
+ DEBUG ("Error: %s", error->message);
+ return;
}
- /* Create contact objects */
- for (i = 0, id = handles_names; *id && i < new_handles->len; id++, i++) {
- GossipContact *contact;
- guint handle;
-
- handle = g_array_index (new_handles, guint, i);
- contact = g_object_new (GOSSIP_TYPE_CONTACT,
- "account", priv->account,
- "id", *id,
- "handle", handle,
- NULL);
-
- if (!priv->presence_iface) {
- GossipPresence *presence;
+ for (i = 0; i < n_contacts; i++) {
+ EmpathyContact *contact = contacts[i];
+ TpHandle handle;
+ const gchar *message;
+ TpChannelGroupChangeReason reason;
- /* We have no presence iface, set default presence
- * to available */
- presence = gossip_presence_new_full (MC_PRESENCE_AVAILABLE,
- NULL);
+ handle = empathy_contact_get_handle (contact);
+ if (g_hash_table_lookup (priv->members, GUINT_TO_POINTER (handle))) {
+ GArray handles = {(gchar*) &handle, 1};
- gossip_contact_set_presence (contact, presence);
- g_object_unref (presence);
+ /* This contact is already member, auto accept. */
+ tp_cli_channel_interface_group_call_add_members (priv->publish,
+ -1, &handles, NULL, NULL, NULL, NULL, NULL);
+ }
+ else if (tp_channel_group_get_local_pending_info (priv->publish,
+ handle,
+ NULL,
+ &reason,
+ &message)) {
+ /* Add contact to pendings */
+ g_hash_table_insert (priv->pendings, GUINT_TO_POINTER (handle),
+ g_object_ref (contact));
+ g_signal_emit_by_name (list, "pendings-changed", contact,
+ contact, reason, message, TRUE);
}
-
- g_signal_connect (contact, "notify::groups",
- G_CALLBACK (tp_contact_list_groups_updated_cb),
- list);
- g_signal_connect (contact, "notify::subscription",
- G_CALLBACK (tp_contact_list_subscription_updated_cb),
- list);
- g_signal_connect (contact, "notify::name",
- G_CALLBACK (tp_contact_list_name_updated_cb),
- list);
-
- gossip_debug (DEBUG_DOMAIN, "new contact created: %s (%d)",
- *id, handle);
-
- g_hash_table_insert (priv->contacts,
- GUINT_TO_POINTER (handle),
- contact);
-
- contacts = g_list_prepend (contacts, g_object_ref (contact));
}
-
- tp_contact_list_get_info (list, new_handles);
-
- g_array_free (new_handles, TRUE);
- g_strfreev (handles_names);
-
- return contacts;
}
-void
-empathy_tp_contact_list_rename_group (EmpathyTpContactList *list,
- const gchar *old_group,
- const gchar *new_group)
+static void
+tp_contact_list_remove_handle (EmpathyTpContactList *list,
+ GHashTable *table,
+ TpHandle handle)
{
- EmpathyTpContactListPriv *priv;
- GossipTelepathyGroup *group;
- GArray *members;
-
- g_return_if_fail (EMPATHY_IS_TP_CONTACT_LIST (list));
- g_return_if_fail (old_group != NULL);
- g_return_if_fail (new_group != NULL);
-
- priv = GET_PRIV (list);
-
- group = g_hash_table_find (priv->groups,
- (GHRFunc) tp_contact_list_find_group,
- (gchar*) old_group);
- if (!group) {
- /* The group doesn't exists on this account */
+ EmpathyTpContactListPriv *priv = GET_PRIV (list);
+ EmpathyContact *contact;
+ const gchar *signal;
+
+ if (table == priv->pendings)
+ signal = "pendings-changed";
+ else if (table == priv->members)
+ signal = "members-changed";
+ else
return;
- }
- gossip_debug (DEBUG_DOMAIN, "rename group %s to %s", group, new_group);
-
- /* Remove all members from the old group */
- members = gossip_telepathy_group_get_members (group);
- gossip_telepathy_group_remove_members (group, members, "");
- tp_contact_list_group_members_removed_cb (group, members,
- 0,
- TP_CHANNEL_GROUP_CHANGE_REASON_NONE,
- NULL, list);
- g_hash_table_remove (priv->groups,
- gossip_telepathy_group_get_object_path (group));
-
- /* Add all members to the new group */
- group = tp_contact_list_get_group (list, new_group);
- if (group) {
- gossip_telepathy_group_add_members (group, members, "");
+ contact = g_hash_table_lookup (table, GUINT_TO_POINTER (handle));
+ if (contact) {
+ g_object_ref (contact);
+ g_hash_table_remove (table, GUINT_TO_POINTER (handle));
+ g_signal_emit_by_name (list, signal, contact, 0, 0, NULL,
+ FALSE);
+ g_object_unref (contact);
}
}
-GList *
-empathy_tp_contact_list_get_groups (EmpathyTpContactList *list)
-{
- EmpathyTpContactListPriv *priv;
- GList *groups = NULL;
-
- g_return_val_if_fail (EMPATHY_IS_TP_CONTACT_LIST (list), NULL);
-
- priv = GET_PRIV (list);
-
- g_hash_table_foreach (priv->groups,
- (GHFunc) tp_contact_list_get_groups_foreach,
- &groups);
-
- groups = g_list_sort (groups, (GCompareFunc) strcmp);
-
- return groups;
-}
-
static void
-tp_contact_list_finalize_proxies (EmpathyTpContactList *list)
+tp_contact_list_publish_group_members_changed_cb (TpChannel *channel,
+ gchar *message,
+ GArray *added,
+ GArray *removed,
+ GArray *local_pending,
+ GArray *remote_pending,
+ TpHandle actor,
+ TpChannelGroupChangeReason reason,
+ EmpathyTpContactList *list)
{
- EmpathyTpContactListPriv *priv;
+ EmpathyTpContactListPriv *priv = GET_PRIV (list);
+ guint i;
- priv = GET_PRIV (list);
-
- if (priv->tp_conn) {
- g_signal_handlers_disconnect_by_func (priv->tp_conn,
- tp_contact_list_destroy_cb,
- list);
- dbus_g_proxy_disconnect_signal (DBUS_G_PROXY (priv->tp_conn), "NewChannel",
- G_CALLBACK (tp_contact_list_newchannel_cb),
- list);
- }
-
- if (priv->aliasing_iface) {
- dbus_g_proxy_disconnect_signal (priv->aliasing_iface,
- "AliasesChanged",
- G_CALLBACK (tp_contact_list_aliases_update_cb),
- list);
+ /* We now send our presence to those contacts, remove them from pendings */
+ for (i = 0; i < added->len; i++) {
+ tp_contact_list_remove_handle (list, priv->pendings,
+ g_array_index (added, TpHandle, i));
}
- if (priv->avatars_iface) {
- dbus_g_proxy_disconnect_signal (priv->avatars_iface,
- "AvatarUpdated",
- G_CALLBACK (tp_contact_list_avatar_update_cb),
- list);
+ /* We refuse to send our presence to those contacts, remove from pendings */
+ for (i = 0; i < removed->len; i++) {
+ tp_contact_list_remove_handle (list, priv->pendings,
+ g_array_index (added, TpHandle, i));
}
- if (priv->presence_iface) {
- dbus_g_proxy_disconnect_signal (priv->presence_iface,
- "PresenceUpdate",
- G_CALLBACK (tp_contact_list_presence_update_cb),
- list);
+ /* Those contacts want our presence, auto accept those that are already
+ * member, otherwise add in pendings. */
+ if (local_pending->len > 0) {
+ empathy_tp_contact_factory_get_from_handles (priv->factory,
+ local_pending->len, (TpHandle*) local_pending->data,
+ tp_contact_list_got_local_pending_cb, NULL, NULL,
+ G_OBJECT (list));
}
}
static void
-tp_contact_list_destroy_cb (DBusGProxy *proxy,
- EmpathyTpContactList *list)
+tp_contact_list_publish_request_channel_cb (TpConnection *connection,
+ const gchar *object_path,
+ const GError *error,
+ gpointer user_data,
+ GObject *list)
{
- EmpathyTpContactListPriv *priv;
-
- priv = GET_PRIV (list);
-
- gossip_debug (DEBUG_DOMAIN, "Connection destroyed... "
- "Account disconnected or CM crashed");
+ EmpathyTpContactListPriv *priv = GET_PRIV (list);
- /* DBus proxies should NOT be used anymore */
- g_object_unref (priv->tp_conn);
- priv->tp_conn = NULL;
- priv->aliasing_iface = NULL;
- priv->avatars_iface = NULL;
- priv->presence_iface = NULL;
+ if (error) {
+ DEBUG ("Error: %s", error->message);
+ return;
+ }
- /* Remove all contacts */
- g_hash_table_foreach (priv->contacts,
- (GHFunc) tp_contact_list_contact_removed_foreach,
- list);
- g_hash_table_remove_all (priv->contacts);
+ priv->publish = tp_channel_new (connection, object_path,
+ TP_IFACE_CHANNEL_TYPE_CONTACT_LIST,
+ TP_HANDLE_TYPE_LIST,
+ GPOINTER_TO_UINT (user_data),
+ NULL);
- /* Tell the world to not use us anymore */
- g_signal_emit (list, signals[DESTROY], 0);
+ /* TpChannel emits initial set of members just before being ready */
+ g_signal_connect (priv->publish, "group-members-changed",
+ G_CALLBACK (tp_contact_list_publish_group_members_changed_cb),
+ list);
}
static void
-tp_contact_list_contact_removed_foreach (guint handle,
- GossipContact *contact,
- EmpathyTpContactList *list)
+tp_contact_list_publish_request_handle_cb (TpConnection *connection,
+ const GArray *handles,
+ const GError *error,
+ gpointer user_data,
+ GObject *list)
{
- g_signal_handlers_disconnect_by_func (contact,
- tp_contact_list_groups_updated_cb,
- list);
- g_signal_handlers_disconnect_by_func (contact,
- tp_contact_list_subscription_updated_cb,
- list);
- g_signal_handlers_disconnect_by_func (contact,
- tp_contact_list_name_updated_cb,
- list);
+ TpHandle handle;
- g_signal_emit_by_name (list, "contact-removed", contact);
-}
+ if (error) {
+ DEBUG ("Error: %s", error->message);
+ return;
+ }
-static void
-tp_contact_list_block_contact (EmpathyTpContactList *list,
- GossipContact *contact)
-{
- g_signal_handlers_block_by_func (contact,
- tp_contact_list_groups_updated_cb,
- list);
- g_signal_handlers_block_by_func (contact,
- tp_contact_list_subscription_updated_cb,
- list);
- g_signal_handlers_block_by_func (contact,
- tp_contact_list_name_updated_cb,
- list);
+ handle = g_array_index (handles, TpHandle, 0);
+ tp_cli_connection_call_request_channel (connection, -1,
+ TP_IFACE_CHANNEL_TYPE_CONTACT_LIST,
+ TP_HANDLE_TYPE_LIST,
+ handle,
+ TRUE,
+ tp_contact_list_publish_request_channel_cb,
+ GUINT_TO_POINTER (handle), NULL,
+ list);
}
static void
-tp_contact_list_unblock_contact (EmpathyTpContactList *list,
- GossipContact *contact)
+tp_contact_list_subscribe_group_members_changed_cb (TpChannel *channel,
+ gchar *message,
+ GArray *added,
+ GArray *removed,
+ GArray *local_pending,
+ GArray *remote_pending,
+ guint actor,
+ guint reason,
+ EmpathyTpContactList *list)
{
- g_signal_handlers_unblock_by_func (contact,
- tp_contact_list_groups_updated_cb,
- list);
- g_signal_handlers_unblock_by_func (contact,
- tp_contact_list_subscription_updated_cb,
- list);
- g_signal_handlers_unblock_by_func (contact,
- tp_contact_list_name_updated_cb,
- list);
-}
+ EmpathyTpContactListPriv *priv = GET_PRIV (list);
+ guint i;
+
+ /* We now get the presence of those contacts, add them to members */
+ if (added->len > 0) {
+ empathy_tp_contact_factory_get_from_handles (priv->factory,
+ added->len, (TpHandle*) added->data,
+ tp_contact_list_got_added_members_cb, NULL, NULL,
+ G_OBJECT (list));
+ }
-static gboolean
-tp_contact_list_find_foreach (guint handle,
- GossipContact *contact,
- gchar *id)
-{
- if (strcmp (gossip_contact_get_id (contact), id) == 0) {
- return TRUE;
+ /* Those contacts refuse to send us their presence, remove from members. */
+ for (i = 0; i < removed->len; i++) {
+ tp_contact_list_remove_handle (list, priv->members,
+ g_array_index (added, TpHandle, i));
}
- return FALSE;
+ /* We want those contacts in our contact list but we don't get their
+ * presence yet. Add to members anyway. */
+ if (remote_pending->len > 0) {
+ empathy_tp_contact_factory_get_from_handles (priv->factory,
+ remote_pending->len, (TpHandle*) remote_pending->data,
+ tp_contact_list_got_added_members_cb, NULL, NULL,
+ G_OBJECT (list));
+ }
}
static void
-tp_contact_list_newchannel_cb (DBusGProxy *proxy,
- const gchar *object_path,
- const gchar *channel_type,
- TelepathyHandleType handle_type,
- guint channel_handle,
- gboolean suppress_handle,
- EmpathyTpContactList *list)
+tp_contact_list_subscribe_request_channel_cb (TpConnection *connection,
+ const gchar *object_path,
+ const GError *error,
+ gpointer user_data,
+ GObject *list)
{
- EmpathyTpContactListPriv *priv;
- GossipTelepathyGroup *group;
- TpChan *new_chan;
- const gchar *bus_name;
- GArray *members;
-
- priv = GET_PRIV (list);
+ EmpathyTpContactListPriv *priv = GET_PRIV (list);
- if (strcmp (channel_type, TP_IFACE_CHANNEL_TYPE_CONTACT_LIST) != 0 ||
- suppress_handle ||
- !priv->setup) {
+ if (error) {
+ DEBUG ("Error: %s", error->message);
return;
}
- bus_name = dbus_g_proxy_get_bus_name (DBUS_G_PROXY (priv->tp_conn));
- new_chan = tp_chan_new (tp_get_bus (),
- bus_name,
- object_path,
- channel_type, handle_type, channel_handle);
-
- if (handle_type == TP_HANDLE_TYPE_LIST) {
- TpContactListType list_type;
-
- list_type = tp_contact_list_get_type (list, new_chan);
- if (list_type == TP_CONTACT_LIST_TYPE_UNKNOWN) {
- gossip_debug (DEBUG_DOMAIN, "Unknown contact list channel");
- g_object_unref (new_chan);
- return;
- }
-
- gossip_debug (DEBUG_DOMAIN, "New contact list channel of type: %d",
- list_type);
-
- group = gossip_telepathy_group_new (new_chan, priv->tp_conn);
-
- switch (list_type) {
- case TP_CONTACT_LIST_TYPE_KNOWN:
- if (priv->known) {
- g_object_unref (priv->known);
- }
- priv->known = group;
- break;
- case TP_CONTACT_LIST_TYPE_PUBLISH:
- if (priv->publish) {
- g_object_unref (priv->publish);
- }
- priv->publish = group;
- break;
- case TP_CONTACT_LIST_TYPE_SUBSCRIBE:
- if (priv->subscribe) {
- g_object_unref (priv->subscribe);
- }
- priv->subscribe = group;
- break;
- default:
- g_assert_not_reached ();
- }
-
- /* Connect and setup the new contact-list group */
- if (list_type == TP_CONTACT_LIST_TYPE_KNOWN ||
- list_type == TP_CONTACT_LIST_TYPE_SUBSCRIBE) {
- g_signal_connect (group, "members-added",
- G_CALLBACK (tp_contact_list_contact_added_cb),
- list);
- g_signal_connect (group, "members-removed",
- G_CALLBACK (tp_contact_list_contact_removed_cb),
- list);
-
- members = gossip_telepathy_group_get_members (group);
- tp_contact_list_contact_added_cb (group, members, 0,
- TP_CHANNEL_GROUP_CHANGE_REASON_NONE,
- NULL, list);
- g_array_free (members, TRUE);
- }
- if (list_type == TP_CONTACT_LIST_TYPE_PUBLISH) {
- GList *members, *l;
- GArray *pending;
-
- g_signal_connect (group, "local-pending",
- G_CALLBACK (tp_contact_list_local_pending_cb),
- list);
-
- members = gossip_telepathy_group_get_local_pending_members_with_info (group);
- if (!members) {
- g_object_unref (new_chan);
- return;
- }
-
- pending = g_array_sized_new (FALSE, FALSE, sizeof (guint), 1);
- for (l = members; l; l = l->next) {
- GossipTpGroupInfo *info;
-
- info = l->data;
-
- g_array_insert_val (pending, 0, info->member);
- tp_contact_list_local_pending_cb (group, pending,
- info->actor,
- info->reason,
- info->message,
- list);
- }
-
- gossip_telepathy_group_info_list_free (members);
- g_array_free (pending, TRUE);
- }
- }
- else if (handle_type == TP_HANDLE_TYPE_GROUP) {
- const gchar *object_path;
-
- object_path = dbus_g_proxy_get_path (DBUS_G_PROXY (new_chan));
- if (g_hash_table_lookup (priv->groups, object_path)) {
- g_object_unref (new_chan);
- return;
- }
-
- group = gossip_telepathy_group_new (new_chan, priv->tp_conn);
-
- gossip_debug (DEBUG_DOMAIN, "New server-side group channel: %s",
- gossip_telepathy_group_get_name (group));
-
- dbus_g_proxy_connect_signal (DBUS_G_PROXY (new_chan), "Closed",
- G_CALLBACK
- (tp_contact_list_group_channel_closed_cb),
- list, NULL);
-
- g_hash_table_insert (priv->groups, g_strdup (object_path), group);
- g_signal_connect (group, "members-added",
- G_CALLBACK (tp_contact_list_group_members_added_cb),
- list);
- g_signal_connect (group, "members-removed",
- G_CALLBACK (tp_contact_list_group_members_removed_cb),
- list);
-
- members = gossip_telepathy_group_get_members (group);
- tp_contact_list_group_members_added_cb (group, members, 0,
- TP_CHANNEL_GROUP_CHANGE_REASON_NONE,
- NULL, list);
- g_array_free (members, TRUE);
- }
+ priv->subscribe = tp_channel_new (connection, object_path,
+ TP_IFACE_CHANNEL_TYPE_CONTACT_LIST,
+ TP_HANDLE_TYPE_LIST,
+ GPOINTER_TO_UINT (user_data),
+ NULL);
- g_object_unref (new_chan);
+ /* TpChannel emits initial set of members just before being ready */
+ g_signal_connect (priv->subscribe, "group-members-changed",
+ G_CALLBACK (tp_contact_list_subscribe_group_members_changed_cb),
+ list);
}
-static TpContactListType
-tp_contact_list_get_type (EmpathyTpContactList *list,
- TpChan *list_chan)
+static void
+tp_contact_list_subscribe_request_handle_cb (TpConnection *connection,
+ const GArray *handles,
+ const GError *error,
+ gpointer user_data,
+ GObject *list)
{
- EmpathyTpContactListPriv *priv;
- GArray *handles;
- gchar **handle_name;
- TpContactListType list_type;
- GError *error = NULL;
+ TpHandle handle;
- priv = GET_PRIV (list);
-
- handles = g_array_new (FALSE, FALSE, sizeof (guint));
- g_array_append_val (handles, list_chan->handle);
-
- if (!tp_conn_inspect_handles (DBUS_G_PROXY (priv->tp_conn),
- TP_HANDLE_TYPE_LIST,
- handles,
- &handle_name,
- &error)) {
- gossip_debug (DEBUG_DOMAIN,
- "InspectHandle Error: %s",
- error ? error->message : "No error given");
- g_clear_error (&error);
- g_array_free (handles, TRUE);
- return TP_CONTACT_LIST_TYPE_UNKNOWN;
- }
-
- if (strcmp (*handle_name, "subscribe") == 0) {
- list_type = TP_CONTACT_LIST_TYPE_SUBSCRIBE;
- } else if (strcmp (*handle_name, "publish") == 0) {
- list_type = TP_CONTACT_LIST_TYPE_PUBLISH;
- } else if (strcmp (*handle_name, "known") == 0) {
- list_type = TP_CONTACT_LIST_TYPE_KNOWN;
- } else {
- list_type = TP_CONTACT_LIST_TYPE_UNKNOWN;
+ if (error) {
+ DEBUG ("Error: %s", error->message);
+ return;
}
- g_strfreev (handle_name);
- g_array_free (handles, TRUE);
-
- return list_type;
+ handle = g_array_index (handles, TpHandle, 0);
+ tp_cli_connection_call_request_channel (connection, -1,
+ TP_IFACE_CHANNEL_TYPE_CONTACT_LIST,
+ TP_HANDLE_TYPE_LIST,
+ handle,
+ TRUE,
+ tp_contact_list_subscribe_request_channel_cb,
+ GUINT_TO_POINTER (handle), NULL,
+ list);
}
static void
-tp_contact_list_contact_added_cb (GossipTelepathyGroup *group,
- GArray *handles,
- guint actor_handle,
- guint reason,
- const gchar *message,
- EmpathyTpContactList *list)
+tp_contact_list_new_channel_cb (TpConnection *proxy,
+ const gchar *object_path,
+ const gchar *channel_type,
+ guint handle_type,
+ guint handle,
+ gboolean suppress_handler,
+ gpointer user_data,
+ GObject *list)
{
- EmpathyTpContactListPriv *priv;
- GList *added_list, *l;
-
- priv = GET_PRIV (list);
-
- added_list = empathy_tp_contact_list_get_from_handles (list, handles);
-
- for (l = added_list; l; l = l->next) {
- GossipContact *contact;
-
- contact = GOSSIP_CONTACT (l->data);
- tp_contact_list_block_contact (list, contact);
- gossip_contact_set_subscription (contact, GOSSIP_SUBSCRIPTION_BOTH);
- tp_contact_list_unblock_contact (list, contact);
-
- g_signal_emit_by_name (list, "contact-added", contact);
-
- g_object_unref (contact);
+ if (!suppress_handler) {
+ tp_contact_list_group_add_channel (EMPATHY_TP_CONTACT_LIST (list),
+ object_path, channel_type,
+ handle_type, handle);
}
-
- g_list_free (added_list);
}
static void
-tp_contact_list_contact_removed_cb (GossipTelepathyGroup *group,
- GArray *handles,
- guint actor_handle,
- guint reason,
- const gchar *message,
- EmpathyTpContactList *list)
+tp_contact_list_list_channels_cb (TpConnection *connection,
+ const GPtrArray *channels,
+ const GError *error,
+ gpointer user_data,
+ GObject *list)
{
- EmpathyTpContactListPriv *priv;
- GList *removed_list, *l;
-
- priv = GET_PRIV (list);
-
- removed_list = empathy_tp_contact_list_get_from_handles (list, handles);
+ guint i;
- for (l = removed_list; l; l = l->next) {
- GossipContact *contact;
- guint handle;
-
- contact = GOSSIP_CONTACT (l->data);
+ if (error) {
+ DEBUG ("Error: %s", error->message);
+ return;
+ }
- handle = gossip_contact_get_handle (contact);
- g_hash_table_remove (priv->contacts, GUINT_TO_POINTER (handle));
+ for (i = 0; i < channels->len; i++) {
+ GValueArray *chan_struct;
+ const gchar *object_path;
+ const gchar *channel_type;
+ TpHandleType handle_type;
+ guint handle;
- g_signal_emit_by_name (list, "contact-removed", contact);
+ chan_struct = g_ptr_array_index (channels, i);
+ object_path = g_value_get_boxed (g_value_array_get_nth (chan_struct, 0));
+ channel_type = g_value_get_string (g_value_array_get_nth (chan_struct, 1));
+ handle_type = g_value_get_uint (g_value_array_get_nth (chan_struct, 2));
+ handle = g_value_get_uint (g_value_array_get_nth (chan_struct, 3));
- g_object_unref (contact);
+ tp_contact_list_group_add_channel (EMPATHY_TP_CONTACT_LIST (list),
+ object_path, channel_type,
+ handle_type, handle);
}
-
- g_list_free (removed_list);
}
static void
-tp_contact_list_local_pending_cb (GossipTelepathyGroup *group,
- GArray *handles,
- guint actor_handle,
- guint reason,
- const gchar *message,
- EmpathyTpContactList *list)
+tp_contact_list_finalize (GObject *object)
{
EmpathyTpContactListPriv *priv;
- GList *pending_list, *l;
+ EmpathyTpContactList *list;
+ GHashTableIter iter;
+ gpointer channel;
+ list = EMPATHY_TP_CONTACT_LIST (object);
priv = GET_PRIV (list);
- pending_list = empathy_tp_contact_list_get_from_handles (list, handles);
+ DEBUG ("finalize: %p", object);
- for (l = pending_list; l; l = l->next) {
- GossipContact *contact;
+ if (priv->subscribe) {
+ g_object_unref (priv->subscribe);
+ }
+ if (priv->publish) {
+ g_object_unref (priv->publish);
+ }
- contact = GOSSIP_CONTACT (l->data);
+ if (priv->connection) {
+ g_object_unref (priv->connection);
+ }
- /* FIXME: Is that the correct way ? */
- tp_contact_list_block_contact (list, contact);
- gossip_contact_set_subscription (contact, GOSSIP_SUBSCRIPTION_FROM);
- tp_contact_list_unblock_contact (list, contact);
- g_signal_emit_by_name (list, "contact-added", contact);
+ if (priv->factory) {
+ g_object_unref (priv->factory);
+ }
- g_object_unref (contact);
+ g_hash_table_iter_init (&iter, priv->groups);
+ while (g_hash_table_iter_next (&iter, NULL, &channel)) {
+ g_signal_handlers_disconnect_by_func (channel,
+ tp_contact_list_group_invalidated_cb, list);
}
- g_list_free (pending_list);
+ g_hash_table_destroy (priv->groups);
+ g_hash_table_destroy (priv->members);
+ g_hash_table_destroy (priv->pendings);
+
+ G_OBJECT_CLASS (empathy_tp_contact_list_parent_class)->finalize (object);
}
static void
-tp_contact_list_groups_updated_cb (GossipContact *contact,
- GParamSpec *param,
- EmpathyTpContactList *list)
+tp_contact_list_constructed (GObject *list)
{
- EmpathyTpContactListPriv *priv;
- TpContactListData data;
- GList *groups, *l;
- priv = GET_PRIV (list);
+ EmpathyTpContactListPriv *priv = GET_PRIV (list);
+ gchar *protocol_name = NULL;
+ const gchar *names[] = {NULL, NULL};
+
+ priv->factory = empathy_tp_contact_factory_dup_singleton (priv->connection);
+
+ names[0] = "publish";
+ tp_cli_connection_call_request_handles (priv->connection,
+ -1,
+ TP_HANDLE_TYPE_LIST,
+ names,
+ tp_contact_list_publish_request_handle_cb,
+ NULL, NULL,
+ G_OBJECT (list));
+ names[0] = "subscribe";
+ tp_cli_connection_call_request_handles (priv->connection,
+ -1,
+ TP_HANDLE_TYPE_LIST,
+ names,
+ tp_contact_list_subscribe_request_handle_cb,
+ NULL, NULL,
+ G_OBJECT (list));
+
+ tp_cli_connection_call_list_channels (priv->connection, -1,
+ tp_contact_list_list_channels_cb,
+ NULL, NULL,
+ list);
- /* Make sure all groups are created */
- groups = gossip_contact_get_groups (contact);
- for (l = groups; l; l = l->next) {
- tp_contact_list_get_group (list, l->data);
+ tp_cli_connection_connect_to_new_channel (priv->connection,
+ tp_contact_list_new_channel_cb,
+ NULL, NULL,
+ list, NULL);
+
+ /* Check for protocols that does not support contact groups. We can
+ * put all contacts into a special group in that case.
+ * FIXME: Default group should be an information in the profile
+ * FIXME: replace with tp_connection_parse_object_path once released */
+ protocol_name = empathy_connection_get_protocol (priv->connection, NULL);
+ if (!tp_strdiff (protocol_name, "local-xmpp")) {
+ priv->protocol_group = _("People nearby");
}
-
- data.handle = gossip_contact_get_handle (contact);
- data.new_groups = groups;
-
- g_hash_table_foreach (priv->groups,
- (GHFunc) tp_contact_list_update_groups_foreach,
- &data);
+ g_free (protocol_name);
}
static void
-tp_contact_list_subscription_updated_cb (GossipContact *contact,
- GParamSpec *param,
- EmpathyTpContactList *list)
+tp_contact_list_get_property (GObject *object,
+ guint param_id,
+ GValue *value,
+ GParamSpec *pspec)
{
- EmpathyTpContactListPriv *priv;
- GossipSubscription subscription;
- guint handle;
-
- priv = GET_PRIV (list);
-
- subscription = gossip_contact_get_subscription (contact);
- handle = gossip_contact_get_handle (contact);
-
- /* FIXME: what to do here, I'm a bit lost... */
- if (subscription) {
- gossip_telepathy_group_add_member (priv->publish, handle, "");
- } else {
- gossip_telepathy_group_remove_member (priv->publish, handle, "");
- }
+ EmpathyTpContactListPriv *priv = GET_PRIV (object);
+
+ switch (param_id) {
+ case PROP_CONNECTION:
+ g_value_set_object (value, priv->connection);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
+ break;
+ };
}
static void
-tp_contact_list_name_updated_cb (GossipContact *contact,
- GParamSpec *param,
- EmpathyTpContactList *list)
+tp_contact_list_set_property (GObject *object,
+ guint param_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
- EmpathyTpContactListPriv *priv;
- GHashTable *new_alias;
- const gchar *new_name;
- guint handle;
- GError *error = NULL;
-
- priv = GET_PRIV (list);
-
- handle = gossip_contact_get_handle (contact);
- new_name = gossip_contact_get_name (contact);
-
- gossip_debug (DEBUG_DOMAIN, "renaming handle %d to %s",
- handle, new_name);
-
- new_alias = g_hash_table_new_full (g_direct_hash,
- g_direct_equal,
- NULL,
- g_free);
-
- g_hash_table_insert (new_alias,
- GUINT_TO_POINTER (handle),
- g_strdup (new_name));
-
- if (!tp_conn_iface_aliasing_set_aliases (priv->aliasing_iface,
- new_alias,
- &error)) {
- gossip_debug (DEBUG_DOMAIN,
- "Couldn't rename contact: %s",
- error ? error->message : "No error given");
- g_clear_error (&error);
- }
-
- g_hash_table_destroy (new_alias);
+ EmpathyTpContactListPriv *priv = GET_PRIV (object);
+
+ switch (param_id) {
+ case PROP_CONNECTION:
+ priv->connection = g_value_dup_object (value);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
+ break;
+ };
}
static void
-tp_contact_list_update_groups_foreach (gchar *object_path,
- GossipTelepathyGroup *group,
- TpContactListData *data)
+empathy_tp_contact_list_class_init (EmpathyTpContactListClass *klass)
{
- gboolean is_member;
- gboolean found = FALSE;
- const gchar *group_name;
- GList *l;
-
- is_member = gossip_telepathy_group_is_member (group, data->handle);
- group_name = gossip_telepathy_group_get_name (group);
-
- for (l = data->new_groups; l; l = l->next) {
- if (strcmp (group_name, l->data) == 0) {
- found = TRUE;
- break;
- }
- }
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
- if (is_member && !found) {
- /* We are no longer member of this group */
- gossip_debug (DEBUG_DOMAIN, "Contact %d removed from group '%s'",
- data->handle, group_name);
- gossip_telepathy_group_remove_member (group, data->handle, "");
- }
+ object_class->finalize = tp_contact_list_finalize;
+ object_class->constructed = tp_contact_list_constructed;
+ object_class->get_property = tp_contact_list_get_property;
+ object_class->set_property = tp_contact_list_set_property;
+
+ g_object_class_install_property (object_class,
+ PROP_CONNECTION,
+ g_param_spec_object ("connection",
+ "The Connection",
+ "The connection associated with the contact list",
+ TP_TYPE_CONNECTION,
+ G_PARAM_READWRITE |
+ G_PARAM_CONSTRUCT_ONLY));
- if (!is_member && found) {
- /* We are now member of this group */
- gossip_debug (DEBUG_DOMAIN, "Contact %d added to group '%s'",
- data->handle, group_name);
- gossip_telepathy_group_add_member (group, data->handle, "");
- }
+ g_type_class_add_private (object_class, sizeof (EmpathyTpContactListPriv));
}
-static GossipTelepathyGroup *
-tp_contact_list_get_group (EmpathyTpContactList *list,
- const gchar *name)
+static void
+empathy_tp_contact_list_init (EmpathyTpContactList *list)
{
- EmpathyTpContactListPriv *priv;
- GossipTelepathyGroup *group;
- TpChan *group_channel;
- GArray *handles;
- guint group_handle;
- char *group_object_path;
- const char *names[2] = {name, NULL};
- GError *error = NULL;
+ EmpathyTpContactListPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (list,
+ EMPATHY_TYPE_TP_CONTACT_LIST, EmpathyTpContactListPriv);
- priv = GET_PRIV (list);
+ list->priv = priv;
- group = g_hash_table_find (priv->groups,
- (GHRFunc) tp_contact_list_find_group,
- (gchar*) name);
- if (group) {
- return group;
- }
-
- gossip_debug (DEBUG_DOMAIN, "creating new group: %s", name);
-
- if (!tp_conn_request_handles (DBUS_G_PROXY (priv->tp_conn),
- TP_HANDLE_TYPE_GROUP,
- names,
- &handles,
- &error)) {
- gossip_debug (DEBUG_DOMAIN,
- "Couldn't request the creation of a new handle for group: %s",
- error ? error->message : "No error given");
- g_clear_error (&error);
- return NULL;
- }
- group_handle = g_array_index (handles, guint, 0);
- g_array_free (handles, TRUE);
-
- if (!tp_conn_request_channel (DBUS_G_PROXY (priv->tp_conn),
- TP_IFACE_CHANNEL_TYPE_CONTACT_LIST,
- TP_HANDLE_TYPE_GROUP,
- group_handle,
- FALSE,
- &group_object_path,
- &error)) {
- gossip_debug (DEBUG_DOMAIN,
- "Couldn't request the creation of a new group channel: %s",
- error ? error->message : "No error given");
- g_clear_error (&error);
- return NULL;
- }
-
- group_channel = tp_chan_new (tp_get_bus (),
- dbus_g_proxy_get_bus_name (DBUS_G_PROXY (priv->tp_conn)),
- group_object_path,
- TP_IFACE_CHANNEL_TYPE_CONTACT_LIST,
- TP_HANDLE_TYPE_GROUP,
- group_handle);
-
- dbus_g_proxy_connect_signal (DBUS_G_PROXY (group_channel),
- "Closed",
- G_CALLBACK
- (tp_contact_list_group_channel_closed_cb),
- list,
- NULL);
-
- group = gossip_telepathy_group_new (group_channel, priv->tp_conn);
- g_hash_table_insert (priv->groups, group_object_path, group);
- g_signal_connect (group, "members-added",
- G_CALLBACK (tp_contact_list_group_members_added_cb),
- list);
- g_signal_connect (group, "members-removed",
- G_CALLBACK (tp_contact_list_group_members_removed_cb),
- list);
-
- return group;
-}
+ /* Map group's name to group's channel */
+ priv->groups = g_hash_table_new_full (g_str_hash, g_str_equal,
+ NULL,
+ (GDestroyNotify) g_object_unref);
-static gboolean
-tp_contact_list_find_group (gchar *key,
- GossipTelepathyGroup *group,
- gchar *group_name)
-{
- if (strcmp (group_name, gossip_telepathy_group_get_name (group)) == 0) {
- return TRUE;
- }
+ /* Map contact's handle to EmpathyContact object */
+ priv->members = g_hash_table_new_full (g_direct_hash, g_direct_equal,
+ NULL,
+ (GDestroyNotify) g_object_unref);
- return FALSE;
+ /* Map contact's handle to EmpathyContact object */
+ priv->pendings = g_hash_table_new_full (g_direct_hash, g_direct_equal,
+ NULL,
+ (GDestroyNotify) g_object_unref);
}
-static void
-tp_contact_list_get_groups_foreach (gchar *key,
- GossipTelepathyGroup *group,
- GList **groups)
+EmpathyTpContactList *
+empathy_tp_contact_list_new (TpConnection *connection)
{
- const gchar *name;
-
- name = gossip_telepathy_group_get_name (group);
- *groups = g_list_append (*groups, g_strdup (name));
+ return g_object_new (EMPATHY_TYPE_TP_CONTACT_LIST,
+ "connection", connection,
+ NULL);
}
-static void
-tp_contact_list_group_channel_closed_cb (TpChan *channel,
- EmpathyTpContactList *list)
+TpConnection *
+empathy_tp_contact_list_get_connection (EmpathyTpContactList *list)
{
EmpathyTpContactListPriv *priv;
+ g_return_val_if_fail (EMPATHY_IS_TP_CONTACT_LIST (list), NULL);
+
priv = GET_PRIV (list);
- g_hash_table_remove (priv->groups,
- dbus_g_proxy_get_path (DBUS_G_PROXY (channel)));
+ return priv->connection;
}
static void
-tp_contact_list_group_members_added_cb (GossipTelepathyGroup *group,
- GArray *members,
- guint actor_handle,
- guint reason,
- const gchar *message,
- EmpathyTpContactList *list)
+tp_contact_list_add (EmpathyContactList *list,
+ EmpathyContact *contact,
+ const gchar *message)
{
- EmpathyTpContactListPriv *priv;
- GList *added_list, *l;
- const gchar *group_name;
-
- priv = GET_PRIV (list);
-
- group_name = gossip_telepathy_group_get_name (group);
- added_list = empathy_tp_contact_list_get_from_handles (list, members);
-
- for (l = added_list; l; l = l->next) {
- GossipContact *contact;
- GList *contact_groups;
-
- contact = GOSSIP_CONTACT (l->data);
- contact_groups = gossip_contact_get_groups (contact);
-
- /* FIXME: this leaks */
- if (!g_list_find_custom (contact_groups,
- group_name,
- (GCompareFunc) strcmp)) {
- gossip_debug (DEBUG_DOMAIN, "Contact %s added to group '%s'",
- gossip_contact_get_name (contact),
- group_name);
- contact_groups = g_list_append (contact_groups,
- g_strdup (group_name));
- tp_contact_list_block_contact (list, contact);
- gossip_contact_set_groups (contact, contact_groups);
- tp_contact_list_unblock_contact (list, contact);
- }
+ EmpathyTpContactListPriv *priv = GET_PRIV (list);
+ TpHandle handle;
+ GArray handles = {(gchar *) &handle, 1};
- g_object_unref (contact);
+ handle = empathy_contact_get_handle (contact);
+ if (priv->subscribe) {
+ tp_cli_channel_interface_group_call_add_members (priv->subscribe,
+ -1, &handles, message, NULL, NULL, NULL, NULL);
+ }
+ if (priv->publish &&
+ g_hash_table_lookup (priv->pendings, GUINT_TO_POINTER (handle))) {
+ tp_cli_channel_interface_group_call_add_members (priv->publish,
+ -1, &handles, message, NULL, NULL, NULL, NULL);
}
-
- g_list_free (added_list);
}
static void
-tp_contact_list_group_members_removed_cb (GossipTelepathyGroup *group,
- GArray *members,
- guint actor_handle,
- guint reason,
- const gchar *message,
- EmpathyTpContactList *list)
+tp_contact_list_remove (EmpathyContactList *list,
+ EmpathyContact *contact,
+ const gchar *message)
{
- EmpathyTpContactListPriv *priv;
- GList *removed_list, *l;
- const gchar *group_name;
+ EmpathyTpContactListPriv *priv = GET_PRIV (list);
+ TpHandle handle;
+ GArray handles = {(gchar *) &handle, 1};
- priv = GET_PRIV (list);
-
- group_name = gossip_telepathy_group_get_name (group);
- removed_list = empathy_tp_contact_list_get_from_handles (list, members);
-
- for (l = removed_list; l; l = l->next) {
- GossipContact *contact;
- GList *contact_groups;
- GList *to_remove;
-
- /* FIXME: Does it leak ? */
- contact = GOSSIP_CONTACT (l->data);
- contact_groups = gossip_contact_get_groups (contact);
- contact_groups = g_list_copy (contact_groups);
-
- to_remove = g_list_find_custom (contact_groups,
- group_name,
- (GCompareFunc) strcmp);
- if (to_remove) {
- gossip_debug (DEBUG_DOMAIN, "Contact %d removed from group '%s'",
- gossip_contact_get_handle (contact),
- group_name);
- contact_groups = g_list_remove_link (contact_groups,
- to_remove);
- tp_contact_list_block_contact (list, contact);
- gossip_contact_set_groups (contact, contact_groups);
- tp_contact_list_unblock_contact (list, contact);
- }
-
- g_list_free (contact_groups);
-
- g_object_unref (contact);
+ handle = empathy_contact_get_handle (contact);
+ if (priv->subscribe) {
+ tp_cli_channel_interface_group_call_remove_members (priv->subscribe,
+ -1, &handles, message, NULL, NULL, NULL, NULL);
+ }
+ if (priv->publish) {
+ tp_cli_channel_interface_group_call_remove_members (priv->publish,
+ -1, &handles, message, NULL, NULL, NULL, NULL);
}
-
- g_list_free (removed_list);
}
-static void
-tp_contact_list_get_contacts_foreach (guint handle,
- GossipContact *contact,
- GList **contacts)
+static GList *
+tp_contact_list_get_members (EmpathyContactList *list)
{
- *contacts = g_list_append (*contacts, g_object_ref (contact));
+ EmpathyTpContactListPriv *priv = GET_PRIV (list);
+ GList *ret;
+
+ ret = g_hash_table_get_values (priv->members);
+ g_list_foreach (ret, (GFunc) g_object_ref, NULL);
+ return ret;
}
-static void
-tp_contact_list_get_info (EmpathyTpContactList *list,
- GArray *handles)
+static GList *
+tp_contact_list_get_pendings (EmpathyContactList *list)
{
- EmpathyTpContactListPriv *priv;
- GError *error = NULL;
+ EmpathyTpContactListPriv *priv = GET_PRIV (list);
+ GList *ret;
- priv = GET_PRIV (list);
-
- if (priv->presence_iface) {
- /* FIXME: We should use GetPresence instead */
- if (!tp_conn_iface_presence_request_presence (priv->presence_iface,
- handles, &error)) {
- gossip_debug (DEBUG_DOMAIN,
- "Could not request presences: %s",
- error ? error->message : "No error given");
- g_clear_error (&error);
- }
- }
-
- if (priv->aliasing_iface) {
- TpContactListAliasesRequestData *data;
+ ret = g_hash_table_get_values (priv->pendings);
+ g_list_foreach (ret, (GFunc) g_object_ref, NULL);
+ return ret;
+}
- data = g_slice_new (TpContactListAliasesRequestData);
- data->list = list;
- data->handles = g_memdup (handles->data, handles->len * sizeof (guint));
+static GList *
+tp_contact_list_get_all_groups (EmpathyContactList *list)
+{
+ EmpathyTpContactListPriv *priv = GET_PRIV (list);
+ GList *ret, *l;
- tp_conn_iface_aliasing_request_aliases_async (priv->aliasing_iface,
- handles,
- (tp_conn_iface_aliasing_request_aliases_reply)
- tp_contact_list_request_aliases_cb,
- data);
+ ret = g_hash_table_get_keys (priv->groups);
+ for (l = ret; l; l = l->next) {
+ l->data = g_strdup (l->data);
}
- if (priv->avatars_iface) {
- guint i;
+ if (priv->protocol_group) {
+ ret = g_list_prepend (ret, g_strdup (priv->protocol_group));
+ }
- for (i = 0; i < handles->len; i++) {
- guint handle;
+ return ret;
+}
- handle = g_array_index (handles, gint, i);
- tp_contact_list_request_avatar (list, handle);
+static GList *
+tp_contact_list_get_groups (EmpathyContactList *list,
+ EmpathyContact *contact)
+{
+ EmpathyTpContactListPriv *priv = GET_PRIV (list);
+ GList *ret = NULL;
+ GHashTableIter iter;
+ gpointer group_name;
+ gpointer channel;
+ TpHandle handle;
+
+ handle = empathy_contact_get_handle (contact);
+ g_hash_table_iter_init (&iter, priv->groups);
+ while (g_hash_table_iter_next (&iter, &group_name, &channel)) {
+ const TpIntSet *members;
+
+ members = tp_channel_group_get_members (channel);
+ if (tp_intset_is_member (members, handle)) {
+ ret = g_list_prepend (ret, g_strdup (group_name));
}
}
-}
-static void
-tp_contact_list_request_avatar (EmpathyTpContactList *list,
- guint handle)
-{
- EmpathyTpContactListPriv *priv;
+ if (priv->protocol_group) {
+ ret = g_list_prepend (ret, g_strdup (priv->protocol_group));
+ }
- priv = GET_PRIV (list);
-
- /* We queue avatar requests to not send too many dbus async
- * calls at once. If we don't we reach the dbus's limit of
- * pending calls */
- priv->avatar_requests_queue = g_list_append (priv->avatar_requests_queue,
- GUINT_TO_POINTER (handle));
- tp_contact_list_start_avatar_requests (list);
+ return ret;
}
static void
-tp_contact_list_start_avatar_requests (EmpathyTpContactList *list)
+tp_contact_list_add_to_group (EmpathyContactList *list,
+ EmpathyContact *contact,
+ const gchar *group_name)
{
- EmpathyTpContactListPriv *priv;
- TpContactListAvatarRequestData *data;
+ TpHandle handle;
+ GArray *handles;
- priv = GET_PRIV (list);
-
- while (n_avatar_requests < MAX_AVATAR_REQUESTS &&
- priv->avatar_requests_queue) {
- data = g_slice_new (TpContactListAvatarRequestData);
- data->list = list;
- data->handle = GPOINTER_TO_UINT (priv->avatar_requests_queue->data);
-
- n_avatar_requests++;
- priv->avatar_requests_queue = g_list_remove (priv->avatar_requests_queue,
- priv->avatar_requests_queue->data);
-
- tp_conn_iface_avatars_request_avatar_async (priv->avatars_iface,
- data->handle,
- (tp_conn_iface_avatars_request_avatar_reply)
- tp_contact_list_request_avatar_cb,
- data);
- }
+ handle = empathy_contact_get_handle (contact);
+ handles = g_array_sized_new (FALSE, FALSE, sizeof (TpHandle), 1);
+ g_array_append_val (handles, handle);
+ tp_contact_list_group_add (EMPATHY_TP_CONTACT_LIST (list),
+ group_name, handles);
}
static void
-tp_contact_list_avatar_update_cb (DBusGProxy *proxy,
- guint handle,
- gchar *new_token,
- EmpathyTpContactList *list)
+tp_contact_list_remove_from_group (EmpathyContactList *list,
+ EmpathyContact *contact,
+ const gchar *group_name)
{
- EmpathyTpContactListPriv *priv;
-
- priv = GET_PRIV (list);
+ EmpathyTpContactListPriv *priv = GET_PRIV (list);
+ TpChannel *channel;
+ TpHandle handle;
+ GArray handles = {(gchar *) &handle, 1};
- if (!g_hash_table_lookup (priv->contacts, GUINT_TO_POINTER (handle))) {
- /* We don't know this contact, skip */
+ channel = g_hash_table_lookup (priv->groups, group_name);
+ if (channel == NULL) {
return;
}
- gossip_debug (DEBUG_DOMAIN, "Changing avatar for %d to %s",
- handle, new_token);
+ handle = empathy_contact_get_handle (contact);
+ DEBUG ("remove contact %s (%d) from group %s",
+ empathy_contact_get_id (contact), handle, group_name);
- tp_contact_list_request_avatar (list, handle);
+ tp_cli_channel_interface_group_call_remove_members (channel, -1,
+ &handles, NULL, NULL, NULL, NULL, NULL);
}
static void
-tp_contact_list_request_avatar_cb (DBusGProxy *proxy,
- GArray *avatar_data,
- gchar *mime_type,
- GError *error,
- TpContactListAvatarRequestData *data)
+tp_contact_list_rename_group (EmpathyContactList *list,
+ const gchar *old_group_name,
+ const gchar *new_group_name)
{
- GossipContact *contact;
-
- contact = empathy_tp_contact_list_get_from_handle (data->list, data->handle);
+ EmpathyTpContactListPriv *priv = GET_PRIV (list);
+ TpChannel *channel;
+ const TpIntSet *members;
+ GArray *handles;
- if (error) {
- gossip_debug (DEBUG_DOMAIN, "Error requesting avatar for %s: %s",
- gossip_contact_get_name (contact),
- error ? error->message : "No error given");
- } else {
- GossipAvatar *avatar;
-
- avatar = gossip_avatar_new (avatar_data->data,
- avatar_data->len,
- mime_type);
- tp_contact_list_block_contact (data->list, contact);
- gossip_contact_set_avatar (contact, avatar);
- tp_contact_list_unblock_contact (data->list, contact);
- gossip_avatar_unref (avatar);
+ channel = g_hash_table_lookup (priv->groups, old_group_name);
+ if (channel == NULL) {
+ return;
}
- n_avatar_requests--;
- tp_contact_list_start_avatar_requests (data->list);
-
- g_object_unref (contact);
- g_slice_free (TpContactListAvatarRequestData, data);
-}
-
-static void
-tp_contact_list_aliases_update_cb (DBusGProxy *proxy,
- GPtrArray *renamed_handlers,
- EmpathyTpContactList *list)
-{
- EmpathyTpContactListPriv *priv;
- guint i;
-
- priv = GET_PRIV (list);
-
- for (i = 0; renamed_handlers->len > i; i++) {
- guint handle;
- const gchar *alias;
- GValueArray *renamed_struct;
- GossipContact *contact;
+ DEBUG ("rename group %s to %s", old_group_name, new_group_name);
- renamed_struct = g_ptr_array_index (renamed_handlers, i);
- handle = g_value_get_uint(g_value_array_get_nth (renamed_struct, 0));
- alias = g_value_get_string(g_value_array_get_nth (renamed_struct, 1));
+ /* Remove all members and close the old channel */
+ members = tp_channel_group_get_members (channel);
+ handles = tp_intset_to_array (members);
+ tp_cli_channel_interface_group_call_remove_members (channel, -1,
+ handles, NULL, NULL, NULL, NULL, NULL);
+ tp_cli_channel_call_close (channel, -1, NULL, NULL, NULL, NULL);
- if (!g_hash_table_lookup (priv->contacts, GUINT_TO_POINTER (handle))) {
- /* We don't know this contact, skip */
- continue;
- }
-
- if (G_STR_EMPTY (alias)) {
- alias = NULL;
- }
-
- contact = empathy_tp_contact_list_get_from_handle (list, handle);
- tp_contact_list_block_contact (list, contact);
- gossip_contact_set_name (contact, alias);
- tp_contact_list_unblock_contact (list, contact);
- g_object_unref (contact);
-
- gossip_debug (DEBUG_DOMAIN, "contact %d renamed to %s (update cb)",
- handle, alias);
- }
+ tp_contact_list_group_add (EMPATHY_TP_CONTACT_LIST (list),
+ new_group_name, handles);
}
static void
-tp_contact_list_request_aliases_cb (DBusGProxy *proxy,
- gchar **contact_names,
- GError *error,
- TpContactListAliasesRequestData *data)
+tp_contact_list_remove_group (EmpathyContactList *list,
+ const gchar *group_name)
{
- guint i = 0;
- gchar **name;
+ EmpathyTpContactListPriv *priv = GET_PRIV (list);
+ TpChannel *channel;
+ const TpIntSet *members;
+ GArray *handles;
- if (error) {
- gossip_debug (DEBUG_DOMAIN, "Error requesting aliases: %s",
- error->message);
+ channel = g_hash_table_lookup (priv->groups, group_name);
+ if (channel == NULL) {
+ return;
}
- for (name = contact_names; *name && !error; name++) {
- GossipContact *contact;
-
- contact = empathy_tp_contact_list_get_from_handle (data->list,
- data->handles[i]);
- tp_contact_list_block_contact (data->list, contact);
- gossip_contact_set_name (contact, *name);
- tp_contact_list_unblock_contact (data->list, contact);
- g_object_unref (contact);
-
- gossip_debug (DEBUG_DOMAIN, "contact %d renamed to %s (request cb)",
- data->handles[i], *name);
-
- i++;
- }
+ DEBUG ("remove group %s", group_name);
- g_free (data->handles);
- g_slice_free (TpContactListAliasesRequestData, data);
+ /* Remove all members and close the channel */
+ members = tp_channel_group_get_members (channel);
+ handles = tp_intset_to_array (members);
+ tp_cli_channel_interface_group_call_remove_members (channel, -1,
+ handles, NULL, NULL, NULL, NULL, NULL);
+ tp_cli_channel_call_close (channel, -1, NULL, NULL, NULL, NULL);
+ g_array_free (handles, TRUE);
}
static void
-tp_contact_list_presence_update_cb (DBusGProxy *proxy,
- GHashTable *handle_table,
- EmpathyTpContactList *list)
+tp_contact_list_iface_init (EmpathyContactListIface *iface)
{
- g_hash_table_foreach (handle_table,
- (GHFunc) tp_contact_list_parse_presence_foreach,
- list);
+ iface->add = tp_contact_list_add;
+ iface->remove = tp_contact_list_remove;
+ iface->get_members = tp_contact_list_get_members;
+ iface->get_pendings = tp_contact_list_get_pendings;
+ iface->get_all_groups = tp_contact_list_get_all_groups;
+ iface->get_groups = tp_contact_list_get_groups;
+ iface->add_to_group = tp_contact_list_add_to_group;
+ iface->remove_from_group = tp_contact_list_remove_from_group;
+ iface->rename_group = tp_contact_list_rename_group;
+ iface->remove_group = tp_contact_list_remove_group;
}
-static void
-tp_contact_list_parse_presence_foreach (guint handle,
- GValueArray *presence_struct,
- EmpathyTpContactList *list)
+gboolean
+empathy_tp_contact_list_can_add (EmpathyTpContactList *list)
{
EmpathyTpContactListPriv *priv;
- GHashTable *presences_table;
- GossipContact *contact;
- GossipPresence *presence = NULL;
-
- priv = GET_PRIV (list);
-
- if (!g_hash_table_lookup (priv->contacts, GUINT_TO_POINTER (handle))) {
- /* We don't know this contact, skip */
- return;
- }
-
- contact = empathy_tp_contact_list_get_from_handle (list, handle);
- presences_table = g_value_get_boxed (g_value_array_get_nth (presence_struct, 1));
+ TpChannelGroupFlags flags;
- g_hash_table_foreach (presences_table,
- (GHFunc) tp_contact_list_presences_table_foreach,
- &presence);
+ g_return_val_if_fail (EMPATHY_IS_TP_CONTACT_LIST (list), FALSE);
- gossip_debug (DEBUG_DOMAIN, "Presence changed for %s (%d) to %s (%d)",
- gossip_contact_get_name (contact),
- handle,
- presence ? gossip_presence_get_status (presence) : "unset",
- presence ? gossip_presence_get_state (presence) : MC_PRESENCE_UNSET);
+ priv = GET_PRIV (list);
- tp_contact_list_block_contact (list, contact);
- gossip_contact_set_presence (contact, presence);
- tp_contact_list_unblock_contact (list, contact);
+ if (priv->subscribe == NULL)
+ return FALSE;
- g_object_unref (contact);
+ flags = tp_channel_group_get_flags (priv->subscribe);
+ return (flags & TP_CHANNEL_GROUP_FLAG_CAN_ADD) != 0;
}
-static void
-tp_contact_list_presences_table_foreach (const gchar *state_str,
- GHashTable *presences_table,
- GossipPresence **presence)
+void
+empathy_tp_contact_list_remove_all (EmpathyTpContactList *list)
{
- McPresence state;
- const GValue *message;
-
- state = gossip_presence_state_from_str (state_str);
- if ((state == MC_PRESENCE_UNSET) || (state == MC_PRESENCE_OFFLINE)) {
- return;
- }
+ EmpathyTpContactListPriv *priv = GET_PRIV (list);
+ GHashTableIter iter;
+ gpointer contact;
- if (*presence) {
- g_object_unref (*presence);
- *presence = NULL;
- }
-
- *presence = gossip_presence_new ();
- gossip_presence_set_state (*presence, state);
+ g_return_if_fail (EMPATHY_IS_TP_CONTACT_LIST (list));
- message = g_hash_table_lookup (presences_table, "message");
- if (message != NULL) {
- gossip_presence_set_status (*presence,
- g_value_get_string (message));
+ /* Remove all contacts */
+ g_hash_table_iter_init (&iter, priv->members);
+ while (g_hash_table_iter_next (&iter, NULL, &contact)) {
+ g_signal_emit_by_name (list, "members-changed", contact,
+ NULL, 0, NULL,
+ FALSE);
}
-}
+ g_hash_table_remove_all (priv->members);
-static void
-tp_contact_list_status_changed_cb (MissionControl *mc,
- TelepathyConnectionStatus status,
- McPresence presence,
- TelepathyConnectionStatusReason reason,
- const gchar *unique_name,
- EmpathyTpContactList *list)
-{
- EmpathyTpContactListPriv *priv;
- McAccount *account;
-
- priv = GET_PRIV (list);
-
- account = mc_account_lookup (unique_name);
- if (status != TP_CONN_STATUS_DISCONNECTED ||
- !gossip_account_equal (account, priv->account) ||
- !priv->tp_conn) {
- g_object_unref (account);
- return;
+ g_hash_table_iter_init (&iter, priv->pendings);
+ while (g_hash_table_iter_next (&iter, NULL, &contact)) {
+ g_signal_emit_by_name (list, "pendings-changed", contact,
+ NULL, 0, NULL,
+ FALSE);
}
-
- /* We are disconnected, do just like if the connection was destroyed */
- g_signal_handlers_disconnect_by_func (priv->tp_conn,
- tp_contact_list_destroy_cb,
- list);
- tp_contact_list_destroy_cb (DBUS_G_PROXY (priv->tp_conn), list);
-
- g_object_unref (account);
+ g_hash_table_remove_all (priv->pendings);
}
projects / empathy.git / blobdiff