aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCosimo Cecchi <cosimoc@gnome.org>2010-08-19 00:01:15 +0800
committerCosimo Cecchi <cosimoc@gnome.org>2010-08-19 01:19:00 +0800
commit6c3c7278e4d1716342d1d222891c33e98d829691 (patch)
tree87aec9cac6a4bf6110c2d192985327b43ae09640
parent37d64d2ec686d48a88db3f94b92e88df213b11b7 (diff)
downloadgsoc2013-empathy-6c3c7278e4d1716342d1d222891c33e98d829691.tar
gsoc2013-empathy-6c3c7278e4d1716342d1d222891c33e98d829691.tar.gz
gsoc2013-empathy-6c3c7278e4d1716342d1d222891c33e98d829691.tar.bz2
gsoc2013-empathy-6c3c7278e4d1716342d1d222891c33e98d829691.tar.lz
gsoc2013-empathy-6c3c7278e4d1716342d1d222891c33e98d829691.tar.xz
gsoc2013-empathy-6c3c7278e4d1716342d1d222891c33e98d829691.tar.zst
gsoc2013-empathy-6c3c7278e4d1716342d1d222891c33e98d829691.zip
Use the hash table directly as a parameter to reject ()
Clients will have to fill it anyway
-rw-r--r--libempathy/empathy-tls-certificate.c7
-rw-r--r--libempathy/empathy-tls-certificate.h2
2 files changed, 2 insertions, 7 deletions
diff --git a/libempathy/empathy-tls-certificate.c b/libempathy/empathy-tls-certificate.c
index acdbcec93..bed01327c 100644
--- a/libempathy/empathy-tls-certificate.c
+++ b/libempathy/empathy-tls-certificate.c
@@ -457,11 +457,10 @@ empathy_tls_certificate_accept_finish (EmpathyTLSCertificate *self,
void
empathy_tls_certificate_reject_async (EmpathyTLSCertificate *self,
EmpTLSCertificateRejectReason reason,
- gboolean user_requested,
+ GHashTable *details,
GAsyncReadyCallback callback,
gpointer user_data)
{
- GHashTable *details;
const gchar *dbus_error;
GSimpleAsyncResult *reject_result;
EmpathyTLSCertificatePriv *priv = GET_PRIV (self);
@@ -471,16 +470,12 @@ empathy_tls_certificate_reject_async (EmpathyTLSCertificate *self,
DEBUG ("Rejecting TLS certificate with reason %u", reason);
dbus_error = reject_reason_get_dbus_error (reason);
- details = tp_asv_new ("user-requested", G_TYPE_BOOLEAN, user_requested,
- NULL);
reject_result = g_simple_async_result_new (G_OBJECT (self),
callback, user_data, empathy_tls_certificate_reject_async);
emp_cli_authentication_tls_certificate_call_reject (priv->proxy,
-1, reason, dbus_error, details, cert_proxy_reject_cb,
reject_result, g_object_unref, G_OBJECT (self));
-
- g_hash_table_unref (details);
}
gboolean
diff --git a/libempathy/empathy-tls-certificate.h b/libempathy/empathy-tls-certificate.h
index 3a606c602..7066e5119 100644
--- a/libempathy/empathy-tls-certificate.h
+++ b/libempathy/empathy-tls-certificate.h
@@ -75,7 +75,7 @@ gboolean empathy_tls_certificate_accept_finish (EmpathyTLSCertificate *self,
void empathy_tls_certificate_reject_async (EmpathyTLSCertificate *self,
EmpTLSCertificateRejectReason reason,
- gboolean user_requested,
+ GHashTable *details,
GAsyncReadyCallback callback,
gpointer user_data);
gboolean empathy_tls_certificate_reject_finish (EmpathyTLSCertificate *self,