|
David Woodhouse |
d78737 |
From e31cb5c9e9392db00c48aa883c2f54a3b48eaea1 Mon Sep 17 00:00:00 2001
|
|
David Woodhouse |
d78737 |
From: Milan Crha <mcrha@redhat.com>
|
|
David Woodhouse |
d78737 |
Date: Fri, 16 Aug 2013 11:41:26 +0200
|
|
David Woodhouse |
d78737 |
Subject: [PATCH] Cannot create appointments (regression from bug #702922)
|
|
David Woodhouse |
d78737 |
|
|
David Woodhouse |
d78737 |
(cherry picked from commit 286ab97d76d02a6c6a77ad919dc9d87703536d4b)
|
|
David Woodhouse |
d78737 |
---
|
|
David Woodhouse |
d78737 |
src/calendar/e-cal-backend-ews-utils.c | 13 ++++++++++++-
|
|
David Woodhouse |
d78737 |
1 file changed, 12 insertions(+), 1 deletion(-)
|
|
David Woodhouse |
d78737 |
|
|
David Woodhouse |
d78737 |
diff --git a/src/calendar/e-cal-backend-ews-utils.c b/src/calendar/e-cal-backend-ews-utils.c
|
|
David Woodhouse |
d78737 |
index a326391..36116cc 100644
|
|
David Woodhouse |
d78737 |
--- a/src/calendar/e-cal-backend-ews-utils.c
|
|
David Woodhouse |
d78737 |
+++ b/src/calendar/e-cal-backend-ews-utils.c
|
|
David Woodhouse |
d78737 |
@@ -65,8 +65,16 @@ e_ews_collect_attendees (icalcomponent *comp,
|
|
David Woodhouse |
d78737 |
prop = icalcomponent_get_next_property (comp, ICAL_ATTENDEE_PROPERTY)) {
|
|
David Woodhouse |
d78737 |
|
|
David Woodhouse |
d78737 |
str = icalproperty_get_attendee (prop);
|
|
David Woodhouse |
d78737 |
+
|
|
David Woodhouse |
d78737 |
+ if (!str || !*str)
|
|
David Woodhouse |
d78737 |
+ continue;
|
|
David Woodhouse |
d78737 |
+
|
|
David Woodhouse |
d78737 |
/* figure the email address of the attendee, discard "mailto:" if it's there */
|
|
David Woodhouse |
d78737 |
- if (!g_ascii_strncasecmp (str, "mailto:", 7)) str = (str) + 7;
|
|
David Woodhouse |
d78737 |
+ if (!g_ascii_strncasecmp (str, "mailto:", 7))
|
|
David Woodhouse |
d78737 |
+ str = (str) + 7;
|
|
David Woodhouse |
d78737 |
+
|
|
David Woodhouse |
d78737 |
+ if (!*str)
|
|
David Woodhouse |
d78737 |
+ continue;
|
|
David Woodhouse |
d78737 |
|
|
David Woodhouse |
d78737 |
/* if this attenddee is the orgenizer - dont add him/her
|
|
David Woodhouse |
d78737 |
in some cases there is no maito for email if meeting orginazer */
|
|
David Woodhouse |
d78737 |
@@ -756,6 +764,9 @@ e_ews_collect_organizer (icalcomponent *comp)
|
|
David Woodhouse |
d78737 |
else
|
|
David Woodhouse |
d78737 |
org_email_address = org;
|
|
David Woodhouse |
d78737 |
|
|
David Woodhouse |
d78737 |
+ if (org_email_address && !*org_email_address)
|
|
David Woodhouse |
d78737 |
+ org_email_address = NULL;
|
|
David Woodhouse |
d78737 |
+
|
|
David Woodhouse |
d78737 |
return org_email_address;
|
|
David Woodhouse |
d78737 |
}
|
|
David Woodhouse |
d78737 |
|
|
David Woodhouse |
d78737 |
--
|
|
David Woodhouse |
d78737 |
1.8.3.1
|
|
David Woodhouse |
d78737 |
|