diff options
| author | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2010-11-23 18:40:08 +0000 |
|---|---|---|
| committer | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2010-11-25 10:09:02 +0000 |
| commit | 27d51779b804726e0f415459f2f3e0b786cb0361 (patch) | |
| tree | 6f2f0b35c4c4a3d3fdaa48d368b29c9afc354eb7 /src/protocol.c | |
| parent | fe91e39c4d6dd751c168394651f89dc5c9ba7133 (diff) | |
| download | telepathy-haze-27d51779b804726e0f415459f2f3e0b786cb0361.tar.gz | |
protocol: make password no longer required
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 19dbdb7..eb1b046 100644 --- a/src/protocol.c +++ b/src/protocol.c @@ -458,7 +458,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; @@ -479,11 +479,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; |