Add UOA auth handler and minor cleanups

src/empathy-auth-client.c

@@ -1,4 +1,8 @@
 /*
+ * Copyright (C) 2012 Jolla Ltd.
+ * Contact: John Brooks <john.brooks@jollamobile.com>
+ *
+ * Based on Empathy,
  * Copyright (C) 2010 Collabora Ltd.
  *
  * This program is free software; you can redistribute it and/or
@@ -29,23 +33,6 @@
 #include <empathy-auth-factory.h>
 #include <empathy-server-sasl-handler.h>
 #include <empathy-server-tls-handler.h>
-#if 0
-#include <empathy-tls-verifier.h>
-#define DEBUG_FLAG EMPATHY_DEBUG_TLS
-#include <libempathy/empathy-debug.h>
-#include <libempathy/empathy-utils.h>
-
-#include <libempathy-gtk/empathy-bad-password-dialog.h>
-#include <libempathy-gtk/empathy-password-dialog.h>
-#include <libempathy-gtk/empathy-tls-dialog.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
-
-#include "empathy-sanity-cleaning.h"
-
-#include <gnutls/gnutls.h>
-
-#include <extensions/extensions.h>
-#endif
 
 #define TIMEOUT 60
 
@@ -303,9 +290,9 @@ main (int argc,
       return EXIT_FAILURE;
     }
 
-  DEBUG ("Empathy auth client started.");
+  DEBUG ("SASL signon auth client started.");
 
-  if (g_getenv ("EMPATHY_PERSIST") != NULL)
+  if (g_getenv ("SASL_SIGNON_PERSIST") != NULL)
     {
       DEBUG ("Timed-exit disabled");
 

src/empathy-auth-factory.c

@@ -22,13 +22,11 @@
 #include "empathy-debug.h"
 #include "empathy-utils.h"
 
-//#include "empathy-keyring.h"
-//#include "empathy-sasl-mechanisms.h"
+#include "empathy-keyring.h"
+#include "empathy-sasl-mechanisms.h"
 #include "empathy-server-sasl-handler.h"
 #include "empathy-server-tls-handler.h"
-//#include "empathy-utils.h"
 
-// XXX
 #ifdef HAVE_UOA
 #include "empathy-uoa-auth-handler.h"
 #endif /* HAVE_UOA */
@@ -648,6 +646,7 @@ empathy_auth_factory_constructed (GObject *obj)
   tp_base_client_set_handler_bypass_approval (client, FALSE);
 
   /* Handle ServerTLSConnection and ServerAuthentication channels */
+  /* TLS channels are disabled for now due to redundant functionality. */
 #if 0
   tp_base_client_take_handler_filter (client, tp_asv_new (
           /* ChannelType */

src/empathy-keyring.c

@@ -30,9 +30,6 @@
 #include <libsignon-glib/signon-identity.h>
 #include "empathy-uoa-utils.h"
 
-#define EMPATHY_UOA_SERVICE_TYPE "IM"
-#define EMPATHY_UOA_PROVIDER "im.telepathy.Account.Storage.UOA"
-
 static AgAccountService *
 uoa_password_common (TpAccount *tp_account,
     GSimpleAsyncResult *result,