aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSushma Rai <rsushma@src.gnome.org>2006-01-23 16:26:14 +0800
committerSushma Rai <rsushma@src.gnome.org>2006-01-23 16:26:14 +0800
commit6477a27f41ac858f2e012f995a9d9856a3b8acf5 (patch)
tree98aa7035e46f2b92a6f04d98d0a3ee7439afbb34
parent669fa220040243e58efe30923b9b19ed93a0de0d (diff)
downloadgsoc2013-evolution-6477a27f41ac858f2e012f995a9d9856a3b8acf5.tar.gz
gsoc2013-evolution-6477a27f41ac858f2e012f995a9d9856a3b8acf5.tar.zst
gsoc2013-evolution-6477a27f41ac858f2e012f995a9d9856a3b8acf5.zip
Checking for the property user and username. Fixes #327819.
svn path=/trunk/; revision=31274
-rw-r--r--addressbook/ChangeLog5
-rw-r--r--addressbook/gui/component/addressbook.c12
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 = "";