X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Fmodules%2Fcalendar%2Fserv_calendar.c;fp=citadel%2Fmodules%2Fcalendar%2Fserv_calendar.c;h=8fc0dbad1e351f3457a1a2a0d43942bf2dcfe4e7;hp=5fb86a2287fb12512fce7ecc532ce3fe34458358;hb=c4609169aa7baf208848e72c16d33a3f892353b8;hpb=85306faf2231501cf896f4227bc6cb30daa6e849

diff --git a/citadel/modules/calendar/serv_calendar.c b/citadel/modules/calendar/serv_calendar.c
index 5fb86a228..8fc0dbad1 100644
--- a/citadel/modules/calendar/serv_calendar.c
+++ b/citadel/modules/calendar/serv_calendar.c
@@ -906,11 +906,11 @@ int ical_conflicts_phase6(struct icaltimetype t1start,
 			existing_msgnum,
 			conflict_event_uid,
 			conflict_event_summary,
-			(	((strlen(compare_uid)>0)
+			(	(!IsEmptyStr(compare_uid)
 				&&(!strcasecmp(compare_uid,
 				conflict_event_uid))) ? 1 : 0
-			)
-		);
+				)
+			);
 		conflict_reported = 1;
 	}