File bgo-350576-gnomevfs-fds-leak.patch of Package evolution-data-server-2.6

Overview Repositories Revisions Requests Users Attributes Meta

File bgo-350576-gnomevfs-fds-leak.patch of Package evolution-data-server-2.6

Index: camel/camel-stream-vfs.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-stream-vfs.c,v
retrieving revision 1.3
diff -u -d -p -r1.3 camel-stream-vfs.c
--- camel/camel-stream-vfs.c	23 Aug 2006 08:39:24 -0000	1.3
+++ camel/camel-stream-vfs.c	27 Sep 2006 13:15:33 -0000
@@ -84,7 +84,7 @@ camel_stream_vfs_finalize (CamelObject *
 	CamelStreamVFS *stream_vfs = CAMEL_STREAM_VFS (object);
 
 	if (stream_vfs->handle != -1)
-		close (stream_vfs->handle);
+		gnome_vfs_close (stream_vfs->handle);
 }
 
 
Index: camel/camel-url.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-url.c,v
retrieving revision 1.45
diff -u -d -p -r1.45 camel-url.c
--- camel/camel-url.c	15 Sep 2005 17:35:45 -0000	1.45
+++ camel/camel-url.c	29 Sep 2006 14:46:59 -0000
@@ -57,10 +57,12 @@ CamelURL *
 camel_url_new_with_base (CamelURL *base, const char *url_string)
 {
 	CamelURL *url;
+	const char *start;
 	const char *end, *hash, *colon, *semi, *at, *slash, *question;
 	const char *p;
 
 	url = g_new0 (CamelURL, 1);
+	start = url_string;
 
 	/* See RFC1808 for details. IF YOU CHANGE ANYTHING IN THIS
 	 * FUNCTION, RUN tests/misc/url AFTERWARDS.
@@ -91,6 +93,13 @@ camel_url_new_with_base (CamelURL *base,
 	if (!*url_string && !base)
 		return url;
 
+#ifdef G_OS_WIN32
+	if (url->protocol && !strcmp(url->protocol, "file")) {
+		url->path = g_filename_from_uri(start, &url->host, NULL);
+		return url;
+	}
+#endif
+
 	/* Check for authority */
 	if (strncmp (url_string, "//", 2) == 0) {
 		url_string += 2;
@@ -315,6 +324,11 @@ camel_url_to_string (CamelURL *url, guin
 	/* IF YOU CHANGE ANYTHING IN THIS FUNCTION, RUN
 	 * tests/misc/url AFTERWARD.
 	 */
+	
+#ifdef G_OS_WIN32
+	if (url->protocol && !strcmp(url->protocol, "file"))
+		return g_filename_to_uri(url->path, url->host, NULL);
+#endif G_OS_WIN32
 	
 	str = g_string_sized_new (20);

Places

File bgo-350576-gnomevfs-fds-leak.patch of Package evolution-data-server-2.6

Places