evolution-mapi r58 - trunk/src/account-setup-eplugin

[mcrha svn gnome org]

Author: mcrha
Date: Thu Jan 15 11:28:16 2009
New Revision: 58
URL: http://svn.gnome.org/viewvc/evolution-mapi?rev=58&view=rev

Log:
2009-01-15  Milan Crha  <mcrha redhat com>

	** Fix for bug #567190

	* exchange-mapi-account-setup.c: (validate_credentials),
	(domain_entry_changed):
	* exchange-mapi-account-listener.c: (mapi_account_changed):
	Change transport and source URL of the EAccount together.



Modified:
   trunk/src/account-setup-eplugin/ChangeLog
   trunk/src/account-setup-eplugin/exchange-mapi-account-listener.c
   trunk/src/account-setup-eplugin/exchange-mapi-account-setup.c

Modified: trunk/src/account-setup-eplugin/exchange-mapi-account-listener.c
==============================================================================
--- trunk/src/account-setup-eplugin/exchange-mapi-account-listener.c	(original)
+++ trunk/src/account-setup-eplugin/exchange-mapi-account-listener.c	Thu Jan 15 11:28:16 2009
@@ -654,7 +654,8 @@
 			 * method uses e_account_set_string() which initiates another signal emmission
 			 * which we have to block for now. */
 			g_signal_handlers_block_by_func (config_listener->priv->account_list, G_CALLBACK (mapi_account_changed), NULL); 
-			e_account_set_string(account, E_ACCOUNT_SOURCE_URL, uri);
+			e_account_set_string (account, E_ACCOUNT_SOURCE_URL, uri);
+			e_account_set_string (account, E_ACCOUNT_TRANSPORT_URL, uri);
 			g_signal_handlers_unblock_by_func (config_listener->priv->account_list, G_CALLBACK (mapi_account_changed), NULL); 
 			g_free (uri);
 
@@ -686,7 +687,8 @@
 				 * method uses e_account_set_string() which initiates another signal emmission
 				 * which we have to block for now. */
 				g_signal_handlers_block_by_func (config_listener->priv->account_list, G_CALLBACK (mapi_account_changed), NULL); 
-				e_account_set_string(account, E_ACCOUNT_SOURCE_URL, uri);
+				e_account_set_string (account, E_ACCOUNT_SOURCE_URL, uri);
+				e_account_set_string (account, E_ACCOUNT_TRANSPORT_URL, uri);
 				g_signal_handlers_unblock_by_func (config_listener->priv->account_list, G_CALLBACK (mapi_account_changed), NULL); 
 				g_free (uri);
 

Modified: trunk/src/account-setup-eplugin/exchange-mapi-account-setup.c
==============================================================================
--- trunk/src/account-setup-eplugin/exchange-mapi-account-setup.c	(original)
+++ trunk/src/account-setup-eplugin/exchange-mapi-account-setup.c	Thu Jan 15 11:28:16 2009
@@ -270,7 +270,8 @@
 			g_free (profname);
 
 			uri = camel_url_to_string(url, 0);
-			e_account_set_string(target_account->account, E_ACCOUNT_SOURCE_URL, uri);
+			e_account_set_string (target_account->account, E_ACCOUNT_SOURCE_URL, uri);
+			e_account_set_string (target_account->account, E_ACCOUNT_TRANSPORT_URL, uri);
 			g_free (uri);
 		} else {
 			e_passwords_forget_password (EXCHANGE_MAPI_PASSWORD_COMPONENT, key);
@@ -301,6 +302,7 @@
 
 	url_string = camel_url_to_string (url, 0);
 	e_account_set_string (target->account, E_ACCOUNT_SOURCE_URL, url_string);
+	e_account_set_string (target->account, E_ACCOUNT_TRANSPORT_URL, url_string);
 	g_free (url_string);
 
 	camel_url_free (url);