]> git.0d.be Git - empathy.git/blobdiff - libempathy/empathy-server-tls-handler.c
sort contacts by most recent event
[empathy.git] / libempathy / empathy-server-tls-handler.c
index 14ab1aba7c0912437a9f8b7b1758d7c181d31d7b..f5f60d649176c52fa74f3135f09b1153d43e399a 100644 (file)
  */
 
 #include "config.h"
-
 #include "empathy-server-tls-handler.h"
 
-#define DEBUG_FLAG EMPATHY_DEBUG_TLS
-#include "empathy-debug.h"
+#include <telepathy-glib/telepathy-glib-dbus.h>
+
 #include "empathy-utils.h"
 
-#include "extensions/extensions.h"
+#define DEBUG_FLAG EMPATHY_DEBUG_TLS
+#include "empathy-debug.h"
 
 static void async_initable_iface_init (GAsyncInitableIface *iface);
 
@@ -144,18 +144,18 @@ tls_handler_init_async (GAsyncInitable *initable,
   }
 
   g_variant_lookup (properties,
-      EMP_IFACE_CHANNEL_TYPE_SERVER_TLS_CONNECTION ".ServerCertificate",
-      "&s", &cert_object_path);
+      TP_IFACE_CHANNEL_TYPE_SERVER_TLS_CONNECTION ".ServerCertificate",
+      "&o", &cert_object_path);
   bus_name = tp_proxy_get_bus_name (TP_PROXY (priv->channel));
 
-  g_variant_unref (properties);
-
   DEBUG ("Creating an TpTLSCertificate for path %s, bus name %s",
       cert_object_path, bus_name);
 
   priv->certificate = tp_tls_certificate_new (TP_PROXY (priv->channel),
       cert_object_path, &error);
 
+  g_variant_unref (properties);
+
   if (error != NULL)
     {
       DEBUG ("Unable to create the TpTLSCertificate: error %s",