From 3b946037007857c3d2be0c39db0782f9dbaef461 Mon Sep 17 00:00:00 2001 From: Chenthill Palanisamy Date: Thu, 21 May 2009 14:10:36 +0530 Subject: Adds the resend feature to GroupWise features. --- calendar/gui/dialogs/comp-editor.c | 7 ++++--- calendar/gui/e-calendar-view.c | 12 ++++++------ calendar/gui/e-calendar-view.h | 2 ++ 3 files changed, 12 insertions(+), 9 deletions(-) (limited to 'calendar') diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c index 2a1513327e..545fca4448 100644 --- a/calendar/gui/dialogs/comp-editor.c +++ b/calendar/gui/dialogs/comp-editor.c @@ -1848,7 +1848,7 @@ comp_editor_set_summary (CompEditor *editor, !editor->priv->warned && !(editor->priv->flags & COMP_EDITOR_DELEGATE) && editor->priv->existing_org && - !editor->priv->user_org; + !editor->priv->user_org && !(editor->priv->flags & COMP_EDITOR_NEW_ITEM); if (show_warning) { e_notice ( @@ -1896,7 +1896,8 @@ comp_editor_set_changed (CompEditor *editor, show_warning = changed && !editor->priv->warned && !(editor->priv->flags & COMP_EDITOR_DELEGATE) && - editor->priv->existing_org && !editor->priv->user_org; + editor->priv->existing_org && !editor->priv->user_org + && !(editor->priv->flags & COMP_EDITOR_NEW_ITEM); if (show_warning) { e_notice ( @@ -2701,7 +2702,7 @@ page_dates_changed_cb (CompEditor *editor, if (page != (CompEditorPage *) l->data) comp_editor_page_set_dates (l->data, dates); - if (!priv->warned && priv->existing_org && !priv->user_org) { + if (!priv->warned && priv->existing_org && !priv->user_org && !(editor->priv->flags & COMP_EDITOR_NEW_ITEM)) { e_notice (priv->notebook, GTK_MESSAGE_INFO, _("Changes made to this item may be discarded if an update arrives")); priv->warned = TRUE; diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c index a99149ae2e..ffb08bbee0 100644 --- a/calendar/gui/e-calendar-view.c +++ b/calendar/gui/e-calendar-view.c @@ -78,7 +78,6 @@ struct _ECalendarViewPrivate { static void e_calendar_view_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec); static void e_calendar_view_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec); static void e_calendar_view_destroy (GtkObject *object); -static void open_event_with_flags (ECalendarView *cal_view, ECal *client, icalcomponent *icalcomp, guint32 flags); extern ECompEditorRegistry *comp_editor_registry; @@ -1602,7 +1601,7 @@ on_delegate (EPopup *ep, EPopupItem *pitem, void *data) flags |= COMP_EDITOR_MEETING | COMP_EDITOR_DELEGATE; - open_event_with_flags (cal_view, event->comp_data->client, clone, flags); + e_calendar_view_open_event_with_flags (cal_view, event->comp_data->client, clone, flags); icalcomponent_free (clone); g_list_free (selected); @@ -2013,7 +2012,7 @@ e_calendar_view_new_appointment_for (ECalendarView *cal_view, flags |= COMP_EDITOR_USER_ORG; } - open_event_with_flags (cal_view, default_client, + e_calendar_view_open_event_with_flags (cal_view, default_client, icalcomp, flags); g_object_unref (comp); @@ -2102,8 +2101,8 @@ object_created_cb (CompEditor *ce, ECalendarView *cal_view) gnome_calendar_emit_user_created_signal (cal_view, e_calendar_view_get_calendar (cal_view), comp_editor_get_client (ce)); } -static void -open_event_with_flags (ECalendarView *cal_view, ECal *client, icalcomponent *icalcomp, guint32 flags) +CompEditor * +e_calendar_view_open_event_with_flags (ECalendarView *cal_view, ECal *client, icalcomponent *icalcomp, guint32 flags) { CompEditor *ce; const char *uid; @@ -2131,6 +2130,7 @@ open_event_with_flags (ECalendarView *cal_view, ECal *client, icalcomponent *ica gtk_window_present (GTK_WINDOW (ce)); + return ce; } /** @@ -2165,7 +2165,7 @@ e_calendar_view_edit_appointment (ECalendarView *cal_view, } - open_event_with_flags (cal_view, client, icalcomp, flags); + e_calendar_view_open_event_with_flags (cal_view, client, icalcomp, flags); } void diff --git a/calendar/gui/e-calendar-view.h b/calendar/gui/e-calendar-view.h index 1f18e67241..eedef31856 100644 --- a/calendar/gui/e-calendar-view.h +++ b/calendar/gui/e-calendar-view.h @@ -28,6 +28,7 @@ #include "e-cal-model.h" #include "gnome-cal.h" #include "e-activity-handler.h" +#include "dialogs/comp-editor.h" G_BEGIN_DECLS @@ -144,6 +145,7 @@ void e_calendar_view_paste_clipboard (ECalendarView *cal_view); void e_calendar_view_delete_selected_event (ECalendarView *cal_view); void e_calendar_view_delete_selected_events (ECalendarView *cal_view); void e_calendar_view_delete_selected_occurrence (ECalendarView *cal_view); +CompEditor* e_calendar_view_open_event_with_flags (ECalendarView *cal_view, ECal *client, icalcomponent *icalcomp, guint32 flags); GtkMenu *e_calendar_view_create_popup_menu (ECalendarView *cal_view); -- cgit v1.2.3