Re: [evolution-patches] e-url fix

[Rodrigo Moya <rodrigo novell com>]

On Mon, 2005-01-17 at 18:35 +0530, Sarfraaz Ahmed wrote:
> Rodrigo Moya wrote:
> 
> >On Mon, 2005-01-17 at 14:18 +0530, Sarfraaz Ahmed wrote:
> >  
> >
> >>Hi,
> >>
> >>The uri parsing in libedataserver is different from that in 
> >>evolution/e-util. The diff is attached in the patch file. This fixes a 
> >>crash in connector startup.
> >>
> >>    
> >>
> >hmm, why do we still have e-url.[ch] in evolution tree? I think those
> >files should be removed, right?
> >  
> >
> True, but i am not sure about why they are present yet. I dont know what 
> the plan is about removing those files. Till these are removed, this 
> patch would fix the connector crash. I might currently not be able to 
> give the patch for removing this file though.
> 
right, due to some dependency, connector is using evo's e-url. Attached
patch removes e-url from the build and changes mail/ to use
libedataserver's instead. Calendar is already changed.
-- 
Rodrigo Moya <rodrigo novell com>

Index: e-util/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/e-util/ChangeLog,v
retrieving revision 1.518
diff -u -p -r1.518 ChangeLog
--- e-util/ChangeLog	12 Jan 2005 08:42:10 -0000	1.518
+++ e-util/ChangeLog	17 Jan 2005 13:43:44 -0000
@@ -1,3 +1,7 @@
+2005-01-17  Rodrigo Moya <rodrigo novell com>
+
+	* Makefile.am: removed e-url.[ch], which are now in libedataserver.
+
 2005-01-08  Not Zed  <NotZed Ximian com>
 
 	* e-url.c (e_url_shroud): dont' use '%.*s' for truncating string
Index: e-util/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/e-util/Makefile.am,v
retrieving revision 1.120
diff -u -p -r1.120 Makefile.am
--- e-util/Makefile.am	3 Dec 2004 03:41:19 -0000	1.120
+++ e-util/Makefile.am	17 Jan 2005 13:43:44 -0000
@@ -50,7 +50,6 @@ eutilinclude_HEADERS = 				\
 	e-signature-list.h			\
 	e-time-utils.h				\
 	e-uid.h					\
-	e-url.h					\
 	md5-utils.h				\
 	$(MONOHEADERS)
 
@@ -88,7 +87,6 @@ libeutil_la_SOURCES =				\
 	e-signature-list.c			\
 	e-time-utils.c				\
 	e-uid.c					\
-	e-url.c					\
 	eggtrayicon.c				\
 	eggtrayicon.h				\
 	md5-utils.c				\
Index: mail/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
retrieving revision 1.3531
diff -u -p -r1.3531 ChangeLog
--- mail/ChangeLog	17 Jan 2005 09:00:28 -0000	1.3531
+++ mail/ChangeLog	17 Jan 2005 13:43:47 -0000
@@ -1,3 +1,8 @@
+2005-01-17  Rodrigo Moya <rodrigo novell com>
+
+	* em-filter-source-element.c:
+	* mail-config.c: use libedataserver's e-url.
+
 2005-01-14  Not Zed  <NotZed Ximian com>
 
 	** Related to changes for #65178.
Index: mail/em-filter-source-element.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-filter-source-element.c,v
retrieving revision 1.2
diff -u -p -r1.2 em-filter-source-element.c
--- mail/em-filter-source-element.c	3 Dec 2004 03:38:03 -0000	1.2
+++ mail/em-filter-source-element.c	17 Jan 2005 13:43:47 -0000
@@ -31,7 +31,7 @@
 #include "em-filter-source-element.h"
 
 #include <gtk/gtk.h>
-#include <e-util/e-url.h>
+#include <libedataserver/e-url.h>
 #include <libedataserver/e-sexp.h>
 #include <libedataserver/e-account-list.h>
 #include <camel/camel-url.h>
Index: mail/mail-config.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-config.c,v
retrieving revision 1.312
diff -u -p -r1.312 mail-config.c
--- mail/mail-config.c	19 Oct 2004 06:35:44 -0000	1.312
+++ mail/mail-config.c	17 Jan 2005 13:43:47 -0000
@@ -54,7 +54,7 @@
 #include <gal/util/e-util.h>
 #include <gal/widgets/e-gui-utils.h>
 
-#include <e-util/e-url.h>
+#include <libedataserver/e-url.h>
 #include <e-util/e-passwords.h>
 #include <e-util/e-account-list.h>
 #include <e-util/e-signature-list.h>