telepathy-glib: TpTLSCertificate: don' t pass useless user_data through D-Bus calls

Guillaume Desmottes gdesmott at kemper.freedesktop.org
Wed May 9 03:15:56 PDT 2012


Module: telepathy-glib
Branch: master
Commit: 379b918d1abd987738ca9b45de1f4f31f7e52257
URL:    http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=379b918d1abd987738ca9b45de1f4f31f7e52257

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Tue Dec 14 15:43:26 2010 +0000

TpTLSCertificate: don't pass useless user_data through D-Bus calls

self is the proxy being called, so a ref is held for the duration of the
call anyway, so taking a weak ref is unnecessary.

---

 telepathy-glib/tls-certificate.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/telepathy-glib/tls-certificate.c b/telepathy-glib/tls-certificate.c
index 9bd5604..76496d3 100644
--- a/telepathy-glib/tls-certificate.c
+++ b/telepathy-glib/tls-certificate.c
@@ -238,7 +238,7 @@ static void
 cert_proxy_accept_cb (TpTLSCertificate *self,
     const GError *error,
     gpointer user_data,
-    GObject *weak_object)
+    GObject *unused_object G_GNUC_UNUSED)
 {
   GSimpleAsyncResult *accept_result = user_data;
 
@@ -257,7 +257,7 @@ static void
 cert_proxy_reject_cb (TpTLSCertificate *self,
     const GError *error,
     gpointer user_data,
-    GObject *weak_object)
+    GObject *unused_object G_GNUC_UNUSED)
 {
   GSimpleAsyncResult *reject_result = user_data;
 
@@ -344,8 +344,7 @@ tp_tls_certificate_accept_async (TpTLSCertificate *self,
 
   tp_cli_authentication_tls_certificate_call_accept (self,
       -1, cert_proxy_accept_cb,
-      accept_result, g_object_unref,
-      G_OBJECT (self));
+      accept_result, g_object_unref, NULL);
 }
 
 gboolean
@@ -399,7 +398,7 @@ tp_tls_certificate_reject_async (TpTLSCertificate *self,
 
   tp_cli_authentication_tls_certificate_call_reject (self,
       -1, rejections, cert_proxy_reject_cb,
-      reject_result, g_object_unref, G_OBJECT (self));
+      reject_result, g_object_unref, NULL);
 
   tp_clear_boxed (TP_ARRAY_TYPE_TLS_CERTIFICATE_REJECTION_LIST,
       &rejections);



More information about the telepathy-commits mailing list