[evolution-patches] Patch for #68264
- From: Diego Sevilla Ruiz <dsevilla ditec um es>
- To: evolution-patches lists ximian com
- Cc: rodrigo ximian com
- Subject: [evolution-patches] Patch for #68264
- Date: Fri, 12 Nov 2004 13:50:42 +0100
Hi all.
Attached is a fix for #68264.
Best regards,
diego
--
Diego Sevilla Ruiz -- http://ditec.um.es/~dsevilla/ -- dsevilla um es _.___
Dep. Ingeniería y Tecnología de Computadores, Facultad de Informática D|TEC
Univ.de Murcia,Campus Espinardo,30080 Murcia (SPAIN),Tel.+34968367571
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/plugins/calendar-http/ChangeLog,v
retrieving revision 1.3
diff -u -p -r1.3 ChangeLog
--- ChangeLog 9 Nov 2004 13:32:39 -0000 1.3
+++ ChangeLog 12 Nov 2004 12:48:27 -0000
@@ -1,3 +1,8 @@
+2004-11-12 Diego Sevilla Ruiz <dsevilla ditec um es>
+
+ * calendar-http.c (e_calendar_http_check): Accept protocol-less
+ URIs. Fixes #68264.
+
2004-11-09 Rodney Dawes <dobey novell com>
* Makefile.am: Add EXTRA_DIST variable for the eplug.in file
Index: calendar-http.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/calendar-http/calendar-http.c,v
retrieving revision 1.1
diff -u -p -r1.1 calendar-http.c
--- calendar-http.c 4 Nov 2004 04:13:21 -0000 1.1
+++ calendar-http.c 12 Nov 2004 12:48:27 -0000
@@ -1,5 +1,5 @@
/*
- *
+ *
*
* Copyright (C) 2004 David Trowbridge
*
@@ -285,12 +285,17 @@ e_calendar_http_check (EPlugin *epl, ECo
EUri *uri;
gboolean ok = FALSE;
ESourceGroup *group = e_source_peek_group (t->source);
+ const char *uri_text = e_source_get_uri (t->source);
if (strcmp (e_source_group_peek_base_uri (group), "webcal"))
return TRUE;
+ if (strncmp (uri_text, "file:", 5))
+ return FALSE;
- uri = e_uri_new (e_source_get_uri (t->source));
- ok = ((!strcmp (uri->protocol, "webcal")) || (!strcmp (uri->protocol, "http")));
+ uri = e_uri_new (uri_text);
+ ok = ((!strcmp (uri->protocol, "webcal")) ||
+ (!strcmp (uri->protocol, "http")) ||
+ (!strcmp (uri->protocol, "file")) );
e_uri_free (uri);
return ok;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]