]> git.0d.be Git - empathy.git/blobdiff - libempathy/empathy-tp-contact-list.c
local-xmpp-assistant-widget: increase row-spacing
[empathy.git] / libempathy / empathy-tp-contact-list.c
index bf639e4cee98ca7279ef5d4a9485ddc879dcd740..f116d15d35ae2c25033a1a706f84729ae6bd5f63 100644 (file)
@@ -69,8 +69,6 @@ typedef struct {
        GHashTable     *groups;
        /* group name: owned (gchar *) => owned GArray of TpHandle */
        GHashTable     *add_to_group;
-
-       EmpathyContactListFlags flags;
 } EmpathyTpContactListPriv;
 
 typedef enum {
@@ -273,7 +271,7 @@ tp_contact_list_group_ready_cb (TpChannel *channel,
        g_assert (members != NULL);
        arr = tp_intset_to_array (members);
        contacts_added_to_group (list, channel, arr);
-       g_array_free (arr, TRUE);
+       g_array_unref (arr);
 }
 
 static void
@@ -354,7 +352,7 @@ tp_contact_list_group_add (EmpathyTpContactList *list,
        if (channel) {
                tp_cli_channel_interface_group_call_add_members (channel, -1,
                        handles, NULL, NULL, NULL, NULL, NULL);
-               g_array_free (handles, TRUE);
+               g_array_unref (handles);
                return;
        }
 
@@ -434,7 +432,7 @@ add_to_members (EmpathyTpContactList *list,
                                got_added_members_cb, NULL, NULL, G_OBJECT (list));
        }
 
-       g_array_free (request, TRUE);
+       g_array_unref (request);
 }
 
 static void
@@ -577,64 +575,6 @@ tp_contact_list_publish_group_members_changed_cb (TpChannel     *channel,
        }
 }
 
-static void
-tp_contact_list_get_alias_flags_cb (TpConnection *connection,
-                                   guint         flags,
-                                   const GError *error,
-                                   gpointer      user_data,
-                                   GObject      *list)
-{
-       EmpathyTpContactListPriv *priv = GET_PRIV (list);
-
-       if (error) {
-               DEBUG ("Error: %s", error->message);
-               return;
-       }
-
-       if (flags & TP_CONNECTION_ALIAS_FLAG_USER_SET) {
-               priv->flags |= EMPATHY_CONTACT_LIST_CAN_ALIAS;
-       }
-}
-
-static void
-tp_contact_list_get_requestablechannelclasses_cb (TpProxy      *connection,
-                                                 const GValue *value,
-                                                 const GError *error,
-                                                 gpointer      user_data,
-                                                 GObject      *list)
-{
-       EmpathyTpContactListPriv *priv = GET_PRIV (list);
-       GPtrArray *classes;
-       guint i;
-
-       if (error) {
-               DEBUG ("Error: %s", error->message);
-               return;
-       }
-
-       classes = g_value_get_boxed (value);
-       for (i = 0; i < classes->len; i++) {
-               GValueArray *class = g_ptr_array_index (classes, i);
-               GHashTable *props;
-               const char *channel_type;
-               guint handle_type;
-
-               props = g_value_get_boxed (g_value_array_get_nth (class, 0));
-
-               channel_type = tp_asv_get_string (props,
-                               TP_IFACE_CHANNEL ".ChannelType");
-               handle_type = tp_asv_get_uint32 (props,
-                               TP_IFACE_CHANNEL ".TargetHandleType", NULL);
-
-               if (!tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_CONTACT_LIST) &&
-                   handle_type == TP_HANDLE_TYPE_GROUP) {
-                       DEBUG ("Got channel class for a contact group");
-                       priv->flags |= EMPATHY_CONTACT_LIST_CAN_GROUP;
-                       break;
-               }
-       }
-}
-
 static void
 tp_contact_list_subscribe_group_members_changed_cb (TpChannel     *channel,
                                                    gchar         *message,
@@ -684,7 +624,7 @@ tp_contact_list_subscribe_group_members_changed_cb (TpChannel     *channel,
        tp_cli_channel_interface_group_call_add_members (priv->publish,
                -1, accept, NULL, NULL, NULL, NULL, NULL);
 
-       g_array_free (accept, TRUE);
+       g_array_unref (accept);
 }
 
 static void
@@ -740,10 +680,10 @@ tp_contact_list_finalize (GObject *object)
                        tp_contact_list_group_invalidated_cb, list);
        }
 
-       g_hash_table_destroy (priv->groups);
-       g_hash_table_destroy (priv->members);
-       g_hash_table_destroy (priv->pendings);
-       g_hash_table_destroy (priv->add_to_group);
+       g_hash_table_unref (priv->groups);
+       g_hash_table_unref (priv->members);
+       g_hash_table_unref (priv->pendings);
+       g_hash_table_unref (priv->add_to_group);
 
        G_OBJECT_CLASS (empathy_tp_contact_list_parent_class)->finalize (object);
 }
@@ -925,32 +865,6 @@ tp_contact_list_constructed (GObject *list)
 {
        EmpathyTpContactListPriv *priv = GET_PRIV (list);
 
-       /* call GetAliasFlags */
-       if (tp_proxy_has_interface_by_id (priv->connection,
-                               TP_IFACE_QUARK_CONNECTION_INTERFACE_ALIASING)) {
-               tp_cli_connection_interface_aliasing_call_get_alias_flags (
-                               priv->connection,
-                               -1,
-                               tp_contact_list_get_alias_flags_cb,
-                               NULL, NULL,
-                               G_OBJECT (list));
-       }
-
-       /* lookup RequestableChannelClasses */
-       if (tp_proxy_has_interface_by_id (priv->connection,
-                               TP_IFACE_QUARK_CONNECTION_INTERFACE_REQUESTS)) {
-               tp_cli_dbus_properties_call_get (priv->connection,
-                               -1,
-                               TP_IFACE_CONNECTION_INTERFACE_REQUESTS,
-                               "RequestableChannelClasses",
-                               tp_contact_list_get_requestablechannelclasses_cb,
-                               NULL, NULL,
-                               G_OBJECT (list));
-       } else {
-               /* we just don't know... better mark the flag just in case */
-               priv->flags |= EMPATHY_CONTACT_LIST_CAN_GROUP;
-       }
-
        tp_connection_call_when_ready (priv->connection, conn_ready_cb,
                g_object_ref (list));
 }
@@ -1016,7 +930,7 @@ empathy_tp_contact_list_class_init (EmpathyTpContactListClass *klass)
 static void
 tp_contact_list_array_free (gpointer handles)
 {
-       g_array_free (handles, TRUE);
+       g_array_unref (handles);
 }
 
 static void
@@ -1154,20 +1068,6 @@ tp_contact_list_get_pendings (EmpathyContactList *list)
        return ret;
 }
 
-static GList *
-tp_contact_list_get_all_groups (EmpathyContactList *list)
-{
-       EmpathyTpContactListPriv *priv = GET_PRIV (list);
-       GList                    *ret, *l;
-
-       ret = g_hash_table_get_keys (priv->groups);
-       for (l = ret; l; l = l->next) {
-               l->data = g_strdup (l->data);
-       }
-
-       return ret;
-}
-
 static GList *
 tp_contact_list_get_groups (EmpathyContactList *list,
                            EmpathyContact     *contact)
@@ -1281,39 +1181,7 @@ tp_contact_list_remove_group (EmpathyContactList *list,
        tp_cli_channel_interface_group_call_remove_members (channel, -1,
                handles, NULL, NULL, NULL, NULL, NULL);
        tp_cli_channel_call_close (channel, -1, NULL, NULL, NULL, NULL);
-       g_array_free (handles, TRUE);
-}
-
-static EmpathyContactListFlags
-tp_contact_list_get_flags (EmpathyContactList *list)
-{
-       EmpathyTpContactListPriv *priv;
-       EmpathyContactListFlags flags;
-
-       g_return_val_if_fail (EMPATHY_IS_TP_CONTACT_LIST (list), FALSE);
-
-       priv = GET_PRIV (list);
-       flags = priv->flags;
-
-       if (priv->subscribe != NULL) {
-               TpChannelGroupFlags group_flags;
-
-               group_flags = tp_channel_group_get_flags (priv->subscribe);
-
-               if (group_flags & TP_CHANNEL_GROUP_FLAG_CAN_ADD) {
-                       flags |= EMPATHY_CONTACT_LIST_CAN_ADD;
-               }
-
-               if (group_flags & TP_CHANNEL_GROUP_FLAG_CAN_REMOVE) {
-                       flags |= EMPATHY_CONTACT_LIST_CAN_REMOVE;
-               }
-
-               if (group_flags & TP_CHANNEL_GROUP_FLAG_MESSAGE_ADD) {
-                       flags |= EMPATHY_CONTACT_LIST_MESSAGE_ADD;
-               }
-       }
-
-       return flags;
+       g_array_unref (handles);
 }
 
 static void
@@ -1323,13 +1191,11 @@ tp_contact_list_iface_init (EmpathyContactListIface *iface)
        iface->remove            = tp_contact_list_remove;
        iface->get_members       = tp_contact_list_get_members;
        iface->get_pendings      = tp_contact_list_get_pendings;
-       iface->get_all_groups    = tp_contact_list_get_all_groups;
        iface->get_groups        = tp_contact_list_get_groups;
        iface->add_to_group      = tp_contact_list_add_to_group;
        iface->remove_from_group = tp_contact_list_remove_from_group;
        iface->rename_group      = tp_contact_list_rename_group;
        iface->remove_group      = tp_contact_list_remove_group;
-       iface->get_flags         = tp_contact_list_get_flags;
 }
 
 void