]> git.0d.be Git - empathy.git/commitdiff
remove empathy-contact-list
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Tue, 10 Apr 2012 11:28:05 +0000 (13:28 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Tue, 10 Apr 2012 11:31:50 +0000 (13:31 +0200)
https://bugzilla.gnome.org/show_bug.cgi?id=673821

libempathy/Makefile.am
libempathy/empathy-contact-list.c [deleted file]
libempathy/empathy-contact-list.h [deleted file]

index 811e574de1c063775b2203c4a66ee31fa337be7f..abe2eebfd44415cc724dfe3a8dde33edc5432f1b 100644 (file)
@@ -36,7 +36,6 @@ libempathy_headers =                          \
        empathy-connection-managers.h           \
        empathy-connection-aggregator.h         \
        empathy-contact-groups.h                \
-       empathy-contact-list.h                  \
        empathy-contact.h                       \
        empathy-debug.h                         \
        empathy-ft-factory.h                    \
@@ -77,7 +76,6 @@ libempathy_handwritten_source =                               \
        empathy-connection-managers.c                   \
        empathy-connection-aggregator.c         \
        empathy-contact-groups.c                        \
-       empathy-contact-list.c                          \
        empathy-contact.c                               \
        empathy-debug.c                                 \
        empathy-ft-factory.c                            \
diff --git a/libempathy/empathy-contact-list.c b/libempathy/empathy-contact-list.c
deleted file mode 100644 (file)
index b80071c..0000000
+++ /dev/null
@@ -1,214 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2007-2008 Collabora Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Authors: Xavier Claessens <xclaesse@gmail.com>
- */
-
-#include "config.h"
-
-#include "empathy-contact-list.h"
-
-static void contact_list_base_init (gpointer klass);
-
-GType
-empathy_contact_list_get_type (void)
-{
-       static GType type = 0;
-
-       if (!type) {
-               static const GTypeInfo type_info = {
-                       sizeof (EmpathyContactListIface),
-                       contact_list_base_init,
-                       NULL,
-               };
-
-               type = g_type_register_static (G_TYPE_INTERFACE,
-                                              "EmpathyContactList",
-                                              &type_info, 0);
-
-               g_type_interface_add_prerequisite (type, G_TYPE_OBJECT);
-       }
-
-       return type;
-}
-
-static void
-contact_list_base_init (gpointer klass)
-{
-       static gboolean initialized = FALSE;
-
-       if (!initialized) {
-               g_signal_new ("member-renamed",
-                             G_TYPE_FROM_CLASS (klass),
-                             G_SIGNAL_RUN_LAST,
-                             0,
-                             NULL, NULL,
-                             g_cclosure_marshal_generic,
-                             G_TYPE_NONE,
-                             4, EMPATHY_TYPE_CONTACT, EMPATHY_TYPE_CONTACT, G_TYPE_UINT, G_TYPE_STRING);
-
-               g_signal_new ("members-changed",
-                             G_TYPE_FROM_CLASS (klass),
-                             G_SIGNAL_RUN_LAST,
-                             0,
-                             NULL, NULL,
-                             g_cclosure_marshal_generic,
-                             G_TYPE_NONE,
-                             5, EMPATHY_TYPE_CONTACT, EMPATHY_TYPE_CONTACT,
-                             G_TYPE_UINT, G_TYPE_STRING, G_TYPE_BOOLEAN);
-
-               g_signal_new ("pendings-changed",
-                             G_TYPE_FROM_CLASS (klass),
-                             G_SIGNAL_RUN_LAST,
-                             0,
-                             NULL, NULL,
-                             g_cclosure_marshal_generic,
-                             G_TYPE_NONE,
-                             5, EMPATHY_TYPE_CONTACT, EMPATHY_TYPE_CONTACT,
-                             G_TYPE_UINT, G_TYPE_STRING, G_TYPE_BOOLEAN);
-
-               g_signal_new ("groups-changed",
-                             G_TYPE_FROM_CLASS (klass),
-                             G_SIGNAL_RUN_LAST,
-                             0,
-                             NULL, NULL,
-                             g_cclosure_marshal_generic,
-                             G_TYPE_NONE,
-                             3, EMPATHY_TYPE_CONTACT, G_TYPE_STRING, G_TYPE_BOOLEAN);
-
-               initialized = TRUE;
-       }
-}
-
-void
-empathy_contact_list_add (EmpathyContactList *list,
-                         EmpathyContact     *contact,
-                         const gchar        *message)
-{
-       g_return_if_fail (EMPATHY_IS_CONTACT_LIST (list));
-       g_return_if_fail (EMPATHY_IS_CONTACT (contact));
-
-       if (EMPATHY_CONTACT_LIST_GET_IFACE (list)->add) {
-               EMPATHY_CONTACT_LIST_GET_IFACE (list)->add (list, contact, message);
-       }
-}
-
-void
-empathy_contact_list_remove (EmpathyContactList *list,
-                            EmpathyContact     *contact,
-                            const gchar        *message)
-{
-       g_return_if_fail (EMPATHY_IS_CONTACT_LIST (list));
-       g_return_if_fail (EMPATHY_IS_CONTACT (contact));
-
-       if (EMPATHY_CONTACT_LIST_GET_IFACE (list)->remove) {
-               EMPATHY_CONTACT_LIST_GET_IFACE (list)->remove (list, contact, message);
-       }
-}
-
-GList *
-empathy_contact_list_get_members (EmpathyContactList *list)
-{
-       g_return_val_if_fail (EMPATHY_IS_CONTACT_LIST (list), NULL);
-
-       if (EMPATHY_CONTACT_LIST_GET_IFACE (list)->get_members) {
-               return EMPATHY_CONTACT_LIST_GET_IFACE (list)->get_members (list);
-       }
-
-       return NULL;
-}
-
-GList *
-empathy_contact_list_get_pendings (EmpathyContactList *list)
-{
-       g_return_val_if_fail (EMPATHY_IS_CONTACT_LIST (list), NULL);
-
-       if (EMPATHY_CONTACT_LIST_GET_IFACE (list)->get_pendings) {
-               return EMPATHY_CONTACT_LIST_GET_IFACE (list)->get_pendings (list);
-       }
-
-       return NULL;
-}
-
-GList *
-empathy_contact_list_get_groups (EmpathyContactList *list,
-                                EmpathyContact     *contact)
-{
-       g_return_val_if_fail (EMPATHY_IS_CONTACT_LIST (list), NULL);
-       g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), NULL);
-
-       if (EMPATHY_CONTACT_LIST_GET_IFACE (list)->get_groups) {
-               return EMPATHY_CONTACT_LIST_GET_IFACE (list)->get_groups (list, contact);
-       }
-
-       return NULL;
-}
-
-void
-empathy_contact_list_add_to_group (EmpathyContactList *list,
-                                  EmpathyContact     *contact,
-                                  const gchar        *group)
-{
-       g_return_if_fail (EMPATHY_IS_CONTACT_LIST (list));
-       g_return_if_fail (EMPATHY_IS_CONTACT (contact));
-       g_return_if_fail (group != NULL);
-
-       if (EMPATHY_CONTACT_LIST_GET_IFACE (list)->add_to_group) {
-               EMPATHY_CONTACT_LIST_GET_IFACE (list)->add_to_group (list, contact, group);
-       }
-}
-
-void
-empathy_contact_list_remove_from_group (EmpathyContactList *list,
-                                       EmpathyContact     *contact,
-                                       const gchar        *group)
-{
-       g_return_if_fail (EMPATHY_IS_CONTACT_LIST (list));
-       g_return_if_fail (EMPATHY_IS_CONTACT (contact));
-       g_return_if_fail (group != NULL);
-
-       if (EMPATHY_CONTACT_LIST_GET_IFACE (list)->remove_from_group) {
-               EMPATHY_CONTACT_LIST_GET_IFACE (list)->remove_from_group (list, contact, group);
-       }
-}
-
-void
-empathy_contact_list_rename_group (EmpathyContactList *list,
-                                  const gchar        *old_group,
-                                  const gchar        *new_group)
-{
-       g_return_if_fail (EMPATHY_IS_CONTACT_LIST (list));
-       g_return_if_fail (old_group != NULL);
-       g_return_if_fail (new_group != NULL);
-
-       if (EMPATHY_CONTACT_LIST_GET_IFACE (list)->rename_group) {
-               EMPATHY_CONTACT_LIST_GET_IFACE (list)->rename_group (list, old_group, new_group);
-       }
-}
-
-void
-empathy_contact_list_remove_group (EmpathyContactList *list,
-                                  const gchar *group)
-{
-       g_return_if_fail (EMPATHY_IS_CONTACT_LIST (list));
-       g_return_if_fail (group != NULL);
-
-       if (EMPATHY_CONTACT_LIST_GET_IFACE (list)->remove_group) {
-               EMPATHY_CONTACT_LIST_GET_IFACE (list)->remove_group (list, group);
-       }
-}
diff --git a/libempathy/empathy-contact-list.h b/libempathy/empathy-contact-list.h
deleted file mode 100644 (file)
index a914936..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2007-2008 Collabora Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Authors: Xavier Claessens <xclaesse@gmail.com>
- */
-
-#ifndef __EMPATHY_CONTACT_LIST_H__
-#define __EMPATHY_CONTACT_LIST_H__
-
-#include <glib-object.h>
-
-#include "empathy-types.h"
-#include "empathy-contact.h"
-
-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_IS_CONTACT_LIST(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), EMPATHY_TYPE_CONTACT_LIST))
-#define EMPATHY_CONTACT_LIST_GET_IFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), EMPATHY_TYPE_CONTACT_LIST, EmpathyContactListIface))
-
-typedef struct _EmpathyContactListIface EmpathyContactListIface;
-
-struct _EmpathyContactListIface {
-       GTypeInterface   base_iface;
-
-       /* VTabled */
-       void             (*add)               (EmpathyContactList *list,
-                                              EmpathyContact     *contact,
-                                              const gchar        *message);
-       void             (*remove)            (EmpathyContactList *list,
-                                              EmpathyContact     *contact,
-                                              const gchar        *message);
-       GList *          (*get_members)       (EmpathyContactList *list);
-       GList *          (*get_pendings)      (EmpathyContactList *list);
-       GList *          (*get_groups)        (EmpathyContactList *list,
-                                              EmpathyContact     *contact);
-       void             (*add_to_group)      (EmpathyContactList *list,
-                                              EmpathyContact     *contact,
-                                              const gchar        *group);
-       void             (*remove_from_group) (EmpathyContactList *list,
-                                              EmpathyContact     *contact,
-                                              const gchar        *group);
-       void             (*rename_group)      (EmpathyContactList *list,
-                                              const gchar        *old_group,
-                                              const gchar        *new_group);
-       void             (*remove_group)      (EmpathyContactList *list,
-                                              const gchar        *group);
-};
-
-GType    empathy_contact_list_get_type          (void) G_GNUC_CONST;
-void     empathy_contact_list_add               (EmpathyContactList *list,
-                                                EmpathyContact     *contact,
-                                                const gchar        *message);
-void     empathy_contact_list_remove            (EmpathyContactList *list,
-                                                EmpathyContact     *contact,
-                                                const gchar        *message);
-GList *  empathy_contact_list_get_members       (EmpathyContactList *list);
-GList *  empathy_contact_list_get_pendings      (EmpathyContactList *list);
-GList *  empathy_contact_list_get_groups        (EmpathyContactList *list,
-                                                EmpathyContact     *contact);
-void     empathy_contact_list_add_to_group      (EmpathyContactList *list,
-                                                EmpathyContact     *contact,
-                                                const gchar        *group);
-void     empathy_contact_list_remove_from_group (EmpathyContactList *list,
-                                                EmpathyContact     *contact,
-                                                const gchar        *group);
-void     empathy_contact_list_rename_group      (EmpathyContactList *list,
-                                                const gchar        *old_group,
-                                                const gchar        *new_group);
-void    empathy_contact_list_remove_group      (EmpathyContactList *list,
-                                                const gchar        *group);
-
-G_END_DECLS
-
-#endif /* __EMPATHY_CONTACT_LIST_H__ */
-