diff options
| author | Matthew Barnes <mbarnes@src.gnome.org> | 2009-01-21 10:52:05 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2009-01-21 10:52:05 +0800 |
| commit | ab00f5b08adb1d74a0c70d935a32ffd982e86f34 (patch) | |
| tree | 45bfaa44682bc3eee5a2ad8a64112b248767af5b /calendar/gui/e-cal-model-calendar.c | |
| parent | 5a1c48696363e3f3c7ffe11bdffdcad6557f811a (diff) | |
| download | gsoc2013-evolution-ab00f5b08adb1d74a0c70d935a32ffd982e86f34.tar.gz gsoc2013-evolution-ab00f5b08adb1d74a0c70d935a32ffd982e86f34.tar.zst gsoc2013-evolution-ab00f5b08adb1d74a0c70d935a32ffd982e86f34.zip | |
Merge revisions 37075:37107 from trunk.
svn path=/branches/kill-bonobo/; revision=37112
Diffstat (limited to 'calendar/gui/e-cal-model-calendar.c')
| -rw-r--r-- | calendar/gui/e-cal-model-calendar.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/calendar/gui/e-cal-model-calendar.c b/calendar/gui/e-cal-model-calendar.c index 27c73dd12c..7f5d7b55c6 100644 --- a/calendar/gui/e-cal-model-calendar.c +++ b/calendar/gui/e-cal-model-calendar.c @@ -382,8 +382,10 @@ ecmc_set_value_at (ETableModel *etm, int col, int row, const void *value) } if (e_cal_modify_object (comp_data->client, comp_data->icalcomp, mod, NULL)) { + gboolean strip_alarms = TRUE; + if (itip_organizer_is_user (comp, comp_data->client) && - send_component_dialog (NULL, comp_data->client, comp, FALSE)) { + send_component_dialog (NULL, comp_data->client, comp, FALSE, &strip_alarms)) { ECalComponent *send_comp = NULL; if (mod == CALOBJ_MOD_ALL && e_cal_component_is_instance (comp)) { @@ -403,7 +405,7 @@ ecmc_set_value_at (ETableModel *etm, int col, int row, const void *value) } itip_send_comp (E_CAL_COMPONENT_METHOD_REQUEST, send_comp ? send_comp : comp, - comp_data->client, NULL, NULL, NULL); + comp_data->client, NULL, NULL, NULL, strip_alarms); if (send_comp) g_object_unref (send_comp); |