aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog7
-rw-r--r--calendar/gui/e-itip-control.c6
2 files changed, 9 insertions, 4 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 6a861a26f6..f78df1435f 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,10 @@
+2001-11-08 JP Rosevear <jpr@ximian.com>
+
+ * gui/e-itip-control.c (ok_clicked_cb): don't add the item, remove
+ it if declining (in case it was added before)
+ (remove_item): Since we can't discern between an item not found
+ and another error, always say the removal is complete
+
2001-11-07 Zbigniew Chyla <cyba@gnome.pl>
* gui/e-cell-date-edit-text.c (ecd_get_text):
diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c
index 33807fa994..09cdeec967 100644
--- a/calendar/gui/e-itip-control.c
+++ b/calendar/gui/e-itip-control.c
@@ -1312,9 +1312,7 @@ remove_item (EItipControl *itip)
client = priv->event_client;
cal_component_get_uid (priv->comp, &uid);
- if (!cal_client_remove_object (client, uid))
- dialog = gnome_warning_dialog (_("I couldn't remove the item from your calendar file!\n"));
- else
+ if (cal_client_remove_object (client, uid))
dialog = gnome_ok_dialog (_("Removal Complete"));
gnome_dialog_run_and_close (GNOME_DIALOG (dialog));
}
@@ -1503,7 +1501,7 @@ ok_clicked_cb (GtkHTML *html, const gchar *method, const gchar *url, const gchar
case 'D':
change_status (priv->ical_comp, priv->my_address, ICAL_PARTSTAT_DECLINED);
cal_component_rescan (priv->comp);
- update_item (itip);
+ remove_item (itip);
break;
case 'F':
send_freebusy (itip);