[empathy/next] remove CredentialsStorage extension

[Guillaume Desmottes <gdesmott src gnome org>]

commit a133ce0e7a2977c0c70076ba73cd6a9c08e51149
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Tue Feb 4 12:49:35 2014 +0100

    remove CredentialsStorage extension

 .../Channel_Interface_Credentials_Storage.xml      |   59 --------------------
 extensions/Makefile.am                             |    1 -
 extensions/misc.xml                                |    1 -
 libempathy/empathy-server-sasl-handler.c           |   26 +--------
 4 files changed, 2 insertions(+), 85 deletions(-)
---
diff --git a/extensions/Makefile.am b/extensions/Makefile.am
index f72c407..c11de35 100644
--- a/extensions/Makefile.am
+++ b/extensions/Makefile.am
@@ -14,7 +14,6 @@ EXTRA_DIST = \
     misc.xml \
     Logger.xml \
     Connection_Interface_Renaming.xml \
-    Channel_Interface_Credentials_Storage.xml \
     Chat_Manager.xml \
     $(NULL)
 
diff --git a/extensions/misc.xml b/extensions/misc.xml
index f2f15b0..91e9a94 100644
--- a/extensions/misc.xml
+++ b/extensions/misc.xml
@@ -7,6 +7,5 @@
 <xi:include href="Logger.xml" />
 <xi:include href="Chat_Manager.xml" />
 <xi:include href="Connection_Interface_Renaming.xml" />
-<xi:include href="Channel_Interface_Credentials_Storage.xml" />
 
 </tp:spec>
diff --git a/libempathy/empathy-server-sasl-handler.c b/libempathy/empathy-server-sasl-handler.c
index 90808f7..40be730 100644
--- a/libempathy/empathy-server-sasl-handler.c
+++ b/libempathy/empathy-server-sasl-handler.c
@@ -417,11 +417,6 @@ empathy_server_sasl_handler_provide_password (
           priv->password = g_strdup (password);
           priv->save_password = TRUE;
         }
-      else if (tp_proxy_has_interface_by_id (priv->channel,
-            EMP_IFACE_QUARK_CHANNEL_INTERFACE_CREDENTIALS_STORAGE))
-        {
-          DEBUG ("Channel implements Ch.I.CredentialsStorage");
-        }
       else
         {
           DEBUG ("Asked to remember password, but doing so is not permitted");
@@ -433,15 +428,6 @@ empathy_server_sasl_handler_provide_password (
       /* delete any password present, it shouldn't be there */
       tpaw_keyring_delete_account_password_async (priv->account, NULL, NULL);
     }
-
-  /* Additionally, if we implement Ch.I.CredentialsStorage, inform that
-   * whether we want to remember the password */
-  if (tp_proxy_has_interface_by_id (priv->channel,
-        EMP_IFACE_QUARK_CHANNEL_INTERFACE_CREDENTIALS_STORAGE))
-    {
-      emp_cli_channel_interface_credentials_storage_call_store_credentials (
-          TP_PROXY (priv->channel), -1, remember, NULL, NULL, NULL, NULL);
-    }
 }
 
 void
@@ -501,25 +487,17 @@ empathy_server_sasl_handler_has_password (EmpathyServerSASLHandler *handler)
  * empathy_server_sasl_handler_can_save_response_somewhere:
  * @self:
  *
- * Returns: %TRUE if the response can be saved somewhere, either the keyring
- *   or via Ch.I.CredentialsStorage
+ * Returns: %TRUE if the response can be saved into the keyring
  */
 gboolean
 empathy_server_sasl_handler_can_save_response_somewhere (
     EmpathyServerSASLHandler *self)
 {
   EmpathyServerSASLHandlerPriv *priv;
-  gboolean may_save_response;
-  gboolean has_storage_iface;
 
   g_return_val_if_fail (EMPATHY_IS_SERVER_SASL_HANDLER (self), FALSE);
 
   priv = self->priv;
 
-  may_save_response = channel_has_may_save_response (priv->channel);
-
-  has_storage_iface = tp_proxy_has_interface_by_id (priv->channel,
-      EMP_IFACE_QUARK_CHANNEL_INTERFACE_CREDENTIALS_STORAGE);
-
-  return may_save_response || has_storage_iface;
+  return channel_has_may_save_response (priv->channel);
 }