Replace empathy_connection_get_protocol by tp_connection_parse_object_path

[empathy.git] / libempathy / empathy-tp-contact-list.c

diff --git a/libempathy/empathy-tp-contact-list.c b/libempathy/empathy-tp-contact-list.c
index f2c552c1b7c587a7dd323e875f7d884167bda487..6868e84a66d8911603f978a05912813b942bbe13 100644 (file)
--- a/libempathy/empathy-tp-contact-list.c
+++ b/libempathy/empathy-tp-contact-list.c
@@ -305,6 +305,7 @@ tp_contact_list_group_request_handles_cb (TpConnection *connection,
                                                list);
 }
 
+/* This function takes ownership of handles array */
 static void
 tp_contact_list_group_add (EmpathyTpContactList *list,
                           const gchar          *group_name,
@@ -758,9 +759,8 @@ tp_contact_list_constructed (GObject *list)
 
        /* Check for protocols that does not support contact groups. We can
         * put all contacts into a special group in that case.
-        * FIXME: Default group should be an information in the profile
-        * FIXME: replace with tp_connection_parse_object_path once released */
-       protocol_name = empathy_connection_get_protocol (priv->connection, NULL);
+        * FIXME: Default group should be an information in the profile */
+       tp_connection_parse_object_path (priv->connection, &protocol_name, NULL);
        if (!tp_strdiff (protocol_name, "local-xmpp")) {
                priv->protocol_group = _("People nearby");
        }
@@ -833,7 +833,8 @@ empathy_tp_contact_list_init (EmpathyTpContactList *list)
 
        list->priv = priv;
 
-       /* Map group's name to group's channel */
+       /* Map group's name to group's TpChannel. The group name string is owned
+        * by the TpChannel object */
        priv->groups = g_hash_table_new_full (g_str_hash, g_str_equal,
                                              NULL,
                                              (GDestroyNotify) g_object_unref);