aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2012-08-13 17:54:36 +0800
committerMilan Crha <mcrha@redhat.com>2012-08-13 17:57:47 +0800
commite41f778ba755f955fa33684d3f26615d3a91204a (patch)
treeef3145346717df9309e7b2eda657926fd2209da7 /modules
parentbe173ae84572f25c9fbf3a3d4f7e160b0fa077c6 (diff)
downloadgsoc2013-evolution-e41f778ba755f955fa33684d3f26615d3a91204a.tar
gsoc2013-evolution-e41f778ba755f955fa33684d3f26615d3a91204a.tar.gz
gsoc2013-evolution-e41f778ba755f955fa33684d3f26615d3a91204a.tar.bz2
gsoc2013-evolution-e41f778ba755f955fa33684d3f26615d3a91204a.tar.lz
gsoc2013-evolution-e41f778ba755f955fa33684d3f26615d3a91204a.tar.xz
gsoc2013-evolution-e41f778ba755f955fa33684d3f26615d3a91204a.tar.zst
gsoc2013-evolution-e41f778ba755f955fa33684d3f26615d3a91204a.zip
Remove GroupWise specific code from itip-formatter
This had been removing meeting invitations from mail folders when they were added to calendars which had set "save-schedules", but it removed them only from summary, thus server had the message still there, only users didn't see them. As a comment said, this belongs to GroupWise mail provider anyway, thus I removed it.
Diffstat (limited to 'modules')
-rw-r--r--modules/itip-formatter/e-mail-part-itip.h1
-rw-r--r--modules/itip-formatter/itip-view.c54
2 files changed, 0 insertions, 55 deletions
diff --git a/modules/itip-formatter/e-mail-part-itip.h b/modules/itip-formatter/e-mail-part-itip.h
index 4e464e0231..d2e681b467 100644
--- a/modules/itip-formatter/e-mail-part-itip.h
+++ b/modules/itip-formatter/e-mail-part-itip.h
@@ -110,7 +110,6 @@ struct _EMailPartItip {
guint update_item_progress_info_id;
guint update_item_error_info_id;
ItipViewResponse update_item_response;
- gboolean can_delete_invitation_from_cache;
GHashTable *real_comps; /* ESource's UID -> ECalComponent stored on the server */
ItipView *view;
diff --git a/modules/itip-formatter/itip-view.c b/modules/itip-formatter/itip-view.c
index 4a83cf5932..bbbd57569e 100644
--- a/modules/itip-formatter/itip-view.c
+++ b/modules/itip-formatter/itip-view.c
@@ -4485,7 +4485,6 @@ receive_objects_ready_cb (GObject *ecalclient,
ESource *source = e_client_get_source (E_CLIENT (client));
ItipView *view = user_data;
EMailPartItip *pitip = itip_view_get_mail_part (view);
- gboolean save_schedules;
GError *error = NULL;
if (!e_cal_client_receive_objects_finish (client, result, &error)) {
@@ -4534,55 +4533,6 @@ receive_objects_ready_cb (GObject *ecalclient,
break;
}
- /*FIXME Save schedules is misused here, remove it */
- save_schedules = e_cal_client_check_save_schedules (client);
-
- /* FIXME Remove this and handle this at the groupwise mail provider */
- if (save_schedules && pitip->can_delete_invitation_from_cache && pitip->folder) {
- CamelFolderChangeInfo *changes = NULL;
- const gchar *tag = NULL;
- CamelMessageInfo *mi;
- mi = camel_folder_summary_get (pitip->folder->summary, pitip->uid);
- if (mi) {
- changes = camel_folder_change_info_new ();
-
- if (itip_view_get_recur_check_state (view)) {
- /* Recurring appointment and "apply-to-all" is selected */
- tag = camel_message_info_user_tag (mi, "recurrence-key");
- if (tag) {
- gint i;
- GPtrArray *known_uids;
-
- known_uids = camel_folder_summary_get_array (pitip->folder->summary);
- for (i = 0; known_uids && i < known_uids->len; i++) {
- const gchar *uid = g_ptr_array_index (known_uids, i);
- CamelMessageInfo *mi2;
-
- mi2 = camel_folder_summary_get (pitip->folder->summary, uid);
- if (!mi2)
- continue;
-
- if (camel_message_info_user_tag (mi2, "recurrence-key") &&
- g_str_equal (camel_message_info_user_tag (mi2, "recurrence-key"), tag)) {
- camel_folder_summary_remove_uid (pitip->folder->summary, mi2->uid);
- camel_folder_change_info_remove_uid (changes, mi2->uid);
- }
-
- camel_message_info_free (mi2);
- }
- }
- } else {
- /* Either not a recurring appointment or "apply-to-all" is not selected. So just delete this instance alone */
- camel_folder_summary_remove_uid (pitip->folder->summary, pitip->uid);
- camel_folder_change_info_remove_uid (changes, pitip->uid);
- }
-
- camel_folder_changed (pitip->folder, changes);
- camel_folder_change_info_free (changes);
- camel_message_info_free (mi);
- }
- }
-
finish_message_delete_with_rsvp (pitip, view, client);
}
@@ -5635,7 +5585,6 @@ view_response_cb (ItipView *view,
return;
}
- pitip->can_delete_invitation_from_cache = FALSE;
if (pitip->method == ICAL_METHOD_PUBLISH || pitip->method == ICAL_METHOD_REQUEST) {
if (itip_view_get_free_time_check_state (view))
e_cal_component_set_transparency (pitip->comp, E_CAL_COMPONENT_TRANSP_TRANSPARENT);
@@ -5671,7 +5620,6 @@ view_response_cb (ItipView *view,
status = TRUE;
if (status) {
e_cal_component_rescan (pitip->comp);
- pitip->can_delete_invitation_from_cache = TRUE;
update_item (pitip, view, response);
}
break;
@@ -5683,7 +5631,6 @@ view_response_cb (ItipView *view,
ICAL_PARTSTAT_TENTATIVE);
if (status) {
e_cal_component_rescan (pitip->comp);
- pitip->can_delete_invitation_from_cache = TRUE;
update_item (pitip, view, response);
}
break;
@@ -5703,7 +5650,6 @@ view_response_cb (ItipView *view,
if (status) {
e_cal_component_rescan (pitip->comp);
- pitip->can_delete_invitation_from_cache = TRUE;
update_item (pitip, view, response);
}
break;