diff options
| -rw-r--r-- | addressbook/ChangeLog | 5 | ||||
| -rw-r--r-- | addressbook/gui/component/addressbook.c | 12 |
2 files changed, 14 insertions, 3 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index ee94980608..d25897a2a0 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,8 @@ +2006-01-23 Sushma Rai <rsushma@novell.com> + + * addressbook/gui/component/addressbook.c (addressbook_authenticate): + Checking for the property user and username. Fixes #327819. + 2006-01-16 Harish Krishnaswamy <kharish@novell.com> * gui/component/addressbook-component.c: diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c index 289a783da4..454bd9f5b9 100644 --- a/addressbook/gui/component/addressbook.c +++ b/addressbook/gui/component/addressbook.c @@ -171,12 +171,18 @@ addressbook_authenticate (EBook *book, gboolean previous_failure, ESource *sourc auth = e_source_get_property (source, "auth"); - if (auth && !strcmp ("ldap/simple-binddn", auth)) + if (auth && !strcmp ("ldap/simple-binddn", auth)) { user = e_source_get_property (source, "binddn"); - else if (auth && !strcmp ("plain/password", auth)) + } + else if (auth && !strcmp ("plain/password", auth)) { user = e_source_get_property (source, "user"); - else + if (!user) { + user = e_source_get_property (source, "username"); + } + } + else { user = e_source_get_property (source, "email_addr"); + } if (!user) user = ""; |