diff options
| author | JP Rosevear <jpr@ximian.com> | 2003-04-25 09:57:55 +0800 |
|---|---|---|
| committer | JP Rosevear <jpr@src.gnome.org> | 2003-04-25 09:57:55 +0800 |
| commit | 90dc62f9e598a84a4300f06c329c288b5171e159 (patch) | |
| tree | 68b221e9882bf02db332804f00ecbe340e2c481c /calendar/gui/e-day-view.c | |
| parent | 8f4d9f83b2d7a561840c39d3abefb4cec2b9b87e (diff) | |
| download | gsoc2013-evolution-90dc62f9e598a84a4300f06c329c288b5171e159.tar.gz gsoc2013-evolution-90dc62f9e598a84a4300f06c329c288b5171e159.tar.zst gsoc2013-evolution-90dc62f9e598a84a4300f06c329c288b5171e159.zip | |
Fixes #37552
2003-04-24 JP Rosevear <jpr@ximian.com>
Fixes #37552
* gui/dialogs/Makefile.am: build delete-error.[hc]
* gui/e-tasks.c: wrap calls to cal_client_remove_object with
delete_error_dialog
* gui/e-itip-control.c: ditto
* gui/e-calendar-table.c: ditto
* gui/e-week-view.c: ditto
* gui/e-day-view.c: ditto
* gui/dialogs/delete-error.[hc]: gemerate an error message based
on result
svn path=/trunk/; revision=20961
Diffstat (limited to 'calendar/gui/e-day-view.c')
| -rw-r--r-- | calendar/gui/e-day-view.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c index 2fae66475c..ed6cc4f5cb 100644 --- a/calendar/gui/e-day-view.c +++ b/calendar/gui/e-day-view.c @@ -54,6 +54,7 @@ #include "cal-util/timeutil.h" #include "dialogs/delete-comp.h" +#include "dialogs/delete-error.h" #include "dialogs/send-comp.h" #include "dialogs/cancel-comp.h" #include "dialogs/recur-comp.h" @@ -2821,7 +2822,7 @@ e_day_view_cut_clipboard (EDayView *day_view) e_day_view_copy_clipboard (day_view); cal_component_get_uid (event->comp, &uid); - cal_client_remove_object (day_view->client, uid); + delete_error_dialog (cal_client_remove_object (day_view->client, uid), CAL_COMPONENT_EVENT); e_day_view_set_status_message (day_view, NULL); } @@ -4077,10 +4078,7 @@ e_day_view_delete_event_internal (EDayView *day_view, EDayViewEvent *event) cal_component_get_uid (event->comp, &uid); - /* We don't check the return value; FALSE can mean the object - * was not in the server anyways. - */ - cal_client_remove_object (day_view->client, uid); + delete_error_dialog (cal_client_remove_object (day_view->client, uid), CAL_COMPONENT_EVENT); } } @@ -4141,9 +4139,9 @@ e_day_view_delete_occurrence_internal (EDayView *day_view, EDayViewEvent *event) const char *uid; cal_component_get_uid (event->comp, &uid); - if (cal_client_remove_object_with_mod (day_view->client, uid, CALOBJ_MOD_THIS) != CAL_CLIENT_RESULT_SUCCESS) - g_message ("e_day_view_on_delete_occurrence(): Could not update the object!"); - + + delete_error_dialog (cal_client_remove_object_with_mod (day_view->client, uid, CALOBJ_MOD_THIS), + CAL_COMPONENT_EVENT); return; } @@ -4215,7 +4213,7 @@ e_day_view_on_cut (GtkWidget *widget, gpointer data) itip_send_comp (CAL_COMPONENT_METHOD_CANCEL, event->comp, day_view->client, NULL); cal_component_get_uid (event->comp, &uid); - cal_client_remove_object (day_view->client, uid); + delete_error_dialog (cal_client_remove_object (day_view->client, uid), CAL_COMPONENT_EVENT); } static void |