[next] telepathy-glib: TpProxy: inline and update TpProxyImplementation registration

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Tue Mar 11 18:59:39 2014 +0000

TpProxy: inline and update TpProxyImplementation registration

---

 telepathy-glib/proxy.c |   34 ++++++++++------------------------
 1 file changed, 10 insertions(+), 24 deletions(-)

diff --git a/telepathy-glib/proxy.c b/telepathy-glib/proxy.c
index 62e959b..82ec315 100644
--- a/telepathy-glib/proxy.c
+++ b/telepathy-glib/proxy.c
@@ -1128,18 +1128,25 @@ tp_proxy_finalize (GObject *object)
   G_OBJECT_CLASS (tp_proxy_parent_class)->finalize (object);
 }
 
-static void tp_proxy_once (void);
-
 static void
 tp_proxy_class_init (TpProxyClass *klass)
 {
+  TpProxyImplementation impl = {
+      VERSION,
+      sizeof (TpProxyImplementation),
+      _tp_proxy_check_interface_by_id,
+      _tp_proxy_pending_call_v1_new,
+      _tp_proxy_signal_connection_v1_new,
+      /* keep this at the end as a final sanity-check of the size */
+      TP_TYPE_PROXY
+  };
   GParamSpec *param_spec;
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
   /* Ensure that remote errors will be mapped to the TP_ERROR domain */
   TP_ERROR;
 
-  tp_proxy_once ();
+  tp_private_proxy_set_implementation (&impl);
 
   g_type_class_add_private (klass, sizeof (TpProxyPrivate));
 
@@ -1387,27 +1394,6 @@ tp_proxy_get_invalidated (gpointer self)
   return proxy->priv->invalidated;
 }
 
-static void
-tp_proxy_once (void)
-{
-  TpProxyImplementation impl = {
-      VERSION,
-      sizeof (TpProxyImplementation),
-      _tp_proxy_get_interface_by_id,
-      _tp_proxy_check_interface_by_id,
-      _tp_proxy_pending_call_new,
-      _tp_proxy_pending_call_take_pending_call,
-      _tp_proxy_pending_call_take_results,
-      _tp_proxy_pending_call_completed,
-      _tp_proxy_signal_connection_new,
-      _tp_proxy_signal_connection_take_results,
-      /* keep this at the end as a final sanity-check of the size */
-      TP_TYPE_PROXY
-  };
-
-  tp_private_proxy_set_implementation (&impl);
-}
-
 static const TpProxyFeature *
 tp_proxy_subclass_get_feature (GType type,
     GQuark feature)