From e4fa8fe10408c4c370e1e11e4bb2d7745f50aceb Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 16 May 2009 12:11:55 -0400 Subject: Fix several types of pedantic compiler warnings. --- calendar/gui/e-calendar-view.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'calendar/gui/e-calendar-view.c') diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c index 6c8e1f83ab..a99149ae2e 100644 --- a/calendar/gui/e-calendar-view.c +++ b/calendar/gui/e-calendar-view.c @@ -85,7 +85,7 @@ extern ECompEditorRegistry *comp_editor_registry; /* Property IDs */ enum props { PROP_0, - PROP_MODEL, + PROP_MODEL }; /* FIXME Why are we emitting these event signals here? Can't the model just be listened to? */ @@ -567,7 +567,7 @@ e_calendar_view_set_status_message (ECalendarView *cal_view, const gchar *messag priv->activity_id = 0; } } else if (priv->activity_id == 0) { - char *client_id = g_strdup_printf ("%p", cal_view); + char *client_id = g_strdup_printf ("%p", (gpointer) cal_view); priv->activity_id = e_activity_handler_operation_started ( priv->activity_handler, client_id, message, TRUE); -- cgit v1.2.3 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/e-calendar-view.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'calendar/gui/e-calendar-view.c') 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 -- cgit v1.2.3 From ceb57eb3a8bc04eca26d859ff766130d06cb0e54 Mon Sep 17 00:00:00 2001 From: Chenthill Palanisamy Date: Thu, 21 May 2009 14:12:04 +0530 Subject: Fixes bug 498712 (bnc) - deleting meetings sometimes does not work properly. --- calendar/gui/e-calendar-view.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'calendar/gui/e-calendar-view.c') diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c index ffb08bbee0..4ceb8910c3 100644 --- a/calendar/gui/e-calendar-view.c +++ b/calendar/gui/e-calendar-view.c @@ -1005,9 +1005,6 @@ check_for_retract (ECalComponent *comp, ECal *client) ret_val = TRUE; } - if (!ret_val) - ret_val = e_account_list_find(itip_addresses_get(), E_ACCOUNT_FIND_ID_ADDRESS, strip) != NULL; - g_free (email); return ret_val; } @@ -1028,11 +1025,12 @@ delete_event (ECalendarView *cal_view, ECalendarViewEvent *event) if (!e_cal_get_static_capability (event->comp_data->client, CAL_STATIC_CAPABILITY_RECURRENCES_NO_MASTER)) e_cal_component_set_recurid (comp, NULL); + /*FIXME Retract should be moved to Groupwise features plugin */ if (check_for_retract (comp, event->comp_data->client)) { char *retract_comment = NULL; gboolean retract = FALSE; - retract = prompt_retract_dialog (comp, &retract_comment, GTK_WIDGET (cal_view)); + delete = prompt_retract_dialog (comp, &retract_comment, GTK_WIDGET (cal_view), &retract); if (retract) { GList *users = NULL; icalcomponent *icalcomp = NULL, *mod_comp = NULL; @@ -1144,11 +1142,12 @@ e_calendar_view_delete_selected_occurrence (ECalendarView *cal_view) e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp)); vtype = e_cal_component_get_vtype (comp); + /*FIXME Retract should be moved to Groupwise features plugin */ if (check_for_retract (comp, event->comp_data->client)) { char *retract_comment = NULL; gboolean retract = FALSE; - retract = prompt_retract_dialog (comp, &retract_comment, GTK_WIDGET (cal_view)); + delete = prompt_retract_dialog (comp, &retract_comment, GTK_WIDGET (cal_view), &retract); if (retract) { GList *users = NULL; icalcomponent *icalcomp = NULL, *mod_comp = NULL; -- cgit v1.2.3