diff options
Diffstat (limited to 'addressbook/gui/component')
4 files changed, 9 insertions, 5 deletions
diff --git a/addressbook/gui/component/addressbook-factory.c b/addressbook/gui/component/addressbook-factory.c index 1719c4fd8f..c941cbf24d 100644 --- a/addressbook/gui/component/addressbook-factory.c +++ b/addressbook/gui/component/addressbook-factory.c @@ -17,6 +17,7 @@ #include <bonobo/bonobo-main.h> #include <glade/glade.h> #include <gal/widgets/e-cursors.h> +#include <e-util/e-passwords.h> #include <camel/camel.h> diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c index 8dc978f603..41b2ff7396 100644 --- a/addressbook/gui/component/addressbook.c +++ b/addressbook/gui/component/addressbook.c @@ -603,7 +603,8 @@ load_uri_cb (EBook *book, EBookStatus status, gpointer closure) if (source && source->type == ADDRESSBOOK_SOURCE_LDAP && source->auth == ADDRESSBOOK_LDAP_AUTH_SIMPLE) { - char *password; + const char *password; + char *pass_dup = NULL; password = e_passwords_get_password(load_uri_data->uri); @@ -613,7 +614,7 @@ load_uri_cb (EBook *book, EBookStatus status, gpointer closure) prompt = g_strdup_printf (_("Enter password for %s (user %s)"), source->name, source->email_addr); remember = source->remember_passwd; - password = e_passwords_ask_password ( + pass_dup = e_passwords_ask_password ( prompt, load_uri_data->uri, prompt, TRUE, E_PASSWORDS_REMEMBER_FOREVER, &remember, NULL); @@ -624,10 +625,10 @@ load_uri_cb (EBook *book, EBookStatus status, gpointer closure) g_free (prompt); } - if (password) { - e_book_authenticate_user (book, source->email_addr, password, + if (password || pass_dup) { + e_book_authenticate_user (book, source->email_addr, password ? password : pass_dup, load_uri_auth_cb, closure); - g_free (password); + g_free (pass_dup); return; } } diff --git a/addressbook/gui/component/select-names/e-select-names-manager.c b/addressbook/gui/component/select-names/e-select-names-manager.c index 5820a2bf52..d392930570 100644 --- a/addressbook/gui/component/select-names/e-select-names-manager.c +++ b/addressbook/gui/component/select-names/e-select-names-manager.c @@ -21,6 +21,7 @@ #include "e-select-names-completion.h" #include "e-select-names-popup.h" #include <addressbook/backend/ebook/e-destination.h> +#include <addressbook/gui/component/addressbook.h> #include <bonobo-conf/bonobo-config-database.h> #include <bonobo/bonobo-object.h> #include <bonobo/bonobo-moniker-util.h> diff --git a/addressbook/gui/component/select-names/e-select-names.c b/addressbook/gui/component/select-names/e-select-names.c index de592dc01e..0befe02ffc 100644 --- a/addressbook/gui/component/select-names/e-select-names.c +++ b/addressbook/gui/component/select-names/e-select-names.c @@ -38,6 +38,7 @@ #include <addressbook/backend/ebook/e-book.h> #include <addressbook/gui/component/addressbook-component.h> #include <addressbook/gui/component/addressbook-storage.h> +#include <addressbook/gui/component/addressbook.h> #include <shell/evolution-shell-client.h> #include "e-select-names.h" |