[next] telepathy-glib: TpProxy: Remove now unused _tp_proxy_ensure_factory ()

Simon McVittie smcv at kemper.freedesktop.org
Thu Apr 3 07:25:28 PDT 2014


Module: telepathy-glib
Branch: next
Commit: 9ff216cb7997efcb814cb9066dc280d075f7f016
URL:    http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=9ff216cb7997efcb814cb9066dc280d075f7f016

Author: Xavier Claessens <xavier.claessens at collabora.com>
Date:   Sat Mar 29 21:12:20 2014 -0400

TpProxy: Remove now unused _tp_proxy_ensure_factory()

---

 telepathy-glib/proxy-internal.h |    3 ---
 telepathy-glib/proxy.c          |   21 ---------------------
 2 files changed, 24 deletions(-)

diff --git a/telepathy-glib/proxy-internal.h b/telepathy-glib/proxy-internal.h
index ec06e7f..ed16f27 100644
--- a/telepathy-glib/proxy-internal.h
+++ b/telepathy-glib/proxy-internal.h
@@ -114,9 +114,6 @@ gboolean _tp_proxy_will_announce_connected_finish (TpProxy *self,
     GAsyncResult *result,
     GError **error);
 
-void _tp_proxy_ensure_factory (gpointer self,
-    TpClientFactory *factory);
-
 void _tp_proxy_add_signal_connection (TpProxy *self,
     TpProxySignalConnection *sc);
 void _tp_proxy_remove_signal_connection (TpProxy *self,
diff --git a/telepathy-glib/proxy.c b/telepathy-glib/proxy.c
index 14e2b45..2b32b9d 100644
--- a/telepathy-glib/proxy.c
+++ b/telepathy-glib/proxy.c
@@ -1208,27 +1208,6 @@ tp_proxy_get_factory (gpointer self)
   return proxy->priv->factory;
 }
 
-void
-_tp_proxy_ensure_factory (gpointer proxy,
-    TpClientFactory *factory)
-{
-  TpProxy *self = TP_PROXY (proxy);
-
-  if (self->priv->factory != NULL)
-    return;
-
-  if (factory != NULL)
-    {
-      self->priv->factory = g_object_ref (factory);
-    }
-  else
-    {
-      self->priv->factory = tp_automatic_client_factory_new (self->priv->dbus_daemon);
-    }
-
-  _tp_client_factory_insert_proxy (self->priv->factory, self);
-}
-
 /**
  * tp_proxy_get_dbus_daemon:
  * @self: a #TpProxy or subclass



More information about the telepathy-commits mailing list