Merge branch 'gnome-3-8'

[empathy.git] / libempathy-gtk / empathy-roster-model-aggregator.c

diff --git a/libempathy-gtk/empathy-roster-model-aggregator.c b/libempathy-gtk/empathy-roster-model-aggregator.c
index fd06e4449572fb1a62f017f4845b6952a33f709c..b82fd16201dd300d60ed9d9bcd43a8b972d62ab0 100644 (file)
--- a/libempathy-gtk/empathy-roster-model-aggregator.c
+++ b/libempathy-gtk/empathy-roster-model-aggregator.c
@@ -21,15 +21,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-
 #include "config.h"
-
-#include <folks/folks.h>
-#include <folks/folks-telepathy.h>
-
 #include "empathy-roster-model-aggregator.h"
 
-#include "empathy-roster-model.h"
+#include <folks/folks-telepathy.h>
 
 /**
  * SECTION: empathy-roster-model-aggregator
@@ -65,6 +60,8 @@ G_DEFINE_TYPE_WITH_CODE (EmpathyRosterModelAggregator,
 enum
 {
   PROP_AGGREGATOR = 1,
+  PROP_FILTER_FUNC,
+  PROP_FILTER_DATA,
   N_PROPS
 };
 
@@ -80,7 +77,10 @@ static guint signals[LAST_SIGNAL];
 struct _EmpathyRosterModelAggregatorPriv
 {
   FolksIndividualAggregator *aggregator;
-  GHashTable *individuals; /* Individual -> Individual */
+  GHashTable *filtered_individuals; /* Individual -> Individual */
+
+  EmpathyRosterModelAggregatorFilterFunc filter_func;
+  gpointer filter_data;
 };
 
 static void
@@ -94,32 +94,76 @@ individual_group_changed_cb (FolksIndividual *individual,
 }
 
 static void
-add_individual (EmpathyRosterModelAggregator *self,
+add_to_filtered_individuals (EmpathyRosterModelAggregator *self,
     FolksIndividual *individual)
 {
-  g_hash_table_add (self->priv->individuals,
+  g_hash_table_add (self->priv->filtered_individuals,
       g_object_ref (individual));
 
-  g_signal_connect (individual, "group-changed",
-      G_CALLBACK (individual_group_changed_cb), self);
+  tp_g_signal_connect_object (individual, "group-changed",
+      G_CALLBACK (individual_group_changed_cb), self, 0);
 
   empathy_roster_model_fire_individual_added (EMPATHY_ROSTER_MODEL (self),
       individual);
 }
 
 static void
-remove_individual (EmpathyRosterModelAggregator *self,
+remove_from_filtered_individuals (EmpathyRosterModelAggregator *self,
     FolksIndividual *individual)
 {
   g_signal_handlers_disconnect_by_func (individual,
       individual_group_changed_cb, self);
 
-  g_hash_table_remove (self->priv->individuals, individual);
+  g_hash_table_remove (self->priv->filtered_individuals, individual);
 
   empathy_roster_model_fire_individual_removed (EMPATHY_ROSTER_MODEL (self),
       individual);
 }
 
+static void
+individual_notify_cb (FolksIndividual *individual,
+    GParamSpec *param,
+    EmpathyRosterModelAggregator *self)
+{
+  if (!self->priv->filter_func (EMPATHY_ROSTER_MODEL (self), individual, self)
+      && g_hash_table_contains (self->priv->filtered_individuals, individual))
+    remove_from_filtered_individuals (self, individual);
+
+  if (self->priv->filter_func (EMPATHY_ROSTER_MODEL (self), individual, self)
+      && !g_hash_table_contains (self->priv->filtered_individuals, individual))
+    add_to_filtered_individuals (self, individual);
+}
+
+static void
+add_individual (EmpathyRosterModelAggregator *self,
+    FolksIndividual *individual)
+{
+  if (self->priv->filter_func != NULL)
+    {
+      tp_g_signal_connect_object (individual, "notify",
+          G_CALLBACK (individual_notify_cb), self, 0);
+
+      if (!self->priv->filter_func (EMPATHY_ROSTER_MODEL (self), individual,
+              self))
+        return;
+    }
+
+  add_to_filtered_individuals (self, individual);
+}
+
+static void
+remove_individual (EmpathyRosterModelAggregator *self,
+    FolksIndividual *individual)
+{
+  if (self->priv->filter_func != NULL)
+    g_signal_handlers_disconnect_by_func (individual,
+        individual_notify_cb, self);
+
+  if (g_hash_table_contains (self->priv->filtered_individuals,
+          individual))
+    remove_from_filtered_individuals (self, individual);
+}
+
 static void
 populate_individuals (EmpathyRosterModelAggregator *self)
 {
@@ -181,6 +225,12 @@ empathy_roster_model_aggregator_get_property (GObject *object,
       case PROP_AGGREGATOR:
         g_value_set_object (value, self->priv->aggregator);
         break;
+      case PROP_FILTER_FUNC:
+        g_value_set_pointer (value, self->priv->filter_func);
+        break;
+      case PROP_FILTER_DATA:
+        g_value_set_pointer (value, self->priv->filter_data);
+        break;
       default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
         break;
@@ -201,6 +251,14 @@ empathy_roster_model_aggregator_set_property (GObject *object,
         g_assert (self->priv->aggregator == NULL); /* construct only */
         self->priv->aggregator = g_value_dup_object (value);
         break;
+      case PROP_FILTER_FUNC:
+        g_assert (self->priv->filter_func == NULL); /* construct only */
+        self->priv->filter_func = g_value_get_pointer (value);
+        break;
+      case PROP_FILTER_DATA:
+        g_assert (self->priv->filter_data == NULL); /* construct only */
+        self->priv->filter_data = g_value_get_pointer (value);
+        break;
       default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
         break;
@@ -238,6 +296,7 @@ empathy_roster_model_aggregator_dispose (GObject *object)
       ((GObjectClass *) empathy_roster_model_aggregator_parent_class)->dispose;
 
   g_clear_object (&self->priv->aggregator);
+  g_clear_pointer (&self->priv->filtered_individuals, g_hash_table_unref);
 
   if (chain_up != NULL)
     chain_up (object);
@@ -273,6 +332,16 @@ empathy_roster_model_aggregator_class_init (
       G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (oclass, PROP_AGGREGATOR, spec);
 
+  spec = g_param_spec_pointer ("filter-func", "Filter-Func",
+      "EmpathyRosterModelAggregatorFilterFunc",
+      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
+  g_object_class_install_property (oclass, PROP_FILTER_FUNC, spec);
+
+  spec = g_param_spec_pointer ("filter-data", "Filter-Data",
+      "GPointer",
+      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
+  g_object_class_install_property (oclass, PROP_FILTER_DATA, spec);
+
   g_type_class_add_private (klass, sizeof (EmpathyRosterModelAggregatorPriv));
 }
 
@@ -282,25 +351,33 @@ empathy_roster_model_aggregator_init (EmpathyRosterModelAggregator *self)
   self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
       EMPATHY_TYPE_ROSTER_MODEL_AGGREGATOR, EmpathyRosterModelAggregatorPriv);
 
-  self->priv->individuals = g_hash_table_new_full (NULL, NULL, NULL,
+  self->priv->filtered_individuals = g_hash_table_new_full (NULL, NULL, NULL,
       g_object_unref);
 }
 
 EmpathyRosterModelAggregator *
-empathy_roster_model_aggregator_new (void)
+empathy_roster_model_aggregator_new (
+    EmpathyRosterModelAggregatorFilterFunc filter_func,
+    gpointer user_data)
 {
   return g_object_new (EMPATHY_TYPE_ROSTER_MODEL_AGGREGATOR,
+      "filter-func", filter_func,
+      "filter-data", user_data,
       NULL);
 }
 
 EmpathyRosterModelAggregator *
 empathy_roster_model_aggregator_new_with_aggregator (
-    FolksIndividualAggregator *aggregator)
+    FolksIndividualAggregator *aggregator,
+    EmpathyRosterModelAggregatorFilterFunc filter_func,
+    gpointer user_data)
 {
   g_return_val_if_fail (FOLKS_IS_INDIVIDUAL_AGGREGATOR (aggregator), NULL);
 
   return g_object_new (EMPATHY_TYPE_ROSTER_MODEL_AGGREGATOR,
       "aggregator", aggregator,
+      "filter-func", filter_func,
+      "filter-data", user_data,
       NULL);
 }
 
@@ -309,11 +386,37 @@ empathy_roster_model_aggregator_get_individuals (EmpathyRosterModel *model)
 {
   EmpathyRosterModelAggregator *self = EMPATHY_ROSTER_MODEL_AGGREGATOR (model);
 
-  return g_hash_table_get_values (self->priv->individuals);
+  return g_hash_table_get_values (self->priv->filtered_individuals);
+}
+
+static GList *
+empathy_roster_model_aggregator_dup_groups_for_individual (
+    EmpathyRosterModel *model,
+    FolksIndividual *individual)
+{
+  GList *groups_list = NULL;
+  GeeSet *groups_set;
+
+  groups_set = folks_group_details_get_groups (
+      FOLKS_GROUP_DETAILS (individual));
+  if (gee_collection_get_size (GEE_COLLECTION (groups_set)) > 0)
+    {
+      GeeIterator *iter = gee_iterable_iterator (GEE_ITERABLE (groups_set));
+
+      while (iter != NULL && gee_iterator_next (iter))
+        {
+          groups_list = g_list_prepend (groups_list, gee_iterator_get (iter));
+        }
+      g_clear_object (&iter);
+    }
+
+  return groups_list;
 }
 
 static void
 roster_model_iface_init (EmpathyRosterModelInterface *iface)
 {
   iface->get_individuals = empathy_roster_model_aggregator_get_individuals;
+  iface->dup_groups_for_individual =
+    empathy_roster_model_aggregator_dup_groups_for_individual;
 }