[evolution-patches] addressbook : fix for #314746

[Sarfraaz Ahmed <asarfraaz novell com>]

Hi,

Resending this patch separately for addressbook. Please review it.

Thanks
-- Sarfraaz

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/ChangeLog,v
retrieving revision 1.1990.2.1
diff -u -p -u -p -r1.1990.2.1 ChangeLog
--- ChangeLog	14 Sep 2005 10:32:37 -0000	1.1990.2.1
+++ ChangeLog	27 Sep 2005 13:03:04 -0000
@@ -1,3 +1,8 @@
+2005-08-26  Sarfraaz Ahmed <asarfraaz novell com>
+
+	* gui/component/addressbook.c (remove_parameters_from_uri) : This now
+	takes care to escape any auth mechanism in the uri.
+
 2005-09-14  Sushma Rai  <rsushma novell com>
 
 	* gui/contact-list-editor/e-contact-list-editor.etspec: Set selection
Index: gui/component/addressbook.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/component/addressbook.c,v
retrieving revision 1.252
diff -u -p -u -p -r1.252 addressbook.c
--- gui/component/addressbook.c	24 Aug 2005 03:06:49 -0000	1.252
+++ gui/component/addressbook.c	27 Sep 2005 13:03:04 -0000
@@ -27,6 +27,7 @@
 #include <gtk/gtkmessagedialog.h>
 #include <libgnome/gnome-i18n.h>
 #include <libebook/e-book.h>
+#include <libedataserver/e-url.h>
 #include <libedataserverui/e-passwords.h>
 
 #include "e-util/e-error.h"
@@ -59,14 +60,12 @@ in uri*/
 static gchar*
 remove_parameters_from_uri (const gchar *uri)
 {
-  gchar **components;
-  gchar *new_uri = NULL;
-                                                                                                                             
-  components = g_strsplit (uri, ";", 2);
-  if (components[0])
-        new_uri = g_strdup (components[0]);
-   g_strfreev (components);
-   return new_uri;
+	char *euri_str;
+	EUri *euri;
+
+	euri = e_uri_new (uri);
+	euri_str = e_uri_to_string (euri, FALSE);
+	return euri_str;
 }
 
 static void