aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/itip-formatter
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/itip-formatter')
-rw-r--r--plugins/itip-formatter/itip-formatter.c27
-rw-r--r--plugins/itip-formatter/itip-view.c29
-rw-r--r--plugins/itip-formatter/itip-view.h2
3 files changed, 32 insertions, 26 deletions
diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c
index 04049ef6d5..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:
@@ -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) ||
@@ -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);
@@ -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 ();
@@ -2051,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 ();
@@ -2439,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);
@@ -2585,8 +2587,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);
diff --git a/plugins/itip-formatter/itip-view.c b/plugins/itip-formatter/itip-view.c
index 32fa3104cc..30dbe135cc 100644
--- a/plugins/itip-formatter/itip-view.c
+++ b/plugins/itip-formatter/itip-view.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:
@@ -737,7 +737,7 @@ set_info_items (GtkWidget *info_box, GSList *info_items)
}
label = gtk_label_new (item->message);
- gtk_label_set_selectable (GTK_LABEL (label), TRUE);
+ gtk_label_set_selectable (GTK_LABEL (label), TRUE);
gtk_widget_show (label);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 6);
@@ -780,7 +780,10 @@ button_clicked_cb (GtkWidget *widget, gpointer data)
}
static void
-set_one_button (ItipView *view, char *label, char *stock_id, ItipViewResponse response)
+set_one_button (ItipView *view,
+ const gchar *label,
+ const gchar *stock_id,
+ ItipViewResponse response)
{
ItipViewPrivate *priv;
GtkWidget *button;
@@ -1031,7 +1034,7 @@ itip_view_init (ItipView *view)
priv->start_header = gtk_label_new (_("Start time:"));
priv->start_label = gtk_label_new (NULL);
gtk_label_set_selectable (GTK_LABEL (priv->start_header), TRUE);
- gtk_label_set_selectable (GTK_LABEL (priv->start_label), TRUE);
+ gtk_label_set_selectable (GTK_LABEL (priv->start_label), TRUE);
gtk_misc_set_alignment (GTK_MISC (priv->start_header), 0, 0.5);
gtk_misc_set_alignment (GTK_MISC (priv->start_label), 0, 0.5);
gtk_widget_show (priv->start_header);
@@ -1075,7 +1078,7 @@ itip_view_init (ItipView *view)
/* Description */
priv->description_label = gtk_label_new (NULL);
- gtk_label_set_selectable (GTK_LABEL (priv->description_label), TRUE);
+ gtk_label_set_selectable (GTK_LABEL (priv->description_label), TRUE);
gtk_label_set_line_wrap (GTK_LABEL (priv->description_label), TRUE);
gtk_misc_set_alignment (GTK_MISC (priv->description_label), 0, 0.5);
gtk_box_pack_start (GTK_BOX (vbox), priv->description_label, FALSE, FALSE, 0);
@@ -1109,12 +1112,12 @@ itip_view_init (ItipView *view)
gtk_box_pack_start (GTK_BOX (priv->rsvp_box), hbox, FALSE, FALSE, 0);
label = gtk_label_new (NULL);
- gtk_label_set_selectable (GTK_LABEL (label), TRUE);
+ gtk_label_set_selectable (GTK_LABEL (label), TRUE);
gtk_widget_show (label);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
priv->rsvp_comment_header = gtk_label_new (_("Comment:"));
- gtk_label_set_selectable (GTK_LABEL (priv->rsvp_comment_header), TRUE);
+ gtk_label_set_selectable (GTK_LABEL (priv->rsvp_comment_header), TRUE);
gtk_widget_set_sensitive (priv->rsvp_comment_header, FALSE);
gtk_widget_show (priv->rsvp_comment_header);
gtk_box_pack_start (GTK_BOX (hbox), priv->rsvp_comment_header, FALSE, FALSE, 0);
@@ -2171,8 +2174,8 @@ void
itip_view_set_show_free_time_check (ItipView *view, gboolean show)
{
g_return_if_fail (view != NULL);
- g_return_if_fail (ITIP_IS_VIEW (view));
-
+ g_return_if_fail (ITIP_IS_VIEW (view));
+
if (show)
gtk_widget_show (view->priv->free_time_check);
else {
@@ -2193,8 +2196,8 @@ void
itip_view_set_show_keep_alarm_check (ItipView *view, gboolean show)
{
g_return_if_fail (view != NULL);
- g_return_if_fail (ITIP_IS_VIEW (view));
-
+ g_return_if_fail (ITIP_IS_VIEW (view));
+
if (show)
gtk_widget_show (view->priv->keep_alarm_check);
else
@@ -2216,8 +2219,8 @@ void
itip_view_set_show_inherit_alarm_check (ItipView *view, gboolean show)
{
g_return_if_fail (view != NULL);
- g_return_if_fail (ITIP_IS_VIEW (view));
-
+ g_return_if_fail (ITIP_IS_VIEW (view));
+
if (show)
gtk_widget_show (view->priv->inherit_alarm_check);
else {
diff --git a/plugins/itip-formatter/itip-view.h b/plugins/itip-formatter/itip-view.h
index 736119ae04..88d01204fb 100644
--- a/plugins/itip-formatter/itip-view.h
+++ b/plugins/itip-formatter/itip-view.h
@@ -11,7 +11,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:
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 05:23:08 +0800