Drop EmpathyContactFactory

3 files changed, 2 insertions, 270 deletions

diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am
index f82f4cc0f..d035f8815 100644
--- a/libempathy/Makefile.am
+++ b/libempathy/Makefile.am
@@ -21,10 +21,9 @@ libempathy_la_SOURCES =					\
 	empathy-account-manager.c			\
 	empathy-chatroom.c				\
 	empathy-chatroom-manager.c			\
-	empathy-call-factory.c			\
-	empathy-call-handler.c			\
+	empathy-call-factory.c				\
+	empathy-call-handler.c				\
 	empathy-contact.c				\
-	empathy-contact-factory.c			\
 	empathy-contact-groups.c			\
 	empathy-contact-list.c				\
 	empathy-contact-manager.c			\
@@ -72,7 +71,6 @@ libempathy_headers =				\
 	empathy-call-factory.h			\
 	empathy-call-handler.h			\
 	empathy-contact.h			\
-	empathy-contact-factory.h		\
 	empathy-contact-groups.h		\
 	empathy-contact-list.h			\
 	empathy-contact-manager.h		\
diff --git a/libempathy/empathy-contact-factory.c b/libempathy/empathy-contact-factory.c
deleted file mode 100644
index c35005774..000000000
--- a/libempathy/empathy-contact-factory.c
+++ /dev/null
@@ -1,187 +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-factory.h"
-#include "empathy-utils.h"
-
-#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyContactFactory)
-typedef struct {
-	GHashTable *accounts;
-} EmpathyContactFactoryPriv;
-
-G_DEFINE_TYPE (EmpathyContactFactory, empathy_contact_factory, G_TYPE_OBJECT);
-
-static EmpathyContactFactory * factory_singleton = NULL;
-
-EmpathyTpContactFactory *
-empathy_contact_factory_get_tp_factory (EmpathyContactFactory *factory,
-					McAccount             *account)
-{
-	EmpathyContactFactoryPriv *priv = GET_PRIV (factory);
-	EmpathyTpContactFactory   *tp_factory;
-
-	tp_factory = g_hash_table_lookup (priv->accounts, account);
-	if (!tp_factory) {
-		tp_factory = empathy_tp_contact_factory_new (account);
-		g_hash_table_insert (priv->accounts, account, tp_factory);
-	}
-
-	return g_object_ref (tp_factory);
-}
-
-EmpathyContact *
-empathy_contact_factory_get_user (EmpathyContactFactory *factory,
-				  McAccount             *account)
-{
-	EmpathyTpContactFactory *tp_factory;
-
-	tp_factory = empathy_contact_factory_get_tp_factory (factory, account);
-
-	return empathy_tp_contact_factory_get_user (tp_factory);
-}
-
-EmpathyContact *
-empathy_contact_factory_get_from_id (EmpathyContactFactory *factory,
-				     McAccount             *account,
-				     const gchar           *id)
-{
-	EmpathyTpContactFactory *tp_factory;
-
-	tp_factory = empathy_contact_factory_get_tp_factory (factory, account);
-
-	return empathy_tp_contact_factory_get_from_id (tp_factory, id);
-}
-
-EmpathyContact *
-empathy_contact_factory_get_from_handle (EmpathyContactFactory *factory,
-					 McAccount             *account,
-					 guint                  handle)
-{
-	EmpathyTpContactFactory *tp_factory;
-
-	tp_factory = empathy_contact_factory_get_tp_factory (factory, account);
-
-	return empathy_tp_contact_factory_get_from_handle (tp_factory, handle);
-}
-
-GList *
-empathy_contact_factory_get_from_handles (EmpathyContactFactory *factory,
-					  McAccount             *account,
-					  const GArray          *handles)
-{
-	EmpathyTpContactFactory *tp_factory;
-
-	tp_factory = empathy_contact_factory_get_tp_factory (factory, account);
-
-	return empathy_tp_contact_factory_get_from_handles (tp_factory, handles);
-}
-
-void
-empathy_contact_factory_set_alias (EmpathyContactFactory *factory,
-				   EmpathyContact        *contact,
-				   const gchar           *alias)
-{
-	EmpathyTpContactFactory *tp_factory;
-	McAccount               *account;
-
-	account = empathy_contact_get_account (contact);
-	tp_factory = empathy_contact_factory_get_tp_factory (factory, account);
-
-	return empathy_tp_contact_factory_set_alias (tp_factory, contact, alias);
-}
-
-void
-empathy_contact_factory_set_avatar (EmpathyContactFactory *factory,
-				    McAccount             *account,
-				    const gchar           *data,
-				    gsize                  size,
-				    const gchar           *mime_type)
-{
-	EmpathyTpContactFactory *tp_factory;
-
-	tp_factory = empathy_contact_factory_get_tp_factory (factory, account);
-
-	return empathy_tp_contact_factory_set_avatar (tp_factory,
-						      data, size, mime_type);
-}
-
-static void
-contact_factory_finalize (GObject *object)
-{
-	EmpathyContactFactoryPriv *priv = GET_PRIV (object);
-
-	g_hash_table_destroy (priv->accounts);
-
-	G_OBJECT_CLASS (empathy_contact_factory_parent_class)->finalize (object);
-}
-
-static GObject *
-contact_factory_constructor (GType type,
-			     guint n_props,
-			     GObjectConstructParam *props)
-{
-	GObject *retval;
-
-	if (factory_singleton) {
-		retval = g_object_ref (factory_singleton);
-	} else {
-		retval = G_OBJECT_CLASS (empathy_contact_factory_parent_class)->constructor
-			(type, n_props, props);
-
-		factory_singleton = EMPATHY_CONTACT_FACTORY (retval);
-		g_object_add_weak_pointer (retval, (gpointer) &factory_singleton);
-	}
-
-	return retval;
-}
-
-static void
-empathy_contact_factory_class_init (EmpathyContactFactoryClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-	object_class->finalize = contact_factory_finalize;
-	object_class->constructor = contact_factory_constructor;
-
-	g_type_class_add_private (object_class, sizeof (EmpathyContactFactoryPriv));
-}
-
-static void
-empathy_contact_factory_init (EmpathyContactFactory *factory)
-{
-	EmpathyContactFactoryPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (factory,
-		EMPATHY_TYPE_CONTACT_FACTORY, EmpathyContactFactoryPriv);
-
-	factory->priv = priv;
-	priv->accounts = g_hash_table_new_full (empathy_account_hash,
-						empathy_account_equal,
-						g_object_unref,
-						g_object_unref);
-}
-
-EmpathyContactFactory *
-empathy_contact_factory_dup_singleton (void)
-{
-	return g_object_new (EMPATHY_TYPE_CONTACT_FACTORY, NULL);
-}
-
diff --git a/libempathy/empathy-contact-factory.h b/libempathy/empathy-contact-factory.h
deleted file mode 100644
index 16df02bcd..000000000
--- a/libempathy/empathy-contact-factory.h
+++ /dev/null
@@ -1,79 +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_FACTORY_H__
-#define __EMPATHY_CONTACT_FACTORY_H__
-
-#include <glib.h>
-
-#include <libmissioncontrol/mc-account.h>
-
-#include "empathy-contact.h"
-#include "empathy-tp-contact-factory.h"
-
-G_BEGIN_DECLS
-
-#define EMPATHY_TYPE_CONTACT_FACTORY         (empathy_contact_factory_get_type ())
-#define EMPATHY_CONTACT_FACTORY(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), EMPATHY_TYPE_CONTACT_FACTORY, EmpathyContactFactory))
-#define EMPATHY_CONTACT_FACTORY_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), EMPATHY_TYPE_CONTACT_FACTORY, EmpathyContactFactoryClass))
-#define EMPATHY_IS_CONTACT_FACTORY(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), EMPATHY_TYPE_CONTACT_FACTORY))
-#define EMPATHY_IS_CONTACT_FACTORY_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), EMPATHY_TYPE_CONTACT_FACTORY))
-#define EMPATHY_CONTACT_FACTORY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EMPATHY_TYPE_CONTACT_FACTORY, EmpathyContactFactoryClass))
-
-typedef struct _EmpathyContactFactory      EmpathyContactFactory;
-typedef struct _EmpathyContactFactoryClass EmpathyContactFactoryClass;
-
-struct _EmpathyContactFactory {
-	GObject parent;
-	gpointer priv;
-};
-
-struct _EmpathyContactFactoryClass {
-	GObjectClass parent_class;
-};
-
-GType                  empathy_contact_factory_get_type         (void) G_GNUC_CONST;
-EmpathyContactFactory *empathy_contact_factory_dup_singleton    (void);
-EmpathyTpContactFactory *empathy_contact_factory_get_tp_factory (EmpathyContactFactory *factory,
-								 McAccount             *account);
-EmpathyContact *       empathy_contact_factory_get_user         (EmpathyContactFactory *factory,
-								 McAccount             *account);
-EmpathyContact *       empathy_contact_factory_get_from_id      (EmpathyContactFactory *factory,
-								 McAccount             *account,
-								 const gchar           *id);
-EmpathyContact *       empathy_contact_factory_get_from_handle  (EmpathyContactFactory *factory,
-								 McAccount             *account,
-								 guint                  handle);
-GList *                empathy_contact_factory_get_from_handles (EmpathyContactFactory *factory,
-								 McAccount             *account,
-								 const GArray          *handles);
-void                   empathy_contact_factory_set_alias        (EmpathyContactFactory *factory,
-								 EmpathyContact        *contact,
-								 const gchar           *alias);
-void                   empathy_contact_factory_set_avatar       (EmpathyContactFactory *factory,
-								 McAccount             *account,
-								 const gchar           *data,
-								 gsize                  size,
-								 const gchar           *mime_type);
-
-G_END_DECLS
-
-#endif /* __EMPATHY_CONTACT_FACTORY_H__ */