callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Committing on behalf of Chenthill Palanisamy <pchenthill@novell.com>

Browse Source 
2008-04-30  Chenthill Palanisamy  <pchenthill@novell.com>

        ** Fixes #338330 (bnc)
           Internet Based Calendar Events Are Declined By Evolution/GroupWise

svn path=/trunk/; revision=35450
This commit is contained in:
Chenthill Palanisamy
2008-04-30 08:45:02 +00:00
committed by Bharath Acharya
parent 4ca16039ae
commit d8bf836d70
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/itip-formatter/ChangeLog
View File

@ -1,3 +1,10 @@
2008-04-30 Chenthill Palanisamy <pchenthill@novell.com>
** Fixes #338330 (bnc)
Internet Based Calendar Events Are Declined By Evolution/GroupWise
* itip-formatter.c: (view_response_cb):
2008-04-28 Srinivasa Ragavan <sragavan@novell.com> 2008-04-28 Srinivasa Ragavan <sragavan@novell.com>
** Fix for BNC bug #382687 ** Fix for BNC bug #382687

12
plugins/itip-formatter/itip-formatter.c
View File

@ -1622,7 +1622,7 @@ view_response_cb (GtkWidget *widget, ItipViewResponse response, gpointer data)
gboolean status = FALSE, delete_invitation_from_cache = FALSE; gboolean status = FALSE, delete_invitation_from_cache = FALSE;
icalproperty *prop; icalproperty *prop;
ECalComponentTransparency trans; ECalComponentTransparency trans;
gboolean flag; gboolean flag, save_schedules;
if (pitip->method == ICAL_METHOD_PUBLISH || pitip->method == ICAL_METHOD_REQUEST) { if (pitip->method == ICAL_METHOD_PUBLISH || pitip->method == ICAL_METHOD_REQUEST) {
if (itip_view_get_free_time_check_state (ITIP_VIEW (pitip->view))) if (itip_view_get_free_time_check_state (ITIP_VIEW (pitip->view)))
@ -1647,6 +1647,8 @@ view_response_cb (GtkWidget *widget, ItipViewResponse response, gpointer data)
icalcomponent_add_property (pitip->ical_comp, prop); icalcomponent_add_property (pitip->ical_comp, prop);
} }
save_schedules = e_cal_get_save_schedules (pitip->current_ecal);
switch (response) { switch (response) {
case ITIP_VIEW_RESPONSE_ACCEPT: case ITIP_VIEW_RESPONSE_ACCEPT:
if (pitip->type != E_CAL_SOURCE_TYPE_JOURNAL) if (pitip->type != E_CAL_SOURCE_TYPE_JOURNAL)
@ -1657,7 +1659,7 @@ view_response_cb (GtkWidget *widget, ItipViewResponse response, gpointer data)
if (status) { if (status) {
e_cal_component_rescan (pitip->comp); e_cal_component_rescan (pitip->comp);
flag = update_item (pitip, response); flag = update_item (pitip, response);
if (e_cal_get_save_schedules (pitip->current_ecal) && flag) if (save_schedules && flag)
delete_invitation_from_cache = TRUE; delete_invitation_from_cache = TRUE;
} }
break; break;
@ -1667,7 +1669,7 @@ view_response_cb (GtkWidget *widget, ItipViewResponse response, gpointer data)
if (status) { if (status) {
e_cal_component_rescan (pitip->comp); e_cal_component_rescan (pitip->comp);
flag = update_item (pitip, response); flag = update_item (pitip, response);
if (e_cal_get_save_schedules (pitip->current_ecal) && flag) if (save_schedules && flag)
delete_invitation_from_cache = TRUE; delete_invitation_from_cache = TRUE;
} }
@ -1686,7 +1688,7 @@ view_response_cb (GtkWidget *widget, ItipViewResponse response, gpointer data)
if (status) { if (status) {
e_cal_component_rescan (pitip->comp); e_cal_component_rescan (pitip->comp);
flag = update_item (pitip, response); flag = update_item (pitip, response);
if (e_cal_get_save_schedules (pitip->current_ecal) && flag) if (save_schedules && flag)
delete_invitation_from_cache = TRUE; delete_invitation_from_cache = TRUE;
} }
break; break;
@ -1746,7 +1748,7 @@ view_response_cb (GtkWidget *widget, ItipViewResponse response, gpointer data)
} }
} }
if (!delete_invitation_from_cache && pitip->delete_message) { if (!save_schedules && pitip->delete_message) {
g_message ("Deleting!"); g_message ("Deleting!");
camel_folder_delete_message (pitip->folder, pitip->uid); camel_folder_delete_message (pitip->folder, pitip->uid);
} }