diff options
| author | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2010-12-02 13:09:27 +0000 |
|---|---|---|
| committer | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2010-12-02 13:09:27 +0000 |
| commit | 6c5b65287d27f4bc0f351d886402c959231a57fb (patch) | |
| tree | 970b14e9787278cedab3817ed01b1f8fa7d4bee6 /src/protocol.c | |
| parent | 1396a698bbd367b9b44d0b7824cb84957c9f5d5a (diff) | |
| parent | c5e25193ae0cee2a9cc207d86af1018cdb2da408 (diff) | |
| download | telepathy-haze-6c5b65287d27f4bc0f351d886402c959231a57fb.tar.gz | |
Merge branch 'simple-sasl'
Conflicts:
configure.ac
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
Diffstat (limited to 'src/protocol.c')
| -rw-r--r-- | src/protocol.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/protocol.c b/src/protocol.c index c241827..9c9cddf 100644 --- a/src/protocol.c +++ b/src/protocol.c @@ -542,7 +542,7 @@ haze_protocol_get_parameters (TpBaseProtocol *protocol) (gpointer) "account", NULL }; TpCMParamSpec password_spec = { "password", DBUS_TYPE_STRING_AS_STRING, G_TYPE_STRING, - TP_CONN_MGR_PARAM_FLAG_REQUIRED | TP_CONN_MGR_PARAM_FLAG_SECRET, + TP_CONN_MGR_PARAM_FLAG_SECRET, NULL, 0, NULL, NULL, (gpointer) "password", NULL }; GArray *paramspecs; @@ -563,11 +563,7 @@ haze_protocol_get_parameters (TpBaseProtocol *protocol) /* Password parameter: */ if (!(self->priv->prpl_info->options & OPT_PROTO_NO_PASSWORD)) - { - if (self->priv->prpl_info->options & OPT_PROTO_PASSWORD_OPTIONAL) - password_spec.flags &= ~TP_CONN_MGR_PARAM_FLAG_REQUIRED; - g_array_append_val (paramspecs, password_spec); - } + g_array_append_val (paramspecs, password_spec); for (opts = self->priv->prpl_info->protocol_options; opts != NULL; |