#include <extensions/extensions.h>
#include "empathy-individual-manager.h"
-#include "empathy-marshal.h"
#include "empathy-utils.h"
-#include "empathy-contact-manager.h"
#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
#include "empathy-debug.h"
EmpathyIndividualManagerPriv *priv = GET_PRIV (self);
g_hash_table_insert (priv->individuals,
- (gpointer) folks_individual_get_id (individual),
+ g_strdup (folks_individual_get_id (individual)),
g_object_ref (individual));
g_signal_connect (individual, "group-changed",
static void
aggregator_individuals_changed_cb (FolksIndividualAggregator *aggregator,
- GeeSet *added,
- GeeSet *removed,
- const char *message,
- FolksPersona *actor,
- guint reason,
+ GeeMultiMap *changes,
EmpathyIndividualManager *self)
{
EmpathyIndividualManagerPriv *priv = GET_PRIV (self);
GeeIterator *iter;
- GList *added_filtered = NULL, *removed_list = NULL;
+ GeeSet *removed;
+ GeeCollection *added;
+ GList *added_set = NULL, *added_filtered = NULL, *removed_list = NULL;
+
+ /* We're not interested in the relationships between the added and removed
+ * individuals, so just extract collections of them. Note that the added
+ * collection may contain duplicates, while the removed set won't. */
+ removed = gee_multi_map_get_keys (changes);
+ added = gee_multi_map_get_values (changes);
/* Handle the removals first, as one of the added Individuals might have the
* same ID as one of the removed Individuals (due to linking). */
{
FolksIndividual *ind = gee_iterator_get (iter);
+ if (ind == NULL)
+ continue;
+
g_signal_handlers_disconnect_by_func (ind,
individual_notify_personas_cb, self);
{
FolksIndividual *ind = gee_iterator_get (iter);
+ /* Make sure we handle each added individual only once. */
+ if (ind == NULL || g_list_find (added_set, ind) != NULL)
+ continue;
+ added_set = g_list_prepend (added_set, ind);
+
g_signal_connect (ind, "notify::personas",
G_CALLBACK (individual_notify_personas_cb), self);
}
g_clear_object (&iter);
+ g_list_free (added_set);
+
+ g_object_unref (added);
+ g_object_unref (removed);
+
/* Bail if we have no individuals left */
if (added_filtered == NULL && removed == NULL)
return;
added_filtered = g_list_reverse (added_filtered);
- g_signal_emit (self, signals[MEMBERS_CHANGED], 0, message,
+ g_signal_emit (self, signals[MEMBERS_CHANGED], 0, NULL,
added_filtered, removed_list,
- tp_channel_group_change_reason_from_folks_groups_change_reason (reason),
+ TP_CHANNEL_GROUP_CHANGE_REASON_NONE,
TRUE);
g_list_free (added_filtered);
{
EmpathyIndividualManagerPriv *priv = GET_PRIV (object);
- g_hash_table_destroy (priv->individuals);
+ g_hash_table_unref (priv->individuals);
+
+ g_signal_handlers_disconnect_by_func (priv->aggregator,
+ aggregator_individuals_changed_cb, object);
tp_clear_object (&priv->aggregator);
G_OBJECT_CLASS (empathy_individual_manager_parent_class)->dispose (object);
G_SIGNAL_RUN_LAST,
0,
NULL, NULL,
- _empathy_marshal_VOID__OBJECT_STRING_BOOLEAN,
+ g_cclosure_marshal_generic,
G_TYPE_NONE, 3, FOLKS_TYPE_INDIVIDUAL, G_TYPE_STRING, G_TYPE_BOOLEAN);
signals[FAVOURITES_CHANGED] =
G_SIGNAL_RUN_LAST,
0,
NULL, NULL,
- _empathy_marshal_VOID__OBJECT_BOOLEAN,
+ g_cclosure_marshal_generic,
G_TYPE_NONE, 2, FOLKS_TYPE_INDIVIDUAL, G_TYPE_BOOLEAN);
signals[MEMBERS_CHANGED] =
G_SIGNAL_RUN_LAST,
0,
NULL, NULL,
- _empathy_marshal_VOID__STRING_OBJECT_OBJECT_UINT,
+ g_cclosure_marshal_generic,
G_TYPE_NONE,
4, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_POINTER, G_TYPE_UINT);
self->priv = priv;
priv->individuals = g_hash_table_new_full (g_str_hash, g_str_equal,
- NULL, g_object_unref);
+ g_free, g_object_unref);
priv->aggregator = folks_individual_aggregator_new ();
- g_signal_connect (priv->aggregator, "individuals-changed",
+ g_signal_connect (priv->aggregator, "individuals-changed-detailed",
G_CALLBACK (aggregator_individuals_changed_cb), self);
folks_individual_aggregator_prepare (priv->aggregator, NULL, NULL);
}
priv->aggregator, NULL, persona_store, details,
aggregator_add_persona_from_details_cb, contact);
- g_hash_table_destroy (details);
+ g_hash_table_unref (details);
g_object_unref (persona_store);
finish:
{
TpfPersona *persona = gee_iterator_get (iter);
TpConnection *conn;
- EmpathyContactManager *manager;
if (TPF_IS_PERSONA (persona))
{
if (tp_contact != NULL)
{
conn = tp_contact_get_connection (tp_contact);
- manager = empathy_contact_manager_dup_singleton ();
- if (empathy_contact_manager_get_flags_for_connection (
- manager, conn) &
- EMPATHY_CONTACT_LIST_CAN_BLOCK)
+ if (tp_proxy_has_interface_by_id (conn,
+ TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_BLOCKING))
retval = TRUE;
-
- g_object_unref (manager);
}
}
g_clear_object (&persona);
while (gee_iterator_next (iter))
{
TpfPersona *persona = gee_iterator_get (iter);
- EmpathyContact *contact;
- EmpathyContactManager *manager;
- EmpathyContactListFlags flags;
if (TPF_IS_PERSONA (persona))
{
TpContact *tp_contact;
+ TpConnection *conn;
tp_contact = tpf_persona_get_contact (persona);
- if (tp_contact != NULL)
- {
- contact = empathy_contact_dup_from_tp_contact (tp_contact);
- empathy_contact_set_persona (contact, FOLKS_PERSONA (persona));
- manager = empathy_contact_manager_dup_singleton ();
- flags = empathy_contact_manager_get_flags_for_connection (manager,
- empathy_contact_get_connection (contact));
-
- if (flags & EMPATHY_CONTACT_LIST_CAN_BLOCK)
- empathy_contact_list_set_blocked (
- EMPATHY_CONTACT_LIST (manager),
- contact, blocked, abusive);
-
- g_object_unref (manager);
- g_object_unref (contact);
- }
+ if (tp_contact == NULL)
+ continue;
+
+ conn = tp_contact_get_connection (tp_contact);
+
+ if (!tp_proxy_has_interface_by_id (conn,
+ TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_BLOCKING))
+ continue;
+
+ if (blocked)
+ tp_contact_block_async (tp_contact, abusive, NULL, NULL);
+ else
+ tp_contact_unblock_async (tp_contact, NULL, NULL);
}
g_clear_object (&persona);
}
projects / empathy.git / blobdiff