EmpathyContactList is now an interface implemented by

	* libempathy-gtk/gossip-private-chat.h:
	* libempathy-gtk/gossip-contact-list.c:
	* libempathy-gtk/gossip-chat.c:
	* libempathy-gtk/gossip-chat.h:
	* libempathy-gtk/gossip-chat-window.c:
	* libempathy-gtk/Makefile.am:
	* libempathy-gtk/gossip-chat-view.c:
	* libempathy-gtk/gossip-private-chat.c:
	* src/empathy-chat-main.c:
	* libempathy/gossip-utils.c:
	* libempathy/gossip-contact.h:
	* libempathy/empathy-tp-chat.c:
	* libempathy/gossip-utils.h:
	* libempathy/empathy-contact-manager.c:
	* libempathy/empathy-contact-manager.h:
	* libempathy/empathy-tp-contact-list.c:
	* libempathy/empathy-tp-contact-list.h:
	* libempathy/empathy-tp-chatroom.c:
	* libempathy/empathy-tp-chatroom.h:
	* libempathy/empathy-contact-list.c:
	* libempathy/empathy-contact-list.h:
	* libempathy/Makefile.am:
	* libempathy/gossip-contact.c: EmpathyContactList is now an interface
	implemented by EmpathyTpContactList, EmpathyContactManager and
	EmpathyTpChatroom. GossipContactList use that interface to display a 
	treeview.


svn path=/trunk/; revision=72

1 files changed, 29 insertions, 37 deletions

diff --git a/libempathy/empathy-contact-list.h b/libempathy/empathy-contact-list.h
index 60c56b25a..02ec3186d 100644
--- a/libempathy/empathy-contact-list.h
+++ b/libempathy/empathy-contact-list.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * Copyright (C) 2007 Xavier Claessens <xclaesse@gmail.com>
  * Copyright (C) 2007 Collabora Ltd.
  *
  * This program is free software; you can redistribute it and/or
@@ -17,15 +16,14 @@
  * License along with this program; if not, write to the
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
- * 
+ *
  * Authors: Xavier Claessens <xclaesse@gmail.com>
  */
 
 #ifndef __EMPATHY_CONTACT_LIST_H__
 #define __EMPATHY_CONTACT_LIST_H__
 
-#include <glib.h>
-#include <libmissioncontrol/mc-account.h>
+#include <glib-object.h>
 
 #include "gossip-contact.h"
 
@@ -33,47 +31,41 @@ G_BEGIN_DECLS
 
 #define EMPATHY_TYPE_CONTACT_LIST         (empathy_contact_list_get_type ())
 #define EMPATHY_CONTACT_LIST(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), EMPATHY_TYPE_CONTACT_LIST, EmpathyContactList))
-#define EMPATHY_CONTACT_LIST_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), EMPATHY_TYPE_CONTACT_LIST, EmpathyContactListClass))
 #define EMPATHY_IS_CONTACT_LIST(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), EMPATHY_TYPE_CONTACT_LIST))
-#define EMPATHY_IS_CONTACT_LIST_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), EMPATHY_TYPE_CONTACT_LIST))
-#define EMPATHY_CONTACT_LIST_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EMPATHY_TYPE_CONTACT_LIST, EmpathyContactListClass))
+#define EMPATHY_CONTACT_LIST_GET_IFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), EMPATHY_TYPE_CONTACT_LIST, EmpathyContactListIface))
 
 typedef struct _EmpathyContactList      EmpathyContactList;
-typedef struct _EmpathyContactListClass EmpathyContactListClass;
-typedef struct _EmpathyContactListPriv  EmpathyContactListPriv;
+typedef struct _EmpathyContactListIface EmpathyContactListIface;
 
-struct _EmpathyContactList {
-	GObject      parent;
-};
+struct _EmpathyContactListIface {
+	GTypeInterface   base_iface;
 
-struct _EmpathyContactListClass {
-	GObjectClass parent_class;
+	/* VTabled */
+	void            (*setup)        (EmpathyContactList *list);
+	GossipContact * (*find)         (EmpathyContactList *list,
+					 const gchar        *id);
+	void            (*add)          (EmpathyContactList *list,
+					 GossipContact      *contact,
+					 const gchar        *message);
+	void            (*remove)       (EmpathyContactList *list,
+					 GossipContact      *contact,
+					 const gchar        *message);
+	GList *         (*get_contacts) (EmpathyContactList *list);
 };
 
-GType                empathy_contact_list_get_type         (void) G_GNUC_CONST;
-EmpathyContactList * empathy_contact_list_new              (McAccount          *account);
-void                 empathy_contact_list_setup            (EmpathyContactList *list);
-McAccount *          empathy_contact_list_get_account      (EmpathyContactList *list);
-GossipContact *      empathy_contact_list_get_own          (EmpathyContactList *list);
-GossipContact *      empathy_contact_list_find             (EmpathyContactList *list,
-							    const gchar        *id);
-void                 empathy_contact_list_add              (EmpathyContactList *list,
-							    guint               handle,
-							    const gchar        *message);
-void                 empathy_contact_list_remove           (EmpathyContactList *list,
-							    guint               handle);
-GossipContact *      empathy_contact_list_get_from_id      (EmpathyContactList *list,
-							    const gchar        *id);
-GossipContact *      empathy_contact_list_get_from_handle  (EmpathyContactList *list,
-							    guint               handle);
-GList *              empathy_contact_list_get_from_handles (EmpathyContactList *list,
-							    GArray             *handles);
-void                 empathy_contact_list_rename_group     (EmpathyContactList *list,
-							    const gchar        *old_group,
-							    const gchar        *new_group);
-GList *              empathy_contact_list_get_groups       (EmpathyContactList *list);
-GList *              empathy_contact_list_get_contacts     (EmpathyContactList *list);
+GType           empathy_contact_list_get_type     (void) G_GNUC_CONST;
+void            empathy_contact_list_setup        (EmpathyContactList *list);
+GossipContact * empathy_contact_list_find         (EmpathyContactList *list,
+						   const gchar        *id);
+void            empathy_contact_list_add          (EmpathyContactList *list,
+						   GossipContact      *contact,
+						   const gchar        *message);
+void            empathy_contact_list_remove       (EmpathyContactList *list,
+						   GossipContact      *contact,
+						   const gchar        *message);
+GList *         empathy_contact_list_get_contacts (EmpathyContactList *list);
 
 G_END_DECLS
 
 #endif /* __EMPATHY_CONTACT_LIST_H__ */
+