Merge branch 'gnome-3-4'

[empathy.git] / src / empathy-auth-client.c

diff --git a/src/empathy-auth-client.c b/src/empathy-auth-client.c
index 0797952c3a4be22a06cefa32e680fae866f3daff..ec433ca97156c47ef40d6195c24bbb21cd0c31a8 100644 (file)
--- a/src/empathy-auth-client.c
+++ b/src/empathy-auth-client.c
@@ -93,8 +93,8 @@ tls_dialog_response_cb (GtkDialog *dialog,
     gint response_id,
     gpointer user_data)
 {
-  EmpathyTLSCertificate *certificate = NULL;
-  EmpTLSCertificateRejectReason reason = 0;
+  TpTLSCertificate *certificate = NULL;
+  TpTLSCertificateRejectReason reason = 0;
   GHashTable *details = NULL;
   EmpathyTLSDialog *tls_dialog = EMPATHY_TLS_DIALOG (dialog);
   gboolean remember = FALSE;
@@ -113,13 +113,15 @@ tls_dialog_response_cb (GtkDialog *dialog,
 
   if (response_id == GTK_RESPONSE_YES)
     {
-      empathy_tls_certificate_accept_async (certificate, NULL, NULL);
+      tp_tls_certificate_accept_async (certificate, NULL, NULL);
     }
   else
     {
       tp_asv_set_boolean (details, "user-requested", TRUE);
-      empathy_tls_certificate_reject_async (certificate, reason, details,
-          NULL, NULL);
+      tp_tls_certificate_add_rejection (certificate, reason, NULL,
+          g_variant_new_parsed ("{ 'user-requested': <%b> }", TRUE));
+
+      tp_tls_certificate_reject_async (certificate, NULL, NULL);
     }
 
   if (remember)
@@ -138,9 +140,9 @@ tls_dialog_response_cb (GtkDialog *dialog,
 }
 
 static void
-display_interactive_dialog (EmpathyTLSCertificate *certificate,
+display_interactive_dialog (TpTLSCertificate *certificate,
     EmpathyTLSVerifier *verifier,
-    EmpTLSCertificateRejectReason reason,
+    TpTLSCertificateRejectReason reason,
     GHashTable *details)
 {
   GtkWidget *tls_dialog;
@@ -162,9 +164,9 @@ verifier_verify_cb (GObject *source,
     GAsyncResult *result,
     gpointer user_data)
 {
-  EmpTLSCertificateRejectReason reason;
+  TpTLSCertificateRejectReason reason;
   GError *error = NULL;
-  EmpathyTLSCertificate *certificate = NULL;
+  TpTLSCertificate *certificate = NULL;
   GHashTable *details = NULL;
   gchar *hostname = NULL;
 
@@ -185,7 +187,7 @@ verifier_verify_cb (GObject *source,
     }
   else
     {
-      empathy_tls_certificate_accept_async (certificate, NULL, NULL);
+      tp_tls_certificate_accept_async (certificate, NULL, NULL);
     }
 
   g_free (hostname);
@@ -197,7 +199,7 @@ auth_factory_new_tls_handler_cb (EmpathyAuthFactory *factory,
     EmpathyServerTLSHandler *handler,
     gpointer user_data)
 {
-  EmpathyTLSCertificate *certificate = NULL;
+  TpTLSCertificate *certificate = NULL;
   gchar *hostname = NULL;
   gchar **reference_identities = NULL;
   EmpathyTLSVerifier *verifier;
@@ -261,7 +263,7 @@ auth_factory_auth_passsword_failed (EmpathyAuthFactory *factory,
 {
   GtkWidget *dialog;
 
-  DEBUG ("Authentification on %s failed, popup password dialog",
+  DEBUG ("Authentication on %s failed, popup password dialog",
       tp_account_get_path_suffix (account));
 
   dialog = empathy_bad_password_dialog_new (account, password);
@@ -283,8 +285,6 @@ main (int argc,
   TpSimpleClientFactory *tp_factory;
   TpDBusDaemon *dbus;
 
-  g_thread_init (NULL);
-
   context = g_option_context_new (N_(" - Empathy authentication client"));
   g_option_context_add_group (context, gtk_get_option_group (TRUE));
   g_option_context_set_translation_domain (context, GETTEXT_PACKAGE);
@@ -309,6 +309,9 @@ main (int argc,
   gtk_window_set_default_icon_name ("empathy");
   textdomain (GETTEXT_PACKAGE);
 
+  /* There is no 'main' UI window so just use the default GdkScreen */
+  empathy_set_css_provider (NULL);
+
 #ifdef ENABLE_DEBUG
   /* Set up debug sender */
   debug_sender = tp_debug_sender_dup ();