From be4ca0bbea8eaad10bf9d2a3ec53056433d31c49 Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Mon, 25 May 2009 16:54:25 +0200
Subject: itip-formatter - search for master object too
When received a detached instance, and the calendar doesn't contain
that exact instance, then try to search for the master object and
use it, if found.
---
plugins/itip-formatter/itip-formatter.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
(limited to 'plugins/itip-formatter/itip-formatter.c')
diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c
index 04049ef6d5..6c1775a8b5 100644
--- a/plugins/itip-formatter/itip-formatter.c
+++ b/plugins/itip-formatter/itip-formatter.c
@@ -629,8 +629,8 @@ find_cal_opened_cb (ECal *ecal, ECalendarStatus status, gpointer data)
e_cal_free_object_list (objects);
}
-
- if (!pitip->current_ecal && e_cal_get_object (ecal, fd->uid, fd->rid, &icalcomp, NULL)) {
+ /* search for a master object if the detached object doesn't exist in the calendar */
+ if (!pitip->current_ecal && (e_cal_get_object (ecal, fd->uid, fd->rid, &icalcomp, NULL) || (fd->rid && e_cal_get_object (ecal, fd->uid, NULL, &icalcomp, NULL)))) {
if ((pitip->method == ICAL_METHOD_PUBLISH || pitip->method == ICAL_METHOD_REQUEST) &&
(icalcomponent_get_first_component (icalcomp, ICAL_VALARM_COMPONENT) ||
icalcomponent_get_first_component (icalcomp, ICAL_XAUDIOALARM_COMPONENT) ||
@@ -1278,7 +1278,9 @@ update_attendee_status (struct _itip_puri *pitip)
org_icalcomp = e_cal_component_get_icalcomponent (pitip->comp);
rid = e_cal_component_get_recurid_as_string (pitip->comp);
- if (e_cal_get_object (pitip->current_ecal, uid, rid, &icalcomp, NULL)) {
+
+ /* search for a master object if the detached object doesn't exist in the calendar */
+ if (e_cal_get_object (pitip->current_ecal, uid, rid, &icalcomp, NULL) || (rid && e_cal_get_object (pitip->current_ecal, uid, NULL, &icalcomp, NULL))) {
GSList *attendees;
comp = e_cal_component_new ();
--
cgit
From ffa17ed195a6bbb40d386fb572b7941e22f47f8d Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Tue, 26 May 2009 13:20:45 -0400
Subject: Fix compiler warnings in plugins.
---
plugins/itip-formatter/itip-formatter.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(limited to 'plugins/itip-formatter/itip-formatter.c')
diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c
index 04049ef6d5..25d02b4f5d 100644
--- a/plugins/itip-formatter/itip-formatter.c
+++ b/plugins/itip-formatter/itip-formatter.c
@@ -2585,8 +2585,9 @@ itip_formatter_page_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data)
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
gtk_box_pack_start (GTK_BOX (inner_vbox), label, FALSE, FALSE, 0);
- if (!e_cal_get_sources (&source_list, E_CAL_SOURCE_TYPE_EVENT, NULL))
+ if (!e_cal_get_sources (&source_list, E_CAL_SOURCE_TYPE_EVENT, NULL)) {
/* FIXME Error handling */;
+ }
scrolledwin = gtk_scrolled_window_new (NULL, NULL);
--
cgit
From e4afd3f9fb962ea1295a0657ec9f83a427829171 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Tue, 26 May 2009 23:21:02 -0400
Subject: Remove trailing whitespace, again.
---
plugins/itip-formatter/itip-formatter.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
(limited to 'plugins/itip-formatter/itip-formatter.c')
diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c
index c777f6cbb5..293c4e3fca 100644
--- a/plugins/itip-formatter/itip-formatter.c
+++ b/plugins/itip-formatter/itip-formatter.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -695,7 +695,7 @@ find_cal_opened_cb (ECal *ecal, ECalendarStatus status, gpointer data)
itip_view_remove_lower_info_item (ITIP_VIEW (pitip->view), pitip->progress_info_id);
pitip->progress_info_id = 0;
-
+
/*
* Only allow replies if backend doesn't do that automatically.
* Only enable it for forwarded invitiations (PUBLISH) or direct
@@ -834,7 +834,7 @@ find_server (struct _itip_puri *pitip, ECalComponent *comp)
if (current_source) {
l = sources_conflict;
-
+
pitip->progress_info_id = itip_view_add_lower_info_item (ITIP_VIEW (pitip->view), ITIP_VIEW_INFO_ITEM_TYPE_PROGRESS,
_("Opening the calendar. Please wait.."));
} else {
@@ -1243,8 +1243,8 @@ remove_delegate (struct _itip_puri *pitip, const char *delegate, const char *del
}
-static void
-update_x (ECalComponent *pitip_comp, ECalComponent *comp)
+static void
+update_x (ECalComponent *pitip_comp, ECalComponent *comp)
{
icalcomponent *itip_icalcomp = e_cal_component_get_icalcomponent (pitip_comp);
icalcomponent *icalcomp = e_cal_component_get_icalcomponent (comp);
@@ -2053,7 +2053,7 @@ format_itip_object (EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObject
gboolean have_alarms = FALSE;
info = (struct _itip_puri *) em_format_find_puri((EMFormat *)efh, pobject->classid);
-
+
/* Accounts */
info->accounts = itip_addresses_get ();
@@ -2441,10 +2441,10 @@ format_itip (EPlugin *ep, EMFormatHookTarget *target)
if (((CamelStreamMem *) mem)->buffer->len == 0)
puri->vcalendar = NULL;
- else
+ else
puri->vcalendar = g_strndup ((char *)((CamelStreamMem *) mem)->buffer->data, ((CamelStreamMem *) mem)->buffer->len);
camel_object_unref (mem);
-
+
camel_stream_printf (target->stream, "<table border=0 width=\"100%%\" cellpadding=3><tr>");
camel_stream_printf (target->stream, "<td valign=top><object classid=\"%s\"></object></td><td width=100%% valign=top>", classid);
--
cgit