Commit 0b0bb0f6 authored by Xavier Claessens's avatar Xavier Claessens

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

svn path=/trunk/; revision=280
parent 3a535643
This diff is collapsed.
......@@ -155,62 +155,58 @@ AC_ARG_ENABLE(python,
[build python bindings to libempathy and libempathy-gtk]), ,
enable_python=auto)
PKG_CHECK_MODULES(PYTHON_BINDING,
[
pygtk-2.0,
glib-2.0 >= $GLIB_REQUIRED
gobject-2.0
gconf-2.0 >= $GCONF_REQUIRED
libxml-2.0
gnome-vfs-2.0
libtelepathy >= $TELEPATHY_REQUIRED
libmissioncontrol >= $MISSION_CONTROL_REQUIRED
gtk+-2.0 >= $GTK_REQUIRED
libglade-2.0 >= $LIBGLADE_REQUIRED
libgnomeui-2.0
], have_python="yes", have_python="no")
if test "x$have_python" = "xno"; then
if test "x$enable_python" = "xyes"; then
AC_MSG_ERROR([Could not find python dependencies])
fi
enable_python="no (missing dependencies)"
if test "x$enable_python" != "xno"; then
AM_PATH_PYTHON
if test -z "$PYTHON" ; then
have_python="no"
else
PKG_CHECK_MODULES(PYTHON_BINDING,
[
pygtk-2.0,
glib-2.0 >= $GLIB_REQUIRED
gobject-2.0
gconf-2.0 >= $GCONF_REQUIRED
libxml-2.0
gnome-vfs-2.0
libtelepathy >= $TELEPATHY_REQUIRED
libmissioncontrol >= $MISSION_CONTROL_REQUIRED
gtk+-2.0 >= $GTK_REQUIRED
libglade-2.0 >= $LIBGLADE_REQUIRED
libgnomeui-2.0
], have_python="yes", have_python="no")
fi
else
if test "x$enable_python" != "xno"; then
AM_PATH_PYTHON
if test -z "$PYTHON" ; then
enable_python="no"
else
enable_python="yes"
fi
else
enable_python="no (disabled)"
fi
have_python=no
fi
if test "x$enable_python" = "xyes" -a "x$have_python" != "xyes"; then
AC_MSG_ERROR([Couldn't find python.])
fi
AM_CONDITIONAL(HAVE_PYTHON, test x$enable_python = xyes)
AM_CONDITIONAL(HAVE_PYTHON, test "x$have_python" = "xyes")
dnl -----------------------------------------------------------
AC_OUTPUT([
Makefile
data/Makefile
data/empathy.desktop.in
data/16x16/Makefile
data/22x22/Makefile
data/24x24/Makefile
data/32x32/Makefile
data/48x48/Makefile
data/scalable/Makefile
po/Makefile.in
libempathy/Makefile
libempathy/libempathy.pc
libempathy-gtk/Makefile
libempathy-gtk/libempathy-gtk.pc
src/Makefile
doc/Makefile
doc/libempathy/Makefile
doc/libempathy-gtk/Makefile
python/Makefile
python/pyempathy/Makefile
python/pyempathygtk/Makefile
Makefile
data/Makefile
data/empathy.desktop.in
data/16x16/Makefile
data/22x22/Makefile
data/24x24/Makefile
data/32x32/Makefile
data/48x48/Makefile
data/scalable/Makefile
po/Makefile.in
libempathy/Makefile
libempathy/libempathy.pc
libempathy-gtk/Makefile
libempathy-gtk/libempathy-gtk.pc
src/Makefile
doc/Makefile
doc/libempathy/Makefile
doc/libempathy-gtk/Makefile
python/Makefile
python/pyempathy/Makefile
python/pyempathygtk/Makefile
])
......@@ -173,22 +173,3 @@ EmpathyContactListStore
@Returns:
<!-- ##### FUNCTION empathy_contact_list_store_set_contact_groups_func ##### -->
<para>
</para>
@store:
@func:
@user_data:
<!-- ##### FUNCTION empathy_contact_list_store_update_contact_groups ##### -->
<para>
</para>
@store:
@contact:
......@@ -39,23 +39,6 @@ EmpathyContactListView
@arg2:
@arg3:
<!-- ##### ARG EmpathyContactListView:filter ##### -->
<para>
</para>
<!-- ##### USER_FUNCTION EmpathyContactListViewDragReceivedFunc ##### -->
<para>
</para>
@contact:
@action:
@old_group:
@new_group:
@user_data:
<!-- ##### FUNCTION empathy_contact_list_view_new ##### -->
<para>
......@@ -102,22 +85,3 @@ EmpathyContactListView
@Returns:
<!-- ##### FUNCTION empathy_contact_list_view_set_filter ##### -->
<para>
</para>
@view:
@filter:
<!-- ##### FUNCTION empathy_contact_list_view_set_drag_received_func ##### -->
<para>
</para>
@view:
@func:
@user_data:
......@@ -59,13 +59,6 @@ empathy-images
<!-- ##### MACRO EMPATHY_IMAGE_PENDING ##### -->
<para>
</para>
<!-- ##### MACRO EMPATHY_IMAGE_MESSAGE ##### -->
<para>
......
......@@ -143,13 +143,6 @@ empathy-preferences
<!-- ##### MACRO EMPATHY_PREFS_SALUT_ACCOUNT_CREATED ##### -->
<para>
</para>
<!-- ##### FUNCTION empathy_preferences_show ##### -->
<para>
......
......@@ -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
......
......@@ -34,14 +34,6 @@ empathy-avatar
@format:
@refcount:
<!-- ##### FUNCTION empathy_avatar_get_gtype ##### -->
<para>
</para>
@Returns:
<!-- ##### FUNCTION empathy_avatar_new ##### -->
<para>
......
......@@ -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:
......@@ -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:
......@@ -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>
......
......@@ -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:
......@@ -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:
......@@ -34,7 +34,7 @@
#include <glade/glade.h>
#include <glib/gi18n.h>