#include <telepathy-glib/dbus.h>
#include <telepathy-glib/interfaces.h>
+#include <extensions/extensions.h>
+
#include "empathy-tp-contact-list.h"
#include "empathy-tp-contact-factory.h"
#include "empathy-contact-list.h"
#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyTpContactList)
typedef struct {
- EmpathyTpContactFactory *factory;
TpConnection *connection;
TpChannel *publish;
g_object_unref (old_group);
}
+ /* Pass the reference on the TpChannel to priv->groups */
g_hash_table_insert (priv->groups, (gpointer) group_name, channel);
DEBUG ("Group %s added", group_name);
static void
tp_contact_list_group_add_channel (EmpathyTpContactList *list,
const gchar *object_path,
- const gchar *channel_type,
- TpHandleType handle_type,
- guint handle)
+ GHashTable *properties)
{
EmpathyTpContactListPriv *priv = GET_PRIV (list);
TpChannel *channel;
+ GError *error = NULL;
- /* Only accept server-side contact groups */
- if (tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_CONTACT_LIST) ||
- handle_type != TP_HANDLE_TYPE_GROUP) {
+ channel = tp_channel_new_from_properties (priv->connection,
+ object_path, properties, &error);
+ if (channel == NULL) {
+ DEBUG ("Failed to create group channel: %s", error->message);
+ g_error_free (error);
return;
}
- channel = tp_channel_new (priv->connection,
- object_path, channel_type,
- handle_type, handle, NULL);
-
/* Give the ref to the callback */
tp_channel_call_when_ready (channel,
tp_contact_list_group_ready_cb,
}
static void
-got_added_members_cb (EmpathyTpContactFactory *factory,
+got_added_members_cb (TpConnection *connection,
guint n_contacts,
EmpathyContact * const * contacts,
guint n_failed,
}
if (request->len > 0) {
- empathy_tp_contact_factory_get_from_handles (priv->factory,
+ empathy_tp_contact_factory_get_from_handles (priv->connection,
request->len, (TpHandle *) request->data,
got_added_members_cb, NULL, NULL, G_OBJECT (list));
}
}
static void
-tp_contact_list_got_local_pending_cb (EmpathyTpContactFactory *factory,
+tp_contact_list_got_local_pending_cb (TpConnection *connection,
guint n_contacts,
EmpathyContact * const * contacts,
guint n_failed,
TpHandle handle;
const gchar *message;
TpChannelGroupChangeReason reason;
+ const TpIntSet *members, *remote_pending;
handle = empathy_contact_get_handle (contact);
- if (g_hash_table_lookup (priv->members, GUINT_TO_POINTER (handle))) {
+ members = tp_channel_group_get_members (priv->subscribe);
+ remote_pending = tp_channel_group_get_remote_pending (priv->subscribe);
+
+ if (tp_intset_is_member (members, handle) ||
+ tp_intset_is_member (remote_pending, handle)) {
GArray handles = {(gchar *) &handle, 1};
- /* This contact is already member, auto accept. */
+ /* This contact is already subscribed, or user requested
+ * to subscribe, auto accept. */
tp_cli_channel_interface_group_call_add_members (priv->publish,
-1, &handles, NULL, NULL, NULL, NULL, NULL);
}
/* 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,
+ empathy_tp_contact_factory_get_from_handles (priv->connection,
local_pending->len, (TpHandle *) local_pending->data,
tp_contact_list_got_local_pending_cb, NULL, NULL,
G_OBJECT (list));
add_to_members (list, remote_pending);
/* Implicitly accept pending request of contacts which are now members. */
+ if (priv->publish == NULL)
+ return;
+
accept = g_array_new (FALSE, FALSE, sizeof (TpHandle));
for (i = 0; i < added->len; i++) {
TpHandle handle = g_array_index (added, TpHandle, i);
g_object_unref (priv->connection);
}
- if (priv->factory) {
- g_object_unref (priv->factory);
- }
-
g_hash_table_iter_init (&iter, priv->groups);
while (g_hash_table_iter_next (&iter, NULL, &channel)) {
g_signal_handlers_disconnect_by_func (channel,
}
static void
-new_channels_cb (TpConnection *conn,
- const GPtrArray *channels,
- gpointer user_data,
- GObject *weak_object)
+iterate_on_channels (EmpathyTpContactList *list,
+ const GPtrArray *channels)
{
- EmpathyTpContactList *list = EMPATHY_TP_CONTACT_LIST (weak_object);
guint i;
for (i = 0; i < channels->len ; i++) {
GValueArray *arr = g_ptr_array_index (channels, i);
const gchar *path;
GHashTable *properties;
- TpChannel *channel;
TpHandleType handle_type;
path = g_value_get_boxed (g_value_array_get_nth (arr, 0));
if (tp_strdiff (tp_asv_get_string (properties,
TP_IFACE_CHANNEL ".ChannelType"),
TP_IFACE_CHANNEL_TYPE_CONTACT_LIST))
- return;
+ continue;
if (tp_asv_get_string (properties, TP_IFACE_CHANNEL ".TargetID") == NULL)
- return;
+ continue;
handle_type = tp_asv_get_uint32 (properties,
TP_IFACE_CHANNEL ".TargetHandleType", NULL);
- if (handle_type == TP_HANDLE_TYPE_LIST) {
- channel = tp_channel_new_from_properties (conn, path,
- properties, NULL);
- got_list_channel (list, channel);
- g_object_unref (channel);
- }
- else if (handle_type == TP_HANDLE_TYPE_GROUP) {
- TpHandle handle;
-
- handle = tp_asv_get_uint32 (properties,
- TP_IFACE_CHANNEL ".TargetHandle", NULL);
- if (handle == 0)
- return;
+ if (handle_type != TP_HANDLE_TYPE_GROUP)
+ continue;
- tp_contact_list_group_add_channel (list,
- path, TP_IFACE_CHANNEL_TYPE_CONTACT_LIST,
- TP_HANDLE_TYPE_GROUP, handle);
- }
+ tp_contact_list_group_add_channel (list, path, properties);
}
}
+static void
+new_channels_cb (TpConnection *conn,
+ const GPtrArray *channels,
+ gpointer user_data,
+ GObject *weak_object)
+{
+ EmpathyTpContactList *list = EMPATHY_TP_CONTACT_LIST (weak_object);
+
+ iterate_on_channels (list, channels);
+}
+
static void
got_channels_cb (TpProxy *conn,
const GValue *out,
GObject *weak_object)
{
EmpathyTpContactList *list = EMPATHY_TP_CONTACT_LIST (weak_object);
- guint i;
const GPtrArray *channels;
if (error != NULL) {
}
channels = g_value_get_boxed (out);
- for (i = 0; i < channels->len ; i++) {
- GValueArray *arr = g_ptr_array_index (channels, i);
- const gchar *path;
- GHashTable *properties;
- TpHandle handle;
-
- path = g_value_get_boxed (g_value_array_get_nth (arr, 0));
- properties = g_value_get_boxed (g_value_array_get_nth (arr, 1));
-
- if (tp_strdiff (tp_asv_get_string (properties,
- TP_IFACE_CHANNEL ".ChannelType"),
- TP_IFACE_CHANNEL_TYPE_CONTACT_LIST))
- continue;
-
- if (tp_asv_get_uint32 (properties,
- TP_IFACE_CHANNEL ".TargetHandleType", NULL) != TP_HANDLE_TYPE_GROUP)
- continue;
-
- handle = tp_asv_get_uint32 (properties, TP_IFACE_CHANNEL ".TargetHandle",
- NULL);
- if (handle == 0)
- continue;
-
- tp_contact_list_group_add_channel (list,
- path, TP_IFACE_CHANNEL_TYPE_CONTACT_LIST,
- TP_HANDLE_TYPE_GROUP, handle);
- }
+ iterate_on_channels (list, channels);
}
static void
NULL, NULL, G_OBJECT (list));
request = tp_asv_new (
- TP_IFACE_CHANNEL ".ChannelType", G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_CONTACT_LIST,
- TP_IFACE_CHANNEL ".TargetHandleType", G_TYPE_UINT, TP_HANDLE_TYPE_LIST,
+ TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_CONTACT_LIST,
+ TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_HANDLE_TYPE_LIST,
NULL);
/* Watch the NewChannels signal so if ensuring list channels fails (for
priv->connection, new_channels_cb, NULL, NULL, G_OBJECT (list), NULL);
/* Request the 'stored' list. */
- tp_asv_set_static_string (request, TP_IFACE_CHANNEL ".TargetID", "stored");
+ tp_asv_set_static_string (request, TP_PROP_CHANNEL_TARGET_ID, "stored");
tp_cli_connection_interface_requests_call_ensure_channel (priv->connection,
- -1, request, list_ensure_channel_cb, list, NULL, G_OBJECT (list));
+ G_MAXINT, request, list_ensure_channel_cb, list, NULL, G_OBJECT (list));
/* Request the 'publish' list. */
- tp_asv_set_static_string (request, TP_IFACE_CHANNEL ".TargetID", "publish");
+ tp_asv_set_static_string (request, TP_PROP_CHANNEL_TARGET_ID, "publish");
tp_cli_connection_interface_requests_call_ensure_channel (priv->connection,
- -1, request, list_ensure_channel_cb, list, NULL, G_OBJECT (list));
+ G_MAXINT, request, list_ensure_channel_cb, list, NULL, G_OBJECT (list));
/* Request the 'subscribe' list. */
- tp_asv_set_static_string (request, TP_IFACE_CHANNEL ".TargetID", "subscribe");
+ tp_asv_set_static_string (request, TP_PROP_CHANNEL_TARGET_ID, "subscribe");
tp_cli_connection_interface_requests_call_ensure_channel (priv->connection,
- -1, request, list_ensure_channel_cb, list, NULL, G_OBJECT (list));
+ G_MAXINT, request, list_ensure_channel_cb, list, NULL, G_OBJECT (list));
g_hash_table_unref (request);
+
out:
g_object_unref (list);
}
{
EmpathyTpContactListPriv *priv = GET_PRIV (list);
- priv->factory = empathy_tp_contact_factory_dup_singleton (priv->connection);
-
/* call GetAliasFlags */
if (tp_proxy_has_interface_by_id (priv->connection,
TP_IFACE_QUARK_CONNECTION_INTERFACE_ALIASING)) {
GArray handles = {(gchar *) &handle, 1};
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) {
TpChannelGroupFlags flags = tp_channel_group_get_flags (priv->subscribe);
if (flags & TP_CHANNEL_GROUP_FLAG_CAN_ADD ||
-1, &handles, message, NULL, NULL, NULL, NULL);
}
}
+
+ /* We want to unblock the contact */
+ if (tp_proxy_has_interface_by_id (priv->connection,
+ TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_BLOCKING)) {
+ TpContact *tp_contact = empathy_contact_get_tp_contact (contact);
+
+ if (tp_contact != NULL)
+ tp_contact_unblock_async (tp_contact, NULL, NULL);
+ }
}
static void
if (group_flags & TP_CHANNEL_GROUP_FLAG_CAN_REMOVE) {
flags |= EMPATHY_CONTACT_LIST_CAN_REMOVE;
}
+
+ if (group_flags & TP_CHANNEL_GROUP_FLAG_MESSAGE_ADD) {
+ flags |= EMPATHY_CONTACT_LIST_MESSAGE_ADD;
+ }
}
return flags;
}
g_hash_table_remove_all (priv->pendings);
}
-
projects / empathy.git / blobdiff