aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChenthill Palanisamy <pchenthill@novell.com>2008-04-30 16:45:02 +0800
committerBharath Acharya <abharath@src.gnome.org>2008-04-30 16:45:02 +0800
commitd8bf836d703a9391680d55eb11baf4a686320a07 (patch)
tree12902d5daeead5ea03277a5389099ffd90febd33
parent4ca16039ae0e04a218ff979c499ecd7cf0a0ae46 (diff)
downloadgsoc2013-evolution-d8bf836d703a9391680d55eb11baf4a686320a07.tar.gz
gsoc2013-evolution-d8bf836d703a9391680d55eb11baf4a686320a07.tar.zst
gsoc2013-evolution-d8bf836d703a9391680d55eb11baf4a686320a07.zip
Committing on behalf of Chenthill Palanisamy <pchenthill@novell.com>
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
-rw-r--r--plugins/itip-formatter/ChangeLog7
-rw-r--r--plugins/itip-formatter/itip-formatter.c12
2 files changed, 14 insertions, 5 deletions
diff --git a/plugins/itip-formatter/ChangeLog b/plugins/itip-formatter/ChangeLog
index 7972237286..3475813f60 100644
--- a/plugins/itip-formatter/ChangeLog
+++ b/plugins/itip-formatter/ChangeLog
@@ -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>
** Fix for BNC bug #382687
diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c
index 9369efaf59..55b182752d 100644
--- a/plugins/itip-formatter/itip-formatter.c
+++ b/plugins/itip-formatter/itip-formatter.c
@@ -1622,7 +1622,7 @@ view_response_cb (GtkWidget *widget, ItipViewResponse response, gpointer data)
gboolean status = FALSE, delete_invitation_from_cache = FALSE;
icalproperty *prop;
ECalComponentTransparency trans;
- gboolean flag;
+ gboolean flag, save_schedules;
if (pitip->method == ICAL_METHOD_PUBLISH || pitip->method == ICAL_METHOD_REQUEST) {
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);
}
+ save_schedules = e_cal_get_save_schedules (pitip->current_ecal);
+
switch (response) {
case ITIP_VIEW_RESPONSE_ACCEPT:
if (pitip->type != E_CAL_SOURCE_TYPE_JOURNAL)
@@ -1657,7 +1659,7 @@ view_response_cb (GtkWidget *widget, ItipViewResponse response, gpointer data)
if (status) {
e_cal_component_rescan (pitip->comp);
flag = update_item (pitip, response);
- if (e_cal_get_save_schedules (pitip->current_ecal) && flag)
+ if (save_schedules && flag)
delete_invitation_from_cache = TRUE;
}
break;
@@ -1667,7 +1669,7 @@ view_response_cb (GtkWidget *widget, ItipViewResponse response, gpointer data)
if (status) {
e_cal_component_rescan (pitip->comp);
flag = update_item (pitip, response);
- if (e_cal_get_save_schedules (pitip->current_ecal) && flag)
+ if (save_schedules && flag)
delete_invitation_from_cache = TRUE;
}
@@ -1686,7 +1688,7 @@ view_response_cb (GtkWidget *widget, ItipViewResponse response, gpointer data)
if (status) {
e_cal_component_rescan (pitip->comp);
flag = update_item (pitip, response);
- if (e_cal_get_save_schedules (pitip->current_ecal) && flag)
+ if (save_schedules && flag)
delete_invitation_from_cache = TRUE;
}
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!");
camel_folder_delete_message (pitip->folder, pitip->uid);
}