update gnome-contacts's desktop file

[empathy.git] / libempathy / empathy-connection-aggregator.c

diff --git a/libempathy/empathy-connection-aggregator.c b/libempathy/empathy-connection-aggregator.c
index 88f7895489ee29238896ecc63dce7bdfafeade29..763715f9e30c618beff4a56624de645c6762c0e0 100644 (file)
--- a/libempathy/empathy-connection-aggregator.c
+++ b/libempathy/empathy-connection-aggregator.c
@@ -18,20 +18,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <config.h>
-
+#include "config.h"
 #include "empathy-connection-aggregator.h"
 
-#include <telepathy-glib/telepathy-glib.h>
-
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-debug.h"
-#include "empathy-utils.h"
-
-
-#include "extensions/extensions.h"
 
-G_DEFINE_TYPE (EmpathyConnectionAggregator, empathy_connection_aggregator, 
+G_DEFINE_TYPE (EmpathyConnectionAggregator, empathy_connection_aggregator,
     G_TYPE_OBJECT);
 
 enum {
@@ -77,7 +70,7 @@ empathy_connection_aggregator_class_init (
       NULL, NULL,
       g_cclosure_marshal_generic,
       G_TYPE_NONE,
-      3, TP_TYPE_CONNECTION, G_TYPE_PTR_ARRAY, G_TYPE_PTR_ARRAY);
+      2, G_TYPE_PTR_ARRAY, G_TYPE_PTR_ARRAY);
 
   g_type_class_add_private (klass, sizeof (EmpathyConnectionAggregatorPriv));
 }
@@ -88,8 +81,7 @@ contact_list_changed_cb (TpConnection *conn,
     GPtrArray *removed,
     EmpathyConnectionAggregator *self)
 {
-  g_signal_emit (self, signals[EVENT_CONTACT_LIST_CHANGED], 0, conn,
-      added, removed);
+  g_signal_emit (self, signals[EVENT_CONTACT_LIST_CHANGED], 0, added, removed);
 }
 
 static void
@@ -129,6 +121,7 @@ check_connection (EmpathyConnectionAggregator *self,
       contact_list_changed_cb (conn, contacts, empty, self);
       g_ptr_array_unref (empty);
     }
+  g_ptr_array_unref (contacts);
 
   tp_g_signal_connect_object (conn, "invalidated",
       G_CALLBACK (conn_invalidated_cb), self, 0);
@@ -189,7 +182,7 @@ am_prepare_cb (GObject *source,
       goto out;
     }
 
-  accounts = tp_account_manager_get_valid_accounts (self->priv->mgr);
+  accounts = tp_account_manager_dup_valid_accounts (self->priv->mgr);
   for (l = accounts; l != NULL; l = g_list_next (l))
     {
       TpAccount *account = l->data;
@@ -200,7 +193,7 @@ am_prepare_cb (GObject *source,
   tp_g_signal_connect_object (self->priv->mgr, "account-validity-changed",
       G_CALLBACK (account_validity_changed_cb), self, 0);
 
-  g_list_free (accounts);
+  g_list_free_full (accounts, g_object_unref);
 
 out:
   g_object_unref (self);
@@ -232,6 +225,7 @@ empathy_connection_aggregator_dup_singleton (void)
   return aggregator;
 }
 
+/* (transfer container) */
 GList *
 empathy_connection_aggregator_get_all_groups (EmpathyConnectionAggregator *self)
 {
@@ -288,3 +282,44 @@ empathy_connection_aggregator_dup_all_contacts (
 
   return result;
 }
+
+static void
+rename_group_cb (GObject *source,
+    GAsyncResult *result,
+    gpointer user_data)
+{
+  GError *error = NULL;
+
+  if (!tp_connection_rename_group_finish (TP_CONNECTION (source), result,
+        &error))
+    {
+      DEBUG ("Failed to rename group on %s: %s",
+          tp_proxy_get_object_path (source), error->message);
+      g_error_free (error);
+    }
+}
+
+void
+empathy_connection_aggregator_rename_group (EmpathyConnectionAggregator *self,
+    const gchar *old_name,
+    const gchar *new_name)
+{
+  GList *l;
+
+  for (l = self->priv->conns; l != NULL; l = g_list_next (l))
+    {
+      TpConnection *conn = l->data;
+      const gchar * const *groups;
+
+      groups = tp_connection_get_contact_groups (conn);
+
+      if (!tp_strv_contains (groups, old_name))
+        continue;
+
+      DEBUG ("Rename group '%s' to '%s' on %s", old_name, new_name,
+          tp_proxy_get_object_path (conn));
+
+      tp_connection_rename_group_async (conn, old_name, new_name,
+          rename_group_cb, NULL);
+    }
+}