[next] telepathy-glib: tls-certificate: set the 'factory' property

[Guillaume Desmottes]

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

Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Fri Mar 14 15:08:24 2014 +0100

tls-certificate: set the 'factory' property

---

 telepathy-glib/client-factory.c  |    1 +
 telepathy-glib/tls-certificate.c |    1 +
 2 files changed, 2 insertions(+)

diff --git a/telepathy-glib/client-factory.c b/telepathy-glib/client-factory.c
index 370ff49..32de72c 100644
--- a/telepathy-glib/client-factory.c
+++ b/telepathy-glib/client-factory.c
@@ -1568,6 +1568,7 @@ tp_client_factory_dup_tls_certificate_features (TpClientFactory *self,
 {
   g_return_val_if_fail (TP_IS_CLIENT_FACTORY (self), NULL);
   g_return_val_if_fail (TP_IS_TLS_CERTIFICATE (certificate), NULL);
+  g_return_val_if_fail (tp_proxy_get_factory (certificate) == self, NULL);
 
   return TP_CLIENT_FACTORY_GET_CLASS (self)->dup_tls_certificate_features (
       self, certificate);
diff --git a/telepathy-glib/tls-certificate.c b/telepathy-glib/tls-certificate.c
index 8e3a934..0930335 100644
--- a/telepathy-glib/tls-certificate.c
+++ b/telepathy-glib/tls-certificate.c
@@ -624,6 +624,7 @@ _tp_tls_certificate_new (TpProxy *conn_or_chan,
       "dbus-daemon", tp_proxy_get_dbus_daemon (conn_or_chan),
       "bus-name", tp_proxy_get_bus_name (conn_or_chan),
       "object-path", object_path,
+      "factory", tp_proxy_get_factory (conn_or_chan),
       NULL);
 
 finally: