[evolution-patches] [Mailer] GroupWise Proxy crash

[Sankar P <psankar novell com>]

Hi,

Attached patch fixes a crash while proxy-login on non SSL accounts.
Please review. fixes 332948

Thanks,
Sankar

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/plugins/groupwise-features/ChangeLog,v
retrieving revision 1.53
diff -u -p -r1.53 ChangeLog
--- ChangeLog	20 Feb 2006 19:18:23 -0000	1.53
+++ ChangeLog	1 Mar 2006 05:17:34 -0000
@@ -1,3 +1,10 @@
+2006-03-01  Sankar P  <psankar novell com>
+
+	* proxy-login.c: (proxy_get_password) 
+	(proxy_login_get_cnc):
+	Takes care of non SSL accounts too.
+	Fixes #332948
+
 2006-02-21  Shreyas Srinivasan  <sshreyas novell com>
 
 	* proxy.c: Fix more brokenness. doh check if its the proxy
Index: proxy-login.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/groupwise-features/proxy-login.c,v
retrieving revision 1.5
diff -u -p -r1.5 proxy-login.c
--- proxy-login.c	6 Jan 2006 06:57:13 -0000	1.5
+++ proxy-login.c	1 Mar 2006 05:17:34 -0000
@@ -193,7 +193,7 @@ proxy_get_password (EAccount *account, c
 {
 	char *uri, *failed_auth, *key, *prompt;
 	CamelURL *url;
-	const char *poa_address, *use_ssl, *soap_port;
+	const char *poa_address, *use_ssl = NULL, *soap_port;
 
 	url = camel_url_new (account->source->url, NULL);
 	if (url == NULL) 
@@ -210,7 +210,7 @@ proxy_get_password (EAccount *account, c
 
 	key =  g_strdup_printf ("groupwise://%s %s/", url->user, poa_address); 
 	
-	if (!g_str_equal (use_ssl, "never"))
+	if (use_ssl && !g_str_equal (use_ssl, "never"))
 		uri = g_strdup_printf ("https://%s:%s/soap";, poa_address, soap_port);
 	else 
 		uri = g_strdup_printf ("http://%s:%s/soap";, poa_address, soap_port);
@@ -237,7 +237,7 @@ proxy_login_get_cnc (EAccount *account)
 	CamelURL *url;
 	url = camel_url_new (account->source->url, NULL);
 	char *uri = NULL, *failed_auth = NULL, *key = NULL, *prompt = NULL, *password = NULL;
-	const char *use_ssl, *soap_port;
+	const char *use_ssl = NULL, *soap_port;
 	gboolean remember;
 	
 	url = camel_url_new (account->source->url, NULL);
@@ -252,7 +252,7 @@ proxy_login_get_cnc (EAccount *account)
 	use_ssl = camel_url_get_param (url, "use_ssl");
 
 	key =  g_strdup_printf ("groupwise://%s %s/", url->user, url->host); 
-	if (!g_str_equal (use_ssl, "never"))
+	if (use_ssl && !g_str_equal (use_ssl, "never"))
 		uri = g_strdup_printf ("https://%s:%s/soap";, url->host, soap_port);
 	else 
 		uri = g_strdup_printf ("http://%s:%s/soap";, url->host, soap_port);