2007-08-10 mcrha Fix for bug #327977

svn path=/trunk/; revision=33972

3 files changed, 20 insertions, 7 deletions

diff --git a/plugins/groupwise-features/ChangeLog b/plugins/groupwise-features/ChangeLog
index 2bf1e3f71e..05e5546bc2 100644
--- a/plugins/groupwise-features/ChangeLog
+++ b/plugins/groupwise-features/ChangeLog
@@ -1,3 +1,16 @@
+2007-08-10  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #327977
+
+	* proxy.c: (proxy_get_cnc): Added parent_window parameter
+	and uses it in call of e_passwords_ask_password.
+	* proxy.c: (proxy_commit), (proxy_page_changed_cb):
+	Calls proxy_get_cnc, passing in parent window handle.
+	* send-options.c: (get_cnc): Added parent_window parameter
+	and uses it in call of e_passwords_ask_password.
+	* send-options.c: (e_sendoptions_clicked_cb):
+	Calls get_cnc, passing in parent window handle.
+
 2007-08-03  Hiroyuki Ikezoe  <poincare@ikezoe.net>
 
 	** Fix for bug #462010
diff --git a/plugins/groupwise-features/proxy.c b/plugins/groupwise-features/proxy.c
index 308d59653c..03563e3ce7 100644
--- a/plugins/groupwise-features/proxy.c
+++ b/plugins/groupwise-features/proxy.c
@@ -470,7 +470,7 @@ proxy_dialog_initialize_widgets (EAccount *account)
 }
 
 static EGwConnection * 
-proxy_get_cnc (EAccount *account)
+proxy_get_cnc (EAccount *account, GtkWindow *parent_window)
 {
 	EGwConnection *cnc;
 	char *uri, *failed_auth, *key, *prompt, *password = NULL;
@@ -506,7 +506,7 @@ proxy_get_cnc (EAccount *account)
 	password = e_passwords_get_password ("Groupwise", key);
 	if (!password)
 		password = e_passwords_ask_password (prompt, "Groupwise", key, prompt,
-				E_PASSWORDS_REMEMBER_FOREVER|E_PASSWORDS_SECRET, &remember, NULL);
+				E_PASSWORDS_REMEMBER_FOREVER|E_PASSWORDS_SECRET, &remember, parent_window);
 	g_free (prompt);
 
 	cnc = e_gw_connection_new (uri, url->user, password);
@@ -565,7 +565,7 @@ proxy_commit (GtkWidget *button, EConfigHookItemFactoryData *data)
 		if ( !((aclInstance->flags & E_GW_PROXY_NEW) && (aclInstance->flags & E_GW_PROXY_DELETED))) {
 
 			if ( !E_IS_GW_CONNECTION(prd->cnc)) 	/* Add check in case the connection request fails*/
-				prd->cnc = proxy_get_cnc (account);
+				prd->cnc = proxy_get_cnc (account, GTK_WINDOW (gtk_widget_get_toplevel (button)));
 
 			if (aclInstance->flags & E_GW_PROXY_NEW )         	
 				e_gw_connection_add_proxy (prd->cnc, aclInstance);		
@@ -752,7 +752,7 @@ proxy_page_changed_cb (GtkNotebook *notebook, GtkNotebookPage *page, int num, EA
 
 	if ((pg_num == num) && account->enabled) {
 		if (!prd->cnc)
-			prd->cnc = proxy_get_cnc(account);	
+			prd->cnc = proxy_get_cnc (account, GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (notebook))));
 		 priv = prd->priv;
 
 		if (e_gw_connection_get_proxy_access_list(prd->cnc, &priv->proxy_list)!= E_GW_CONNECTION_STATUS_OK) 
diff --git a/plugins/groupwise-features/send-options.c b/plugins/groupwise-features/send-options.c
index 0e46c91219..438e48e15f 100644
--- a/plugins/groupwise-features/send-options.c
+++ b/plugins/groupwise-features/send-options.c
@@ -50,7 +50,7 @@ void send_options_changed (EPlugin *epl, EConfigHookItemFactoryData *data);
 void send_options_abort (EPlugin *epl, EConfigHookItemFactoryData *data);
 
 static EGwConnection * 
-get_cnc ()
+get_cnc (GtkWindow *parent_window)
 {
 	EGwConnection *cnc;
 	char *uri, *failed_auth, *key, *prompt, *password = NULL;
@@ -86,7 +86,7 @@ get_cnc ()
 	password = e_passwords_get_password ("Groupwise", key);
 	if (!password)
 		password = e_passwords_ask_password (prompt, "Groupwise", key, prompt,
-				E_PASSWORDS_REMEMBER_FOREVER|E_PASSWORDS_SECRET, &remember, NULL);
+				E_PASSWORDS_REMEMBER_FOREVER|E_PASSWORDS_SECRET, &remember, parent_window);
 	g_free (prompt);
 
 	cnc = e_gw_connection_new (uri, url->user, password);
@@ -168,7 +168,7 @@ e_sendoptions_clicked_cb (GtkWidget *button, gpointer data)
 		sod = e_sendoptions_dialog_new ();	
 		e_sendoptions_set_global (sod, TRUE);
 		if (!n_cnc) 
-			n_cnc = get_cnc ();
+			n_cnc = get_cnc (GTK_WINDOW (gtk_widget_get_toplevel (button)));
 
 		if (!n_cnc) {
 			g_warning ("Send Options: Could not get the connection to the server \n");