aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/gui/dialogs
diff options
context:
space:
mode:
Diffstat (limited to 'calendar/gui/dialogs')
-rw-r--r--calendar/gui/dialogs/comp-editor.c8
-rw-r--r--calendar/gui/dialogs/recur-comp.c13
2 files changed, 7 insertions, 14 deletions
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index 26cc13e179..1e41a74ff4 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -650,6 +650,12 @@ save_comp (CompEditor *editor)
if (!cal_comp_is_on_server (priv->comp, priv->client)) {
result = e_cal_create_object (priv->client, icalcomp, NULL, &error);
} else {
+ if (priv->mod == CALOBJ_MOD_THIS) {
+ e_cal_component_set_rdate_list (priv->comp, NULL);
+ e_cal_component_set_rrule_list (priv->comp, NULL);
+ e_cal_component_set_exdate_list (priv->comp, NULL);
+ e_cal_component_set_exrule_list (priv->comp, NULL);
+ }
result = e_cal_modify_object (priv->client, icalcomp, priv->mod, &error);
}
@@ -1830,7 +1836,7 @@ real_send_comp (CompEditor *editor, ECalComponentItipMethod method)
comp_editor_set_changed (editor, TRUE);
- return FALSE;
+ return FALSE;
}
diff --git a/calendar/gui/dialogs/recur-comp.c b/calendar/gui/dialogs/recur-comp.c
index 734516e904..cfffa29c69 100644
--- a/calendar/gui/dialogs/recur-comp.c
+++ b/calendar/gui/dialogs/recur-comp.c
@@ -36,7 +36,6 @@ recur_component_dialog (ECal *client,
CalObjModType *mod,
GtkWindow *parent)
{
-#if 0
char *str;
GtkWidget *dialog, *rb_this, *rb_prior, *rb_future, *rb_all, *hbox;
GtkWidget *placeholder, *vbox;
@@ -134,16 +133,4 @@ recur_component_dialog (ECal *client,
gtk_widget_destroy (dialog);
return ret;
-#endif
-
- icalproperty *prop;
-
- prop = icalcomponent_get_first_property (e_cal_component_get_icalcomponent (comp),
- ICAL_RECURRENCEID_PROPERTY);
- if (prop)
- icalcomponent_remove_property (e_cal_component_get_icalcomponent (comp), prop);
-
- *mod = CALOBJ_MOD_ALL;
-
- return TRUE;
}