diff options
author | Milan Crha <mcrha@redhat.com> | 2008-04-18 17:12:26 +0800 |
---|---|---|
committer | Milan Crha <mcrha@src.gnome.org> | 2008-04-18 17:12:26 +0800 |
commit | 6a52b2cc19aa11400f33087280b95329f1e87ff9 (patch) | |
tree | b00bd5397a9826b9e412fa48a9ab6c240ea3a207 /calendar/gui/e-cal-model-calendar.c | |
parent | a4f5f85400e00efa72c5a3a6a7a2b81b7bc9d268 (diff) | |
download | gsoc2013-evolution-6a52b2cc19aa11400f33087280b95329f1e87ff9.tar gsoc2013-evolution-6a52b2cc19aa11400f33087280b95329f1e87ff9.tar.gz gsoc2013-evolution-6a52b2cc19aa11400f33087280b95329f1e87ff9.tar.bz2 gsoc2013-evolution-6a52b2cc19aa11400f33087280b95329f1e87ff9.tar.lz gsoc2013-evolution-6a52b2cc19aa11400f33087280b95329f1e87ff9.tar.xz gsoc2013-evolution-6a52b2cc19aa11400f33087280b95329f1e87ff9.tar.zst gsoc2013-evolution-6a52b2cc19aa11400f33087280b95329f1e87ff9.zip |
** Fix for bug #509923
2008-04-18 Milan Crha <mcrha@redhat.com>
** Fix for bug #509923
* gui/dialogs/comp-editor.c: (real_send_comp):
* gui/e-calendar-view.c: (e_calendar_view_modify_and_send):
* gui/e-cal-model-calendar.c: (ecmc_set_value_at):
Send changes based on the user's choice of "all instances" or
"only this instance" for recurring events.
* gui/e-cal-model-calendar.c: (ecmc_set_value_at):
Also modify objects based on the user's choice.
svn path=/trunk/; revision=35382
Diffstat (limited to 'calendar/gui/e-cal-model-calendar.c')
-rw-r--r-- | calendar/gui/e-cal-model-calendar.c | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/calendar/gui/e-cal-model-calendar.c b/calendar/gui/e-cal-model-calendar.c index 0a91d29a16..6d22135aea 100644 --- a/calendar/gui/e-cal-model-calendar.c +++ b/calendar/gui/e-cal-model-calendar.c @@ -377,11 +377,33 @@ ecmc_set_value_at (ETableModel *etm, int col, int row, const void *value) break; } - if (e_cal_modify_object (comp_data->client, comp_data->icalcomp, CALOBJ_MOD_ALL, NULL)) { + if (e_cal_modify_object (comp_data->client, comp_data->icalcomp, mod, NULL)) { if (itip_organizer_is_user (comp, comp_data->client) && - send_component_dialog (NULL, comp_data->client, comp, FALSE)) - itip_send_comp (E_CAL_COMPONENT_METHOD_REQUEST, comp, + send_component_dialog (NULL, comp_data->client, comp, FALSE)) { + ECalComponent *send_comp = NULL; + + if (mod == CALOBJ_MOD_ALL && e_cal_component_is_instance (comp)) { + /* Ensure we send the master object, not the instance only */ + icalcomponent *icalcomp = NULL; + const char *uid = NULL; + + e_cal_component_get_uid (comp, &uid); + if (e_cal_get_object (comp_data->client, uid, NULL, &icalcomp, NULL) && icalcomp) { + send_comp = e_cal_component_new (); + if (!e_cal_component_set_icalcomponent (send_comp, icalcomp)) { + icalcomponent_free (icalcomp); + g_object_unref (send_comp); + send_comp = NULL; + } + } + } + + itip_send_comp (E_CAL_COMPONENT_METHOD_REQUEST, send_comp ? send_comp : comp, comp_data->client, NULL, NULL, NULL); + + if (send_comp) + g_object_unref (send_comp); + } } else { g_warning (G_STRLOC ": Could not modify the object!"); |