diff options
| -rw-r--r-- | calendar/ChangeLog | 4 | ||||
| -rw-r--r-- | calendar/gui/e-day-view.c | 44 | ||||
| -rw-r--r-- | calendar/gui/e-week-view.c | 44 |
3 files changed, 48 insertions, 44 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 10917d46c1..d0cfb00c4c 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -11,6 +11,10 @@ * gui/dialogs/recurrence-page.c: Use GtkTreeView with the new EDateTimeList as model for the exception list. + * gui/e-day-view.c: Silence warnings caused by missing casts. + + * gui/e-week-view.c: Silence warnings caused by missing casts. + 2003-01-15 Rodney Dawes <dobey@ximian.com> * gui/Makefile.am: Added libevolution_calendar_la_LDFLAGS, and diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c index f16507ba26..f0ece52c84 100644 --- a/calendar/gui/e-day-view.c +++ b/calendar/gui/e-day-view.c @@ -3659,70 +3659,70 @@ enum { static EPopupMenu main_items [] = { E_POPUP_ITEM (N_("New _Appointment"), - e_day_view_on_new_appointment, MASK_EDITABLE), + GTK_SIGNAL_FUNC (e_day_view_on_new_appointment), MASK_EDITABLE), E_POPUP_ITEM (N_("New All Day _Event"), - e_day_view_on_new_event, MASK_EDITABLE), + GTK_SIGNAL_FUNC (e_day_view_on_new_event), MASK_EDITABLE), E_POPUP_ITEM (N_("New Meeting"), - e_day_view_on_new_meeting, MASK_EDITABLE), + GTK_SIGNAL_FUNC (e_day_view_on_new_meeting), MASK_EDITABLE), E_POPUP_ITEM (N_("New Task"), - e_day_view_on_new_task, MASK_EDITABLE), + GTK_SIGNAL_FUNC (e_day_view_on_new_task), MASK_EDITABLE), E_POPUP_SEPARATOR, E_POPUP_ITEM (N_("Print..."), - e_day_view_on_print, 0), + GTK_SIGNAL_FUNC (e_day_view_on_print), 0), E_POPUP_SEPARATOR, E_POPUP_ITEM (N_("_Paste"), - e_day_view_on_paste, MASK_EDITABLE), + GTK_SIGNAL_FUNC (e_day_view_on_paste), MASK_EDITABLE), E_POPUP_SEPARATOR, E_POPUP_SUBMENU (N_("Current View"), NULL, 0), E_POPUP_ITEM (N_("Go to _Today"), - e_day_view_on_goto_today, 0), + GTK_SIGNAL_FUNC (e_day_view_on_goto_today), 0), E_POPUP_ITEM (N_("_Go to Date..."), - e_day_view_on_goto_date, 0), + GTK_SIGNAL_FUNC (e_day_view_on_goto_date), 0), E_POPUP_SEPARATOR, E_POPUP_ITEM (N_("_Publish Free/Busy Information"), - e_day_view_on_publish, 0), + GTK_SIGNAL_FUNC (e_day_view_on_publish), 0), E_POPUP_SEPARATOR, E_POPUP_ITEM (N_("_Settings..."), - e_day_view_on_settings, 0), + GTK_SIGNAL_FUNC (e_day_view_on_settings), 0), E_POPUP_TERMINATOR }; static EPopupMenu child_items [] = { - E_POPUP_ITEM (N_("_Open"), e_day_view_on_edit_appointment, MASK_EDITING), - E_POPUP_ITEM (N_("_Save As..."), e_day_view_on_save_as, MASK_EDITING), - E_POPUP_ITEM (N_("_Print..."), e_day_view_on_print_event, MASK_EDITING), + E_POPUP_ITEM (N_("_Open"), GTK_SIGNAL_FUNC (e_day_view_on_edit_appointment), MASK_EDITING), + E_POPUP_ITEM (N_("_Save As..."), GTK_SIGNAL_FUNC (e_day_view_on_save_as), MASK_EDITING), + E_POPUP_ITEM (N_("_Print..."), GTK_SIGNAL_FUNC (e_day_view_on_print_event), MASK_EDITING), /* Only show this separator if one of the above is shown. */ E_POPUP_SEPARATOR, - E_POPUP_ITEM (N_("C_ut"), e_day_view_on_cut, MASK_EDITABLE | MASK_EDITING | MASK_MEETING_ORGANIZER), - E_POPUP_ITEM (N_("_Copy"), e_day_view_on_copy, MASK_EDITING | MASK_MEETING_ORGANIZER), - E_POPUP_ITEM (N_("_Paste"), e_day_view_on_paste, MASK_EDITABLE), + E_POPUP_ITEM (N_("C_ut"), GTK_SIGNAL_FUNC (e_day_view_on_cut), MASK_EDITABLE | MASK_EDITING | MASK_MEETING_ORGANIZER), + E_POPUP_ITEM (N_("_Copy"), GTK_SIGNAL_FUNC (e_day_view_on_copy), MASK_EDITING | MASK_MEETING_ORGANIZER), + E_POPUP_ITEM (N_("_Paste"), GTK_SIGNAL_FUNC (e_day_view_on_paste), MASK_EDITABLE), E_POPUP_SEPARATOR, - E_POPUP_ITEM (N_("_Schedule Meeting..."), e_day_view_on_meeting, MASK_EDITABLE | MASK_EDITING | MASK_MEETING), - E_POPUP_ITEM (N_("_Forward as iCalendar..."), e_day_view_on_forward, MASK_EDITING), + E_POPUP_ITEM (N_("_Schedule Meeting..."), GTK_SIGNAL_FUNC (e_day_view_on_meeting), MASK_EDITABLE | MASK_EDITING | MASK_MEETING), + E_POPUP_ITEM (N_("_Forward as iCalendar..."), GTK_SIGNAL_FUNC (e_day_view_on_forward), MASK_EDITING), E_POPUP_SEPARATOR, - E_POPUP_ITEM (N_("_Delete"), e_day_view_on_delete_appointment, MASK_EDITABLE | MASK_SINGLE | MASK_EDITING), - E_POPUP_ITEM (N_("Make this Occurrence _Movable"), e_day_view_on_unrecur_appointment, MASK_EDITABLE | MASK_RECURRING | MASK_EDITING), - E_POPUP_ITEM (N_("Delete this _Occurrence"), e_day_view_on_delete_occurrence, MASK_EDITABLE | MASK_RECURRING | MASK_EDITING), - E_POPUP_ITEM (N_("Delete _All Occurrences"), e_day_view_on_delete_appointment, MASK_EDITABLE | MASK_RECURRING | MASK_EDITING), + E_POPUP_ITEM (N_("_Delete"), GTK_SIGNAL_FUNC (e_day_view_on_delete_appointment), MASK_EDITABLE | MASK_SINGLE | MASK_EDITING), + E_POPUP_ITEM (N_("Make this Occurrence _Movable"), GTK_SIGNAL_FUNC (e_day_view_on_unrecur_appointment), MASK_EDITABLE | MASK_RECURRING | MASK_EDITING), + E_POPUP_ITEM (N_("Delete this _Occurrence"), GTK_SIGNAL_FUNC (e_day_view_on_delete_occurrence), MASK_EDITABLE | MASK_RECURRING | MASK_EDITING), + E_POPUP_ITEM (N_("Delete _All Occurrences"), GTK_SIGNAL_FUNC (e_day_view_on_delete_appointment), MASK_EDITABLE | MASK_RECURRING | MASK_EDITING), E_POPUP_TERMINATOR }; diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c index d73f14e774..51b01eb9d4 100644 --- a/calendar/gui/e-week-view.c +++ b/calendar/gui/e-week-view.c @@ -3448,60 +3448,60 @@ enum { }; static EPopupMenu main_items [] = { - E_POPUP_ITEM (N_("New _Appointment..."), e_week_view_on_new_appointment, MASK_EDITABLE), - E_POPUP_ITEM (N_("New All Day _Event"), e_week_view_on_new_event, MASK_EDITABLE), - E_POPUP_ITEM (N_("New Meeting"), e_week_view_on_new_meeting, MASK_EDITABLE), - E_POPUP_ITEM (N_("New Task"), e_week_view_on_new_task, MASK_EDITABLE), + E_POPUP_ITEM (N_("New _Appointment..."), GTK_SIGNAL_FUNC (e_week_view_on_new_appointment), MASK_EDITABLE), + E_POPUP_ITEM (N_("New All Day _Event"), GTK_SIGNAL_FUNC (e_week_view_on_new_event), MASK_EDITABLE), + E_POPUP_ITEM (N_("New Meeting"), GTK_SIGNAL_FUNC (e_week_view_on_new_meeting), MASK_EDITABLE), + E_POPUP_ITEM (N_("New Task"), GTK_SIGNAL_FUNC (e_week_view_on_new_task), MASK_EDITABLE), E_POPUP_SEPARATOR, - E_POPUP_ITEM (N_("_Print..."), e_week_view_on_print, 0), + E_POPUP_ITEM (N_("_Print..."), GTK_SIGNAL_FUNC (e_week_view_on_print), 0), E_POPUP_SEPARATOR, - E_POPUP_ITEM (N_("_Paste"), e_week_view_on_paste, MASK_EDITABLE), + E_POPUP_ITEM (N_("_Paste"), GTK_SIGNAL_FUNC (e_week_view_on_paste), MASK_EDITABLE), E_POPUP_SEPARATOR, E_POPUP_SUBMENU (N_("Current View"), NULL, 0), - E_POPUP_ITEM (N_("Go to _Today"), e_week_view_on_goto_today, 0), - E_POPUP_ITEM (N_("_Go to Date..."), e_week_view_on_goto_date, 0), + E_POPUP_ITEM (N_("Go to _Today"), GTK_SIGNAL_FUNC (e_week_view_on_goto_today), 0), + E_POPUP_ITEM (N_("_Go to Date..."), GTK_SIGNAL_FUNC (e_week_view_on_goto_date), 0), E_POPUP_SEPARATOR, - E_POPUP_ITEM (N_("_Publish Free/Busy Information"), e_week_view_on_publish, 0), + E_POPUP_ITEM (N_("_Publish Free/Busy Information"), GTK_SIGNAL_FUNC (e_week_view_on_publish), 0), E_POPUP_SEPARATOR, - E_POPUP_ITEM (N_("_Settings..."), e_week_view_on_settings, 0), + E_POPUP_ITEM (N_("_Settings..."), GTK_SIGNAL_FUNC (e_week_view_on_settings), 0), E_POPUP_TERMINATOR }; static EPopupMenu child_items [] = { - E_POPUP_ITEM (N_("_Open"), e_week_view_on_edit_appointment, MASK_EDITING), - E_POPUP_ITEM (N_("_Save As..."), e_week_view_on_save_as, MASK_EDITING), - E_POPUP_ITEM (N_("_Print..."), e_week_view_on_print_event, MASK_EDITING), + E_POPUP_ITEM (N_("_Open"), GTK_SIGNAL_FUNC (e_week_view_on_edit_appointment), MASK_EDITING), + E_POPUP_ITEM (N_("_Save As..."), GTK_SIGNAL_FUNC (e_week_view_on_save_as), MASK_EDITING), + E_POPUP_ITEM (N_("_Print..."), GTK_SIGNAL_FUNC (e_week_view_on_print_event), MASK_EDITING), /* Only show this separator if one of the above is shown. */ E_POPUP_SEPARATOR, - E_POPUP_ITEM (N_("C_ut"), e_week_view_on_cut, MASK_EDITING | MASK_EDITABLE | MASK_MEETING_ORGANIZER), - E_POPUP_ITEM (N_("_Copy"), e_week_view_on_copy, MASK_EDITING | MASK_MEETING_ORGANIZER), - E_POPUP_ITEM (N_("_Paste"), e_week_view_on_paste, MASK_EDITABLE), + E_POPUP_ITEM (N_("C_ut"), GTK_SIGNAL_FUNC (e_week_view_on_cut), MASK_EDITING | MASK_EDITABLE | MASK_MEETING_ORGANIZER), + E_POPUP_ITEM (N_("_Copy"), GTK_SIGNAL_FUNC (e_week_view_on_copy), MASK_EDITING | MASK_MEETING_ORGANIZER), + E_POPUP_ITEM (N_("_Paste"), GTK_SIGNAL_FUNC (e_week_view_on_paste), MASK_EDITABLE), E_POPUP_SEPARATOR, - E_POPUP_ITEM (N_("_Schedule Meeting..."), e_week_view_on_meeting, MASK_EDITABLE | MASK_EDITING | MASK_MEETING), - E_POPUP_ITEM (N_("_Forward as iCalendar..."), e_week_view_on_forward, MASK_EDITING), + E_POPUP_ITEM (N_("_Schedule Meeting..."), GTK_SIGNAL_FUNC (e_week_view_on_meeting), MASK_EDITABLE | MASK_EDITING | MASK_MEETING), + E_POPUP_ITEM (N_("_Forward as iCalendar..."), GTK_SIGNAL_FUNC (e_week_view_on_forward), MASK_EDITING), E_POPUP_SEPARATOR, - E_POPUP_ITEM (N_("_Delete"), e_week_view_on_delete_appointment, MASK_EDITABLE | MASK_SINGLE | MASK_EDITING), - E_POPUP_ITEM (N_("Make this Occurrence _Movable"), e_week_view_on_unrecur_appointment, MASK_RECURRING | MASK_EDITING | MASK_EDITABLE), - E_POPUP_ITEM (N_("Delete this _Occurrence"), e_week_view_on_delete_occurrence, MASK_RECURRING | MASK_EDITING | MASK_EDITABLE), - E_POPUP_ITEM (N_("Delete _All Occurrences"), e_week_view_on_delete_appointment, MASK_RECURRING | MASK_EDITING | MASK_EDITABLE), + E_POPUP_ITEM (N_("_Delete"), GTK_SIGNAL_FUNC (e_week_view_on_delete_appointment), MASK_EDITABLE | MASK_SINGLE | MASK_EDITING), + E_POPUP_ITEM (N_("Make this Occurrence _Movable"), GTK_SIGNAL_FUNC (e_week_view_on_unrecur_appointment), MASK_RECURRING | MASK_EDITING | MASK_EDITABLE), + E_POPUP_ITEM (N_("Delete this _Occurrence"), GTK_SIGNAL_FUNC (e_week_view_on_delete_occurrence), MASK_RECURRING | MASK_EDITING | MASK_EDITABLE), + E_POPUP_ITEM (N_("Delete _All Occurrences"), GTK_SIGNAL_FUNC (e_week_view_on_delete_appointment), MASK_RECURRING | MASK_EDITING | MASK_EDITABLE), E_POPUP_TERMINATOR }; |