Updated Dutch translation master

[empathy.git] / libempathy / empathy-individual-manager.c

diff --git a/libempathy/empathy-individual-manager.c b/libempathy/empathy-individual-manager.c
index 8d14cdf0d7736d3755639af360a4ceb469f258fc..c56f6bb168d5e64b94712c35fc66d7cfdde1b66f 100644 (file)
--- a/libempathy/empathy-individual-manager.c
+++ b/libempathy/empathy-individual-manager.c
@@ -20,18 +20,12 @@
  *          Travis Reitter <travis.reitter@collabora.co.uk>
  */
 
-#include <config.h>
-
-#include <string.h>
-
-#include <telepathy-glib/telepathy-glib.h>
-
-#include <folks/folks.h>
-#include <folks/folks-telepathy.h>
+#include "config.h"
+#include "empathy-individual-manager.h"
 
-#include <extensions/extensions.h>
+#include <tp-account-widgets/tpaw-utils.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
-#include "empathy-individual-manager.h"
 #include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
@@ -289,8 +283,14 @@ remove_individual (EmpathyIndividualManager *self, FolksIndividual *individual)
       compare_individual_by_pop, NULL);
   if (iter != NULL)
     {
+      /* priv->top_individuals borrows its reference from
+       * priv->individuals_pop so we take a reference on the individual while
+       * removing it to make sure it stays alive while calling
+       * check_top_individuals(). */
+      g_object_ref (individual);
       g_sequence_remove (iter);
       check_top_individuals (self);
+      g_object_unref (individual);
     }
 
   g_signal_handlers_disconnect_by_func (individual,
@@ -394,7 +394,7 @@ aggregator_individuals_changed_cb (FolksIndividualAggregator *aggregator,
 
       /* Make sure we handle each added individual only once. */
       if (ind == NULL || g_list_find (added_set, ind) != NULL)
-        continue;
+        goto while_next;
       added_set = g_list_prepend (added_set, ind);
 
       g_signal_connect (ind, "notify::personas",
@@ -406,6 +406,7 @@ aggregator_individuals_changed_cb (FolksIndividualAggregator *aggregator,
           added_filtered = g_list_prepend (added_filtered, ind);
         }
 
+while_next:
       g_clear_object (&ind);
     }
   g_clear_object (&iter);
@@ -584,7 +585,7 @@ empathy_individual_manager_init (EmpathyIndividualManager *self)
 
   priv->individuals_pop = g_sequence_new (g_object_unref);
 
-  priv->aggregator = folks_individual_aggregator_new ();
+  priv->aggregator = folks_individual_aggregator_dup ();
   tp_g_signal_connect_object (priv->aggregator, "individuals-changed-detailed",
       G_CALLBACK (aggregator_individuals_changed_cb), self, 0);
   tp_g_signal_connect_object (priv->aggregator, "notify::is-quiescent",
@@ -829,19 +830,21 @@ empathy_individual_manager_set_blocked (EmpathyIndividualManager *self,
 
           tp_contact = tpf_persona_get_contact (persona);
           if (tp_contact == NULL)
-            continue;
+            goto while_next;
 
           conn = tp_contact_get_connection (tp_contact);
 
           if (!tp_proxy_has_interface_by_id (conn,
                 TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_BLOCKING))
-            continue;
+            goto while_next;
 
           if (blocked)
             tp_contact_block_async (tp_contact, abusive, NULL, NULL);
           else
             tp_contact_unblock_async (tp_contact, NULL, NULL);
         }
+
+while_next:
       g_clear_object (&persona);
     }
   g_clear_object (&iter);
@@ -949,6 +952,6 @@ empathy_individual_manager_unprepare_finish (
     GAsyncResult *result,
     GError **error)
 {
-  empathy_implement_finish_void (self,
+  tpaw_implement_finish_void (self,
       empathy_individual_manager_unprepare_async)
 }