[evolution-patches] patch for #65599 (calendar)

[Rodrigo Moya <rodrigo novell com>]

-- 
Rodrigo Moya <rodrigo novell com>

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.2500.2.6
diff -u -p -r1.2500.2.6 ChangeLog
--- ChangeLog	20 Sep 2004 07:58:39 -0000	1.2500.2.6
+++ ChangeLog	24 Sep 2004 11:20:48 -0000
@@ -1,3 +1,12 @@
+2004-09-24  Rodrigo Moya <rodrigo novell com>
+
+	Fixes #65599
+
+	* gui/itip-utils.c (comp_fb_normalize): don't use NULL properties.
+
+	* gui/e-pub-utils.c (e_pub_publish): use auth_new_cal_from_source() instead of
+	auth_new_cal_from_uri().
+
 2004-09-20  Tony Tsui <ttsui9 gmail com>
 
 	Fixes #66174
Index: gui/e-pub-utils.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-pub-utils.c,v
retrieving revision 1.4.4.1
diff -u -p -r1.4.4.1 e-pub-utils.c
--- gui/e-pub-utils.c	16 Sep 2004 14:45:53 -0000	1.4.4.1
+++ gui/e-pub-utils.c	24 Sep 2004 11:20:49 -0000
@@ -263,7 +263,7 @@ e_pub_publish (gboolean publish) {
 				source_uid = g_strdup (p->data);
 				source =  e_source_list_peek_source_by_uid (source_list, source_uid);
 				if (source)
-					client = auth_new_cal_from_uri (e_source_get_uri (source), E_CAL_SOURCE_TYPE_EVENT);
+					client = auth_new_cal_from_source (source, E_CAL_SOURCE_TYPE_EVENT);
 
 				if (!client) {
 					g_warning (G_STRLOC ": Could not publish Free/Busy: Calendar backend no longer exists");
Index: gui/itip-utils.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/itip-utils.c,v
retrieving revision 1.90.14.1
diff -u -p -r1.90.14.1 itip-utils.c
--- gui/itip-utils.c	21 Sep 2004 14:25:24 -0000	1.90.14.1
+++ gui/itip-utils.c	24 Sep 2004 11:20:49 -0000
@@ -1057,8 +1057,10 @@ comp_fb_normalize (icalcomponent *icomp)
 	
 	prop = icalcomponent_get_first_property (icomp, 
 						 ICAL_ORGANIZER_PROPERTY);
-	p = icalproperty_new_clone (prop);
-	icalcomponent_add_property (iclone, p);
+	if (prop) {
+		p = icalproperty_new_clone (prop);
+		icalcomponent_add_property (iclone, p);
+	}
 	
 	itt = icalcomponent_get_dtstart (icomp);
 	icalcomponent_set_dtstart (iclone, itt);
@@ -1103,8 +1105,10 @@ comp_fb_normalize (icalcomponent *icomp)
 	icalcomponent_set_dtstamp (iclone, itt);	
 	
 	prop = icalcomponent_get_first_property (icomp, ICAL_URL_PROPERTY);
-	p = icalproperty_new_clone (prop);
-	icalcomponent_add_property (iclone, p);
+	if (prop) {
+		p = icalproperty_new_clone (prop);
+		icalcomponent_add_property (iclone, p);
+	}
 	
 	comment =  icalcomponent_get_comment (icomp);
 	if (comment)