Completely reworked ContactList API. Fixes bug #471611, bug #467280, bug #459540 and bug #462907.

svn path=/trunk/; revision=280

7 files changed, 34 insertions, 324 deletions

diff --git a/doc/libempathy/libempathy.types b/doc/libempathy/libempathy.types
index 0211e40b1..15955d12b 100644
--- a/doc/libempathy/libempathy.types
+++ b/doc/libempathy/libempathy.types
@@ -16,7 +16,7 @@
 #include <libempathy/empathy-message.h>
 #include <libempathy/empathy-tp-chatroom.h>
 
-empathy_avatar_get_gtype
+empathy_avatar_get_type
 empathy_chatroom_manager_get_type
 empathy_contact_manager_get_type
 empathy_idle_get_type
@@ -26,7 +26,7 @@ empathy_conf_get_type
 empathy_log_manager_get_type
 empathy_tp_group_get_type
 empathy_chandler_get_type
-empathy_contact_get_gtype
+empathy_contact_get_type
 empathy_tp_chat_get_type
 empathy_chatroom_get_type
 empathy_contact_list_get_type
diff --git a/doc/libempathy/tmpl/empathy-avatar.sgml b/doc/libempathy/tmpl/empathy-avatar.sgml
index 44035517e..3f71285c8 100644
--- a/doc/libempathy/tmpl/empathy-avatar.sgml
+++ b/doc/libempathy/tmpl/empathy-avatar.sgml
@@ -34,14 +34,6 @@ empathy-avatar
 @format: 
 @refcount: 
 
-<!-- ##### FUNCTION empathy_avatar_get_gtype ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-
 <!-- ##### FUNCTION empathy_avatar_new ##### -->
 <para>
 
diff --git a/doc/libempathy/tmpl/empathy-contact-list.sgml b/doc/libempathy/tmpl/empathy-contact-list.sgml
index 1a2839fc7..a84646a8e 100644
--- a/doc/libempathy/tmpl/empathy-contact-list.sgml
+++ b/doc/libempathy/tmpl/empathy-contact-list.sgml
@@ -23,23 +23,29 @@ empathy-contact-list
 </para>
 
 
-<!-- ##### SIGNAL EmpathyContactList::contact-added ##### -->
+<!-- ##### SIGNAL EmpathyContactList::groups-changed ##### -->
 <para>
 
 </para>
 
 @empathycontactlist: the object which received the signal.
 @arg1: 
+@arg2: 
+@arg3: 
 
-<!-- ##### SIGNAL EmpathyContactList::contact-removed ##### -->
+<!-- ##### SIGNAL EmpathyContactList::members-changed ##### -->
 <para>
 
 </para>
 
 @empathycontactlist: the object which received the signal.
 @arg1: 
+@arg2: 
+@arg3: 
+@arg4: 
+@arg5: 
 
-<!-- ##### SIGNAL EmpathyContactList::local-pending ##### -->
+<!-- ##### SIGNAL EmpathyContactList::pendings-changed ##### -->
 <para>
 
 </para>
@@ -47,6 +53,9 @@ empathy-contact-list
 @empathycontactlist: the object which received the signal.
 @arg1: 
 @arg2: 
+@arg3: 
+@arg4: 
+@arg5: 
 
 <!-- ##### STRUCT EmpathyContactListIface ##### -->
 <para>
@@ -54,57 +63,15 @@ empathy-contact-list
 </para>
 
 @base_iface: 
-@setup: 
-@find: 
 @add: 
 @remove: 
 @get_members: 
-@get_local_pending: 
-@process_pending: 
-
-<!-- ##### STRUCT EmpathyContactListInfo ##### -->
-<para>
-
-</para>
-
-@contact: 
-@message: 
-
-<!-- ##### FUNCTION empathy_contact_list_info_new ##### -->
-<para>
-
-</para>
-
-@contact: 
-@message: 
-@Returns: 
-
-
-<!-- ##### FUNCTION empathy_contact_list_info_free ##### -->
-<para>
-
-</para>
-
-@info: 
-
-
-<!-- ##### FUNCTION empathy_contact_list_setup ##### -->
-<para>
-
-</para>
-
-@list: 
-
-
-<!-- ##### FUNCTION empathy_contact_list_find ##### -->
-<para>
-
-</para>
-
-@list: 
-@id: 
-@Returns: 
-
+@get_pendings: 
+@get_all_groups: 
+@get_groups: 
+@add_to_group: 
+@remove_from_group: 
+@rename_group: 
 
 <!-- ##### FUNCTION empathy_contact_list_add ##### -->
 <para>
@@ -135,22 +102,3 @@ empathy-contact-list
 @Returns: 
 
 
-<!-- ##### FUNCTION empathy_contact_list_get_local_pending ##### -->
-<para>
-
-</para>
-
-@list: 
-@Returns: 
-
-
-<!-- ##### FUNCTION empathy_contact_list_process_pending ##### -->
-<para>
-
-</para>
-
-@list: 
-@contact: 
-@accept: 
-
-
diff --git a/doc/libempathy/tmpl/empathy-contact-manager.sgml b/doc/libempathy/tmpl/empathy-contact-manager.sgml
index 0defe4840..fe25eb7eb 100644
--- a/doc/libempathy/tmpl/empathy-contact-manager.sgml
+++ b/doc/libempathy/tmpl/empathy-contact-manager.sgml
@@ -47,43 +47,3 @@ EmpathyContactManager
 @Returns: 
 
 
-<!-- ##### FUNCTION empathy_contact_manager_get_user ##### -->
-<para>
-
-</para>
-
-@manager: 
-@account: 
-@Returns: 
-
-
-<!-- ##### FUNCTION empathy_contact_manager_create ##### -->
-<para>
-
-</para>
-
-@manager: 
-@account: 
-@id: 
-@Returns: 
-
-
-<!-- ##### FUNCTION empathy_contact_manager_rename_group ##### -->
-<para>
-
-</para>
-
-@manager: 
-@old_group: 
-@new_group: 
-
-
-<!-- ##### FUNCTION empathy_contact_manager_get_groups ##### -->
-<para>
-
-</para>
-
-@manager: 
-@Returns: 
-
-
diff --git a/doc/libempathy/tmpl/empathy-contact.sgml b/doc/libempathy/tmpl/empathy-contact.sgml
index 1ab2321af..861151fb6 100644
--- a/doc/libempathy/tmpl/empathy-contact.sgml
+++ b/doc/libempathy/tmpl/empathy-contact.sgml
@@ -33,11 +33,6 @@ EmpathyContact
 
 </para>
 
-<!-- ##### ARG EmpathyContact:groups ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG EmpathyContact:handle ##### -->
 <para>
 
@@ -63,29 +58,6 @@ EmpathyContact
 
 </para>
 
-<!-- ##### ARG EmpathyContact:subscription ##### -->
-<para>
-
-</para>
-
-<!-- ##### ENUM EmpathySubscription ##### -->
-<para>
-
-</para>
-
-@EMPATHY_SUBSCRIPTION_NONE: 
-@EMPATHY_SUBSCRIPTION_TO: 
-@EMPATHY_SUBSCRIPTION_FROM: 
-@EMPATHY_SUBSCRIPTION_BOTH: 
-
-<!-- ##### FUNCTION empathy_contact_get_gtype ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-
 <!-- ##### FUNCTION empathy_contact_new ##### -->
 <para>
 
@@ -151,24 +123,6 @@ EmpathyContact
 @Returns: 
 
 
-<!-- ##### FUNCTION empathy_contact_get_groups ##### -->
-<para>
-
-</para>
-
-@contact: 
-@Returns: 
-
-
-<!-- ##### FUNCTION empathy_contact_get_subscription ##### -->
-<para>
-
-</para>
-
-@contact: 
-@Returns: 
-
-
 <!-- ##### FUNCTION empathy_contact_get_handle ##### -->
 <para>
 
@@ -232,24 +186,6 @@ EmpathyContact
 @presence: 
 
 
-<!-- ##### FUNCTION empathy_contact_set_groups ##### -->
-<para>
-
-</para>
-
-@contact: 
-@categories: 
-
-
-<!-- ##### FUNCTION empathy_contact_set_subscription ##### -->
-<para>
-
-</para>
-
-@contact: 
-@subscription: 
-
-
 <!-- ##### FUNCTION empathy_contact_set_handle ##### -->
 <para>
 
@@ -268,24 +204,6 @@ EmpathyContact
 @is_user: 
 
 
-<!-- ##### FUNCTION empathy_contact_add_group ##### -->
-<para>
-
-</para>
-
-@contact: 
-@group: 
-
-
-<!-- ##### FUNCTION empathy_contact_remove_group ##### -->
-<para>
-
-</para>
-
-@contact: 
-@group: 
-
-
 <!-- ##### FUNCTION empathy_contact_is_online ##### -->
 <para>
 
@@ -295,16 +213,6 @@ EmpathyContact
 @Returns: 
 
 
-<!-- ##### FUNCTION empathy_contact_is_in_group ##### -->
-<para>
-
-</para>
-
-@contact: 
-@group: 
-@Returns: 
-
-
 <!-- ##### FUNCTION empathy_contact_get_status ##### -->
 <para>
 
diff --git a/doc/libempathy/tmpl/empathy-tp-contact-list.sgml b/doc/libempathy/tmpl/empathy-tp-contact-list.sgml
index 3420151db..a3ff09ef1 100644
--- a/doc/libempathy/tmpl/empathy-tp-contact-list.sgml
+++ b/doc/libempathy/tmpl/empathy-tp-contact-list.sgml
@@ -54,61 +54,3 @@ EmpathyTpContactList
 @Returns: 
 
 
-<!-- ##### FUNCTION empathy_tp_contact_list_get_user ##### -->
-<para>
-
-</para>
-
-@list: 
-@Returns: 
-
-
-<!-- ##### FUNCTION empathy_tp_contact_list_get_from_id ##### -->
-<para>
-
-</para>
-
-@list: 
-@id: 
-@Returns: 
-
-
-<!-- ##### FUNCTION empathy_tp_contact_list_get_from_handle ##### -->
-<para>
-
-</para>
-
-@list: 
-@handle: 
-@Returns: 
-
-
-<!-- ##### FUNCTION empathy_tp_contact_list_get_from_handles ##### -->
-<para>
-
-</para>
-
-@list: 
-@handles: 
-@Returns: 
-
-
-<!-- ##### FUNCTION empathy_tp_contact_list_rename_group ##### -->
-<para>
-
-</para>
-
-@list: 
-@old_group: 
-@new_group: 
-
-
-<!-- ##### FUNCTION empathy_tp_contact_list_get_groups ##### -->
-<para>
-
-</para>
-
-@list: 
-@Returns: 
-
-
diff --git a/doc/libempathy/tmpl/empathy-tp-group.sgml b/doc/libempathy/tmpl/empathy-tp-group.sgml
index 988b5d8f6..6ea6206e4 100644
--- a/doc/libempathy/tmpl/empathy-tp-group.sgml
+++ b/doc/libempathy/tmpl/empathy-tp-group.sgml
@@ -29,6 +29,13 @@ EmpathyTpGroup
 </para>
 
 
+<!-- ##### SIGNAL EmpathyTpGroup::destroy ##### -->
+<para>
+
+</para>
+
+@empathytpgroup: the object which received the signal.
+
 <!-- ##### SIGNAL EmpathyTpGroup::local-pending ##### -->
 <para>
 
@@ -40,7 +47,7 @@ EmpathyTpGroup
 @arg3: 
 @arg4: 
 
-<!-- ##### SIGNAL EmpathyTpGroup::members-added ##### -->
+<!-- ##### SIGNAL EmpathyTpGroup::member-added ##### -->
 <para>
 
 </para>
@@ -51,7 +58,7 @@ EmpathyTpGroup
 @arg3: 
 @arg4: 
 
-<!-- ##### SIGNAL EmpathyTpGroup::members-removed ##### -->
+<!-- ##### SIGNAL EmpathyTpGroup::member-removed ##### -->
 <para>
 
 </para>
@@ -73,16 +80,6 @@ EmpathyTpGroup
 @arg3: 
 @arg4: 
 
-<!-- ##### STRUCT EmpathyTpGroupInfo ##### -->
-<para>
-
-</para>
-
-@member: 
-@actor: 
-@reason: 
-@message: 
-
 <!-- ##### FUNCTION empathy_tp_group_new ##### -->
 <para>
 
@@ -99,7 +96,7 @@ EmpathyTpGroup
 </para>
 
 @group: 
-@handles: 
+@contacts: 
 @message: 
 
 
@@ -109,7 +106,7 @@ EmpathyTpGroup
 </para>
 
 @group: 
-@handle: 
+@contact: 
 @message: 
 
 
@@ -119,7 +116,7 @@ EmpathyTpGroup
 </para>
 
 @group: 
-@handle: 
+@contacts: 
 @message: 
 
 
@@ -129,7 +126,7 @@ EmpathyTpGroup
 </para>
 
 @group: 
-@handle: 
+@contact: 
 @message: 
 
 
@@ -142,34 +139,6 @@ EmpathyTpGroup
 @Returns: 
 
 
-<!-- ##### FUNCTION empathy_tp_group_get_all_members ##### -->
-<para>
-
-</para>
-
-@group: 
-@members: 
-@local_pending: 
-@remote_pending: 
-
-
-<!-- ##### FUNCTION empathy_tp_group_get_local_pending_members_with_info ##### -->
-<para>
-
-</para>
-
-@group: 
-@Returns: 
-
-
-<!-- ##### FUNCTION empathy_tp_group_info_list_free ##### -->
-<para>
-
-</para>
-
-@infos: 
-
-
 <!-- ##### FUNCTION empathy_tp_group_get_name ##### -->
 <para>
 
@@ -179,15 +148,6 @@ EmpathyTpGroup
 @Returns: 
 
 
-<!-- ##### FUNCTION empathy_tp_group_get_self_handle ##### -->
-<para>
-
-</para>
-
-@group: 
-@Returns: 
-
-
 <!-- ##### FUNCTION empathy_tp_group_get_object_path ##### -->
 <para>
 
@@ -203,7 +163,7 @@ EmpathyTpGroup
 </para>
 
 @group: 
-@handle: 
+@contact: 
 @Returns: