diff options
| author | Milan Crha <mcrha@src.gnome.org> | 2007-08-10 05:58:44 +0000 |
|---|---|---|
| committer | Milan Crha <mcrha@src.gnome.org> | 2007-08-10 05:58:44 +0000 |
| commit | fd9dfc860b6136c514f97f562c394067d9068685 (patch) | |
| tree | de778f2665fa4d2a9661bf7827431a2cfbada52e /servers | |
| parent | 9c9e84d2dc778c5c9736e03e05e33fa8d566220e (diff) | |
| download | evolution-data-server-fd9dfc860b6136c514f97f562c394067d9068685.tar.gz | |
2007-08-10 mcrha Fix for bug #327977
svn path=/trunk/; revision=7931
Diffstat (limited to 'servers')
| -rw-r--r-- | servers/exchange/ChangeLog | 8 | ||||
| -rw-r--r-- | servers/exchange/lib/e2k-autoconfig.c | 4 | ||||
| -rw-r--r-- | servers/exchange/lib/e2k-validate.h | 4 | ||||
| -rw-r--r-- | servers/groupwise/ChangeLog | 6 | ||||
| -rw-r--r-- | servers/groupwise/e-gw-connection.c | 4 |
5 files changed, 23 insertions, 3 deletions
diff --git a/servers/exchange/ChangeLog b/servers/exchange/ChangeLog index 86ff8759f..a14bc0a60 100644 --- a/servers/exchange/ChangeLog +++ b/servers/exchange/ChangeLog @@ -1,3 +1,11 @@ +2007-08-10 Milan Crha <mcrha@redhat.com> + + ** Fix for bug #327977 + + * lib/e2k-validate.h: (e2k_validate_user): + * lib/e2k-autoconfig.c: (e2k_validate_user): + Added parameter for parent window to pass to password dialog. + 2007-08-03 Jeff Cai<jeff.cai@sun.com> * storage/exchange-account.c: diff --git a/servers/exchange/lib/e2k-autoconfig.c b/servers/exchange/lib/e2k-autoconfig.c index a77a46cc4..8fd81f7af 100644 --- a/servers/exchange/lib/e2k-autoconfig.c +++ b/servers/exchange/lib/e2k-autoconfig.c @@ -1626,7 +1626,7 @@ validate (const char *owa_url, char *user, char *password, ExchangeParams *excha gboolean e2k_validate_user (const char *owa_url, char *pkey, char **user, ExchangeParams *exchange_params, gboolean *remember_password, - E2kAutoconfigResult *result) + E2kAutoconfigResult *result, GtkWindow *parent) { gboolean valid = FALSE, remember=FALSE; char *key, *password, *prompt; @@ -1656,7 +1656,7 @@ try_auth_again: password = e_passwords_ask_password (_("Enter password"), "Exchange", key, prompt, E_PASSWORDS_REMEMBER_FOREVER|E_PASSWORDS_SECRET, - &remember, NULL); + &remember, parent); g_free (prompt); if (!password) { g_free (key); diff --git a/servers/exchange/lib/e2k-validate.h b/servers/exchange/lib/e2k-validate.h index 74d349d48..92957087f 100644 --- a/servers/exchange/lib/e2k-validate.h +++ b/servers/exchange/lib/e2k-validate.h @@ -4,6 +4,8 @@ #ifndef __E2K_VALIDATE_H_ #define __E2K_VALIDATE_H_ +#include <gtk/gtkwindow.h> + #ifdef __cplusplus extern "C" { #pragma } @@ -36,7 +38,7 @@ typedef enum { E2K_AUTOCONFIG_FAILED } E2kAutoconfigResult; -gboolean e2k_validate_user (const char *owa_url, char *key, char **user, ExchangeParams *exchange_params, gboolean *remember_password, E2kAutoconfigResult *result); +gboolean e2k_validate_user (const char *owa_url, char *key, char **user, ExchangeParams *exchange_params, gboolean *remember_password, E2kAutoconfigResult *result, GtkWindow *parent); #ifdef __cplusplus diff --git a/servers/groupwise/ChangeLog b/servers/groupwise/ChangeLog index 98901904d..fd42e3ca4 100644 --- a/servers/groupwise/ChangeLog +++ b/servers/groupwise/ChangeLog @@ -1,3 +1,9 @@ +2007-08-10 Milan Crha <mcrha@redhat.com> + + * e-gw-connection.c: (e_gw_connection_get_container_list): + Fixed critical warning when cnc is NULL (i.e. user cancels + password dialog.) Done together with bug #327977. + 2007-06-03 Srinivasa Ragavan <sragavan@novell.com> ** Memory leak fixes from bug #440524 diff --git a/servers/groupwise/e-gw-connection.c b/servers/groupwise/e-gw-connection.c index cccedd7aa..c48dcec45 100644 --- a/servers/groupwise/e-gw-connection.c +++ b/servers/groupwise/e-gw-connection.c @@ -596,6 +596,10 @@ e_gw_connection_get_container_list (EGwConnection *cnc, const char *top, GList * EGwConnectionStatus status; SoupSoapParameter *param; + /* when user cancels password dialog, then the cnc is NULL */ + if (!cnc) + return E_GW_CONNECTION_STATUS_UNKNOWN; + g_return_val_if_fail (E_IS_GW_CONNECTION (cnc), E_GW_CONNECTION_STATUS_UNKNOWN); g_return_val_if_fail (container_list != NULL, E_GW_CONNECTION_STATUS_UNKNOWN); |