[evolution-kolab/experimental: 3/6] Remove camel_kolab_session_set_password().
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-kolab/experimental: 3/6] Remove camel_kolab_session_set_password().
- Date: Fri, 31 Aug 2012 14:50:28 +0000 (UTC)
commit c272c689edd298fa520b20298a59a66d6a57431b
Author: Matthew Barnes <mbarnes redhat com>
Date: Tue Aug 28 23:09:02 2012 -0400
Remove camel_kolab_session_set_password().
The registry service feeds us passwords to test, CamelIMAPXServer knows
how to test them. We don't need to stash a password ahead of time.
This actually solves a chicken-and-egg problem I encountered earlier:
KolabMailImapClient won't let us go online until it has a password,
but we can't provide a verified password until we go online to try it.
src/libekolab/camel-kolab-session.c | 17 -----------------
src/libekolab/camel-kolab-session.h | 4 ----
src/libekolab/kolab-mail-imap-client.c | 12 ------------
3 files changed, 0 insertions(+), 33 deletions(-)
---
diff --git a/src/libekolab/camel-kolab-session.c b/src/libekolab/camel-kolab-session.c
index c9a9ade..eff0765 100644
--- a/src/libekolab/camel-kolab-session.c
+++ b/src/libekolab/camel-kolab-session.c
@@ -374,21 +374,4 @@ camel_kolab_session_set_token_pin (CamelKolabSession *self,
nss_tok_pin = g_strdup (pin);
}
-void
-camel_kolab_session_set_password (CamelKolabSession *self,
- const gchar *passwd)
-{
- /* TODO rework to CamelSettings */
-
- CamelKolabSessionPrivate *priv = NULL;
-
- g_assert (CAMEL_IS_KOLAB_SESSION (self));
- priv = CAMEL_KOLAB_SESSION_PRIVATE (self);
-
- if (priv->passwd != NULL)
- g_free (priv->passwd);
-
- priv->passwd = g_strdup (passwd);
-}
-
/*----------------------------------------------------------------------------*/
diff --git a/src/libekolab/camel-kolab-session.h b/src/libekolab/camel-kolab-session.h
index 78be880..6da4bcc 100644
--- a/src/libekolab/camel-kolab-session.h
+++ b/src/libekolab/camel-kolab-session.h
@@ -103,10 +103,6 @@ void
camel_kolab_session_set_token_pin (CamelKolabSession *self,
const gchar *pin);
-void
-camel_kolab_session_set_password (CamelKolabSession *self,
- const gchar *passwd);
-
G_END_DECLS
/*----------------------------------------------------------------------------*/
diff --git a/src/libekolab/kolab-mail-imap-client.c b/src/libekolab/kolab-mail-imap-client.c
index d94f826..9709966 100644
--- a/src/libekolab/kolab-mail-imap-client.c
+++ b/src/libekolab/kolab-mail-imap-client.c
@@ -955,18 +955,6 @@ kolab_mail_imap_client_go_online (KolabMailImapClient *self,
if (priv->is_online == TRUE)
return TRUE;
- /* set the user password (we get it late in the book backend) */
- tmp_str = kolab_settings_handler_get_char_field (priv->ksettings,
- KOLAB_SETTINGS_HANDLER_CHAR_FIELD_KOLAB_USER_PASSWORD,
- &tmp_err);
- if (tmp_err != NULL) {
- g_propagate_error (err, tmp_err);
- return FALSE;
- }
- if (tmp_str == NULL)
- g_warning ("%s: no password supplied", __func__);
- camel_kolab_session_set_password (priv->session, tmp_str);
-
/* set the TPM token pin (we may get it late in the book backend) */
settings = kolab_settings_handler_get_camel_settings (priv->ksettings);
tmp_str = camel_kolab_imapx_settings_get_pkcs11_pin (settings);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]