[next] telepathy-glib: remove tp_tls_certificate_new from API
Guillaume Desmottes
gdesmott at kemper.freedesktop.org
Mon Mar 17 07:25:42 PDT 2014
Module: telepathy-glib
Branch: next
Commit: 2453da94509f7a45b8fc4149ec1cc05a8234e5c7
URL: http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=2453da94509f7a45b8fc4149ec1cc05a8234e5c7
Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date: Thu Mar 13 14:21:06 2014 +0100
remove tp_tls_certificate_new from API
---
docs/reference/telepathy-glib/telepathy-glib-sections.txt | 1 -
telepathy-glib/client-factory-internal.h | 4 ++++
telepathy-glib/client-factory.c | 2 +-
telepathy-glib/tls-certificate.c | 7 ++++---
telepathy-glib/tls-certificate.h | 5 -----
5 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/docs/reference/telepathy-glib/telepathy-glib-sections.txt b/docs/reference/telepathy-glib/telepathy-glib-sections.txt
index f6d1135..10d98a6 100644
--- a/docs/reference/telepathy-glib/telepathy-glib-sections.txt
+++ b/docs/reference/telepathy-glib/telepathy-glib-sections.txt
@@ -6191,7 +6191,6 @@ TpRoomInfoPriv
<TITLE>TpTLSCertificate</TITLE>
TpTLSCertificate
tp_tls_certificate_init_known_interfaces
-tp_tls_certificate_new
TP_TLS_CERTIFICATE_FEATURE_CORE
tp_tls_certificate_get_rejection
tp_tls_certificate_get_nth_rejection
diff --git a/telepathy-glib/client-factory-internal.h b/telepathy-glib/client-factory-internal.h
index ec6526d..26d8cae 100644
--- a/telepathy-glib/client-factory-internal.h
+++ b/telepathy-glib/client-factory-internal.h
@@ -72,6 +72,10 @@ TpChannelDispatchOperation *_tp_channel_dispatch_operation_new_with_factory (
GHashTable *immutable_properties,
GError **error);
+TpTLSCertificate *_tp_tls_certificate_new (TpProxy *conn_or_chan,
+ const gchar *object_path,
+ GError **error);
+
G_END_DECLS
#endif
diff --git a/telepathy-glib/client-factory.c b/telepathy-glib/client-factory.c
index da2086d..370ff49 100644
--- a/telepathy-glib/client-factory.c
+++ b/telepathy-glib/client-factory.c
@@ -420,7 +420,7 @@ create_tls_certificate_impl (TpClientFactory *self,
const gchar *object_path,
GError **error)
{
- return tp_tls_certificate_new (conn_or_chan, object_path, error);
+ return _tp_tls_certificate_new (conn_or_chan, object_path, error);
}
static GArray *
diff --git a/telepathy-glib/tls-certificate.c b/telepathy-glib/tls-certificate.c
index 86700b9..8e3a934 100644
--- a/telepathy-glib/tls-certificate.c
+++ b/telepathy-glib/tls-certificate.c
@@ -25,6 +25,7 @@
#include <glib/gstdio.h>
+#include <telepathy-glib/client-factory-internal.h>
#include <telepathy-glib/cli-misc.h>
#include <telepathy-glib/dbus.h>
#include <telepathy-glib/dbus-internal.h>
@@ -592,8 +593,8 @@ reject_reason_get_dbus_error (TpTLSCertificateRejectReason reason)
return retval;
}
-/**
- * tp_tls_certificate_new:
+/*
+ * _tp_tls_certificate_new:
* @conn_or_chan: a #TpConnection or #TpChannel parent for this object, whose
* invalidation will also result in invalidation of the returned object
* @object_path: the object path of this TLS certificate
@@ -606,7 +607,7 @@ reject_reason_get_dbus_error (TpTLSCertificateRejectReason reason)
* Since: 0.19.0
*/
TpTLSCertificate *
-tp_tls_certificate_new (TpProxy *conn_or_chan,
+_tp_tls_certificate_new (TpProxy *conn_or_chan,
const gchar *object_path,
GError **error)
{
diff --git a/telepathy-glib/tls-certificate.h b/telepathy-glib/tls-certificate.h
index c47d623..e2158d4 100644
--- a/telepathy-glib/tls-certificate.h
+++ b/telepathy-glib/tls-certificate.h
@@ -80,11 +80,6 @@ GQuark tp_tls_certificate_get_feature_quark_core (void);
(tp_tls_certificate_get_feature_quark_core ())
_TP_AVAILABLE_IN_0_20
-TpTLSCertificate *tp_tls_certificate_new (TpProxy *conn_or_chan,
- const gchar *object_path,
- GError **error);
-
-_TP_AVAILABLE_IN_0_20
TpTLSCertificateRejection *tp_tls_certificate_get_rejection (
TpTLSCertificate *self);
More information about the telepathy-commits
mailing list