diff options
| author | Stef Walter <stefw@collabora.co.uk> | 2011-03-22 22:22:43 +0800 |
|---|---|---|
| committer | Stef Walter <stefw@collabora.co.uk> | 2011-03-22 22:22:43 +0800 |
| commit | 6c5affb1f943b6685a0ac63adcfff24b47be6e2e (patch) | |
| tree | 1e614836c265504c1c7c29911d5d1b8caac0f04c /src | |
| parent | 5316d721a24d2c1c2496f751a4cf139d88e274c1 (diff) | |
| parent | 698675bdc1fbc7e6e622be24e272df7e70f34716 (diff) | |
| download | gsoc2013-empathy-6c5affb1f943b6685a0ac63adcfff24b47be6e2e.tar gsoc2013-empathy-6c5affb1f943b6685a0ac63adcfff24b47be6e2e.tar.gz gsoc2013-empathy-6c5affb1f943b6685a0ac63adcfff24b47be6e2e.tar.bz2 gsoc2013-empathy-6c5affb1f943b6685a0ac63adcfff24b47be6e2e.tar.lz gsoc2013-empathy-6c5affb1f943b6685a0ac63adcfff24b47be6e2e.tar.xz gsoc2013-empathy-6c5affb1f943b6685a0ac63adcfff24b47be6e2e.tar.zst gsoc2013-empathy-6c5affb1f943b6685a0ac63adcfff24b47be6e2e.zip | |
Merge branch 'reference-identities'
Conflicts:
libempathy/empathy-server-tls-handler.c
Diffstat (limited to 'src')
| -rw-r--r-- | src/empathy-auth-client.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/empathy-auth-client.c b/src/empathy-auth-client.c index df2003495..68c4543a8 100644 --- a/src/empathy-auth-client.c +++ b/src/empathy-auth-client.c @@ -197,6 +197,7 @@ auth_factory_new_tls_handler_cb (EmpathyAuthFactory *factory, { EmpathyTLSCertificate *certificate = NULL; gchar *hostname = NULL; + gchar **reference_identities = NULL; EmpathyTLSVerifier *verifier; DEBUG ("New TLS server handler received from the factory"); @@ -204,15 +205,18 @@ auth_factory_new_tls_handler_cb (EmpathyAuthFactory *factory, g_object_get (handler, "certificate", &certificate, "hostname", &hostname, + "reference-identities", &reference_identities, NULL); - verifier = empathy_tls_verifier_new (certificate, hostname); + verifier = empathy_tls_verifier_new (certificate, hostname, + (const gchar **) reference_identities); empathy_tls_verifier_verify_async (verifier, verifier_verify_cb, NULL); g_object_unref (verifier); g_object_unref (certificate); g_free (hostname); + g_strfreev (reference_identities); } static void |