[next] telepathy-glib: remove tp_protocol_new() from the API

[Guillaume Desmottes]

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

Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Fri Mar  7 11:39:12 2014 +0100

remove tp_protocol_new() from the API

---

 docs/reference/telepathy-glib/telepathy-glib-sections.txt |    1 -
 telepathy-glib/client-factory.c                           |    3 ++-
 telepathy-glib/connection-manager.c                       |    6 +++---
 telepathy-glib/protocol-internal.h                        |    6 ++++++
 telepathy-glib/protocol.c                                 |    6 +++---
 telepathy-glib/protocol.h                                 |    6 ------
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/docs/reference/telepathy-glib/telepathy-glib-sections.txt b/docs/reference/telepathy-glib/telepathy-glib-sections.txt
index 5fa3052..3181c4a 100644
--- a/docs/reference/telepathy-glib/telepathy-glib-sections.txt
+++ b/docs/reference/telepathy-glib/telepathy-glib-sections.txt
@@ -4844,7 +4844,6 @@ TP_TYPE_SVC_PROTOCOL_INTERFACE_AVATARS1
 <TITLE>protocol</TITLE>
 TpProtocol
 TpProtocolClass
-tp_protocol_new
 tp_protocol_get_name
 tp_protocol_get_cm_name
 tp_protocol_init_known_interfaces
diff --git a/telepathy-glib/client-factory.c b/telepathy-glib/client-factory.c
index b703737..de41e1b 100644
--- a/telepathy-glib/client-factory.c
+++ b/telepathy-glib/client-factory.c
@@ -128,6 +128,7 @@
 #include "telepathy-glib/contact-internal.h"
 #include "telepathy-glib/debug-internal.h"
 #include "telepathy-glib/client-factory-internal.h"
+#include "telepathy-glib/protocol-internal.h"
 #include "telepathy-glib/util-internal.h"
 #include "telepathy-glib/variant-util.h"
 
@@ -389,7 +390,7 @@ create_protocol_impl (TpClientFactory *self,
     GVariant *immutable_properties G_GNUC_UNUSED,
     GError **error)
 {
-  return tp_protocol_new (self->priv->dbus, cm_name, protocol_name,
+  return _tp_protocol_new (self->priv->dbus, cm_name, protocol_name,
       immutable_properties, error);
 }
 
diff --git a/telepathy-glib/connection-manager.c b/telepathy-glib/connection-manager.c
index 5ae29b9..a68b57c 100644
--- a/telepathy-glib/connection-manager.c
+++ b/telepathy-glib/connection-manager.c
@@ -384,11 +384,11 @@ tp_connection_manager_get_all_cb (TpProxy *proxy,
 
               if (tp_connection_manager_check_valid_protocol_name (name, NULL))
                 {
-                  TpProtocol *proto_object = tp_protocol_new (
+                  TpProtocol *proto_object = _tp_protocol_new (
                       tp_proxy_get_dbus_daemon (self), self->priv->name, name,
                       tp_asv_to_vardict (v), NULL);
 
-                  /* tp_protocol_new can currently only fail because of
+                  /* _tp_protocol_new can currently only fail because of
                    * malformed names, and we already checked for that */
                   g_assert (proto_object != NULL);
 
@@ -627,7 +627,7 @@ tp_connection_manager_read_file (TpDBusDaemon *dbus_daemon,
       if (immutables == NULL)
         continue;
 
-      proto_object = tp_protocol_new (dbus_daemon, cm_name, name,
+      proto_object = _tp_protocol_new (dbus_daemon, cm_name, name,
           tp_asv_to_vardict (immutables), NULL);
       g_assert (proto_object != NULL);
 
diff --git a/telepathy-glib/protocol-internal.h b/telepathy-glib/protocol-internal.h
index 3653158..c6b750b 100644
--- a/telepathy-glib/protocol-internal.h
+++ b/telepathy-glib/protocol-internal.h
@@ -34,6 +34,12 @@ struct _TpConnectionManagerParam
   guint flags;
 };
 
+TpProtocol * _tp_protocol_new (TpDBusDaemon *dbus,
+    const gchar *cm_name,
+    const gchar *protocol_name,
+    GVariant *immutable_properties,
+    GError **error);
+
 GHashTable *_tp_protocol_parse_manager_file (GKeyFile *file,
     const gchar *cm_name,
     const gchar *group,
diff --git a/telepathy-glib/protocol.c b/telepathy-glib/protocol.c
index 1775257..482f992 100644
--- a/telepathy-glib/protocol.c
+++ b/telepathy-glib/protocol.c
@@ -886,8 +886,8 @@ tp_protocol_init (TpProtocol *self)
       TpProtocolPrivate);
 }
 
-/**
- * tp_protocol_new:
+/*
+ * _tp_protocol_new:
  * @dbus: proxy for the D-Bus daemon; may not be %NULL
  * @cm_name: the connection manager name (such as "gabble")
  * @protocol_name: the protocol name (such as "jabber")
@@ -906,7 +906,7 @@ tp_protocol_init (TpProtocol *self)
  * Since: 0.UNRELEASED
  */
 TpProtocol *
-tp_protocol_new (TpDBusDaemon *dbus,
+_tp_protocol_new (TpDBusDaemon *dbus,
     const gchar *cm_name,
     const gchar *protocol_name,
     GVariant *immutable_properties,
diff --git a/telepathy-glib/protocol.h b/telepathy-glib/protocol.h
index 7acefae..5619f04 100644
--- a/telepathy-glib/protocol.h
+++ b/telepathy-glib/protocol.h
@@ -67,12 +67,6 @@ struct _TpProtocol
 
 void tp_protocol_init_known_interfaces (void);
 
-TpProtocol * tp_protocol_new (TpDBusDaemon *dbus,
-    const gchar *cm_name,
-    const gchar *protocol_name,
-    GVariant *immutable_properties,
-    GError **error);
-
 const gchar *tp_protocol_get_name (TpProtocol *self);
 
 _TP_AVAILABLE_IN_0_20