From 67159043da2de9df576f6a4eaa245e0c3926f004 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 18 Jun 2009 12:56:51 -0400 Subject: Use G_BEGIN_DECLS / G_END_DECLS macros. --- calendar/gui/dialogs/calendar-setup.h | 9 ++------- calendar/gui/e-cal-config.h | 9 ++------- calendar/gui/e-cal-event.h | 9 ++------- calendar/gui/e-cal-menu.h | 9 ++------- calendar/gui/e-cal-popup.h | 9 ++------- calendar/gui/e-day-view-layout.h | 8 ++------ calendar/gui/e-day-view-main-item.h | 8 ++------ calendar/gui/e-day-view-time-item.h | 8 ++------ calendar/gui/e-day-view-top-item.h | 8 ++------ calendar/gui/e-meeting-attendee.h | 9 ++------- calendar/gui/e-meeting-time-sel-item.h | 4 +--- calendar/gui/e-meeting-types.h | 9 ++------- calendar/gui/e-meeting-utils.h | 9 ++------- calendar/gui/e-week-view-event-item.h | 8 ++------ calendar/gui/e-week-view-layout.h | 8 ++------ calendar/gui/e-week-view-main-item.h | 8 ++------ calendar/gui/e-week-view-titles-item.h | 8 ++------ calendar/gui/e-week-view.h | 8 ++------ 18 files changed, 35 insertions(+), 113 deletions(-) (limited to 'calendar') diff --git a/calendar/gui/dialogs/calendar-setup.h b/calendar/gui/dialogs/calendar-setup.h index 4ec9980532..d92993c1a6 100644 --- a/calendar/gui/dialogs/calendar-setup.h +++ b/calendar/gui/dialogs/calendar-setup.h @@ -27,10 +27,7 @@ struct _GtkWindow; struct _ESource; -#ifdef __cplusplus -extern "C" { -#pragma } -#endif +G_BEGIN_DECLS void calendar_setup_edit_calendar (struct _GtkWindow *parent, struct _ESource *source, struct _ESourceGroup *group); void calendar_setup_new_calendar (struct _GtkWindow *parent); @@ -41,8 +38,6 @@ void calendar_setup_new_task_list (struct _GtkWindow *parent); void calendar_setup_edit_memo_list (struct _GtkWindow *parent, ESource *source); void calendar_setup_new_memo_list (struct _GtkWindow *parent); -#ifdef __cplusplus -} -#endif +G_END_DECLS #endif /* __CALENDAR_SETUP_H__ */ diff --git a/calendar/gui/e-cal-config.h b/calendar/gui/e-cal-config.h index f9876e7adf..52989aa0e2 100644 --- a/calendar/gui/e-cal-config.h +++ b/calendar/gui/e-cal-config.h @@ -29,10 +29,7 @@ #include #include "e-util/e-config.h" -#ifdef __cplusplus -extern "C" { -#pragma } -#endif +G_BEGIN_DECLS typedef struct _ECalConfig ECalConfig; typedef struct _ECalConfigClass ECalConfigClass; @@ -89,8 +86,6 @@ struct _ECalConfigHookClass { GType e_cal_config_hook_get_type (void); -#ifdef __cplusplus -} -#endif +G_END_DECLS #endif diff --git a/calendar/gui/e-cal-event.h b/calendar/gui/e-cal-event.h index 0802640d2c..8fb28dfd17 100644 --- a/calendar/gui/e-cal-event.h +++ b/calendar/gui/e-cal-event.h @@ -28,10 +28,7 @@ #include "e-util/e-event.h" -#ifdef __cplusplus -extern "C" { -#pragma } -#endif +G_BEGIN_DECLS typedef struct _ECalEvent ECalEvent; typedef struct _ECalEventClass ECalEventClass; @@ -82,8 +79,6 @@ struct _ECalEventHookClass { GType e_cal_event_hook_get_type (void); -#ifdef __cplusplus -} -#endif +G_END_DECLS #endif /* __E_CAL_EVENT_H__ */ diff --git a/calendar/gui/e-cal-menu.h b/calendar/gui/e-cal-menu.h index f1d9f4b729..0667f92051 100644 --- a/calendar/gui/e-cal-menu.h +++ b/calendar/gui/e-cal-menu.h @@ -28,10 +28,7 @@ #include "e-util/e-menu.h" -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS typedef struct _ECalMenu ECalMenu; typedef struct _ECalMenuClass ECalMenuClass; @@ -119,8 +116,6 @@ struct _ECalMenuHookClass { GType e_cal_menu_hook_get_type(void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __E_CAL_MENU_H__ */ diff --git a/calendar/gui/e-cal-popup.h b/calendar/gui/e-cal-popup.h index 9887c66366..ed59ae29e6 100644 --- a/calendar/gui/e-cal-popup.h +++ b/calendar/gui/e-cal-popup.h @@ -29,10 +29,7 @@ #include "e-util/e-popup.h" #include "dialogs/comp-editor.h" -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS typedef struct _ECalPopup ECalPopup; typedef struct _ECalPopupClass ECalPopupClass; @@ -211,8 +208,6 @@ struct _ECalPopupHookClass { GType e_cal_popup_hook_get_type(void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __E_CAL_POPUP_H__ */ diff --git a/calendar/gui/e-day-view-layout.h b/calendar/gui/e-day-view-layout.h index f3d431ca20..36f2e0c52d 100644 --- a/calendar/gui/e-day-view-layout.h +++ b/calendar/gui/e-day-view-layout.h @@ -26,9 +26,7 @@ #include "e-day-view.h" -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS /* I've split these functions away from EDayView so we can use them for printing. */ @@ -51,8 +49,6 @@ gboolean e_day_view_find_long_event_days (EDayViewEvent *event, gint *start_day, gint *end_day); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* _E_DAY_VIEW_LAYOUT_H_ */ diff --git a/calendar/gui/e-day-view-main-item.h b/calendar/gui/e-day-view-main-item.h index c9ce721341..3f28bde608 100644 --- a/calendar/gui/e-day-view-main-item.h +++ b/calendar/gui/e-day-view-main-item.h @@ -25,9 +25,7 @@ #include "e-day-view.h" -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS /* * EDayViewMainItem - canvas item which displays most of the appointment @@ -57,8 +55,6 @@ typedef struct { GType e_day_view_main_item_get_type (void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* _E_DAY_VIEW_MAIN_ITEM_H_ */ diff --git a/calendar/gui/e-day-view-time-item.h b/calendar/gui/e-day-view-time-item.h index 9d7bdcae9f..237b556df6 100644 --- a/calendar/gui/e-day-view-time-item.h +++ b/calendar/gui/e-day-view-time-item.h @@ -26,9 +26,7 @@ #include "e-day-view.h" -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS /* * EDayViewTimeItem - canvas item which displays the times down the left of @@ -71,8 +69,6 @@ GType e_day_view_time_item_get_type (void); gint e_day_view_time_item_get_column_width (EDayViewTimeItem *dvtmitem); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* _E_DAY_VIEW_TIME_ITEM_H_ */ diff --git a/calendar/gui/e-day-view-top-item.h b/calendar/gui/e-day-view-top-item.h index 01a7c44842..61dfdceab8 100644 --- a/calendar/gui/e-day-view-top-item.h +++ b/calendar/gui/e-day-view-top-item.h @@ -26,9 +26,7 @@ #include "e-day-view.h" -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS /* * EDayViewTopItem - displays the top part of the Day/Work Week calendar view. @@ -62,8 +60,6 @@ void e_day_view_top_item_get_day_label (EDayView *day_view, gint day, gchar *buffer, gint buffer_len); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* _E_DAY_VIEW_TOP_ITEM_H_ */ diff --git a/calendar/gui/e-meeting-attendee.h b/calendar/gui/e-meeting-attendee.h index a259de6619..fb7e32edc7 100644 --- a/calendar/gui/e-meeting-attendee.h +++ b/calendar/gui/e-meeting-attendee.h @@ -32,10 +32,7 @@ #include #include "e-meeting-types.h" -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS #define E_TYPE_MEETING_ATTENDEE (e_meeting_attendee_get_type ()) #define E_MEETING_ATTENDEE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_MEETING_ATTENDEE, EMeetingAttendee)) @@ -169,8 +166,6 @@ gboolean e_meeting_attendee_set_end_busy_range (EMeetingAttendee *ia, void e_meeting_attendee_clear_busy_periods (EMeetingAttendee *ia); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* _E_MEETING_ATTENDEE_H_ */ diff --git a/calendar/gui/e-meeting-time-sel-item.h b/calendar/gui/e-meeting-time-sel-item.h index 310eb4c3a0..e9daa3d56a 100644 --- a/calendar/gui/e-meeting-time-sel-item.h +++ b/calendar/gui/e-meeting-time-sel-item.h @@ -33,9 +33,7 @@ #include "e-meeting-time-sel.h" -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define E_MEETING_TIME_SELECTOR_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), e_meeting_time_selector_item_get_type (), EMeetingTimeSelectorItem)) diff --git a/calendar/gui/e-meeting-types.h b/calendar/gui/e-meeting-types.h index bfcdfc5854..49ddaf22e3 100644 --- a/calendar/gui/e-meeting-types.h +++ b/calendar/gui/e-meeting-types.h @@ -31,10 +31,7 @@ #include #include "e-meeting-types.h" -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS @@ -73,8 +70,6 @@ struct _EMeetingFreeBusyPeriod EMeetingFreeBusyType busy_type; }; -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* _E_MEETING_TYPES_H_ */ diff --git a/calendar/gui/e-meeting-utils.h b/calendar/gui/e-meeting-utils.h index c71efec135..cd2e76df38 100644 --- a/calendar/gui/e-meeting-utils.h +++ b/calendar/gui/e-meeting-utils.h @@ -31,19 +31,14 @@ #include #include "e-meeting-types.h" -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS gint e_meeting_time_compare_times (EMeetingTime *time1, EMeetingTime *time2); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* _E_MEETING_UTILS_H_ */ diff --git a/calendar/gui/e-week-view-event-item.h b/calendar/gui/e-week-view-event-item.h index 69d041f046..ebc5d07e07 100644 --- a/calendar/gui/e-week-view-event-item.h +++ b/calendar/gui/e-week-view-event-item.h @@ -26,9 +26,7 @@ #include "e-week-view.h" -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS /* * EWeekViewEventItem - displays the background, times and icons for an event @@ -63,8 +61,6 @@ GType e_week_view_event_item_get_type (void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* _E_WEEK_VIEW_EVENT_ITEM_H_ */ diff --git a/calendar/gui/e-week-view-layout.h b/calendar/gui/e-week-view-layout.h index 0acd41d232..67975b2b20 100644 --- a/calendar/gui/e-week-view-layout.h +++ b/calendar/gui/e-week-view-layout.h @@ -26,9 +26,7 @@ #include "e-week-view.h" -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS /* I've split these functions away from EWeekView so we can use them for printing. */ @@ -63,8 +61,6 @@ gboolean e_week_view_layout_get_span_position (EWeekViewEvent *event, gboolean compress_weekend, gint *span_num_days); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* _E_WEEK_VIEW_LAYOUT_H_ */ diff --git a/calendar/gui/e-week-view-main-item.h b/calendar/gui/e-week-view-main-item.h index 34bdfa2e1f..135a25e662 100644 --- a/calendar/gui/e-week-view-main-item.h +++ b/calendar/gui/e-week-view-main-item.h @@ -26,9 +26,7 @@ #include "e-week-view.h" -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS /* * EWeekViewMainItem - displays the background grid and dates for the Week and @@ -59,8 +57,6 @@ GType e_week_view_main_item_get_type (void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* _E_WEEK_VIEW_MAIN_ITEM_H_ */ diff --git a/calendar/gui/e-week-view-titles-item.h b/calendar/gui/e-week-view-titles-item.h index 0463c95cb0..6ee6cdaa96 100644 --- a/calendar/gui/e-week-view-titles-item.h +++ b/calendar/gui/e-week-view-titles-item.h @@ -26,9 +26,7 @@ #include "e-week-view.h" -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS /* * EWeekViewTitlesItem - displays the 'Monday', 'Tuesday' etc. at the top of @@ -59,8 +57,6 @@ GType e_week_view_titles_item_get_type (void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* _E_WEEK_VIEW_TITLES_ITEM_H_ */ diff --git a/calendar/gui/e-week-view.h b/calendar/gui/e-week-view.h index 605c96b24b..513dae247b 100644 --- a/calendar/gui/e-week-view.h +++ b/calendar/gui/e-week-view.h @@ -29,9 +29,7 @@ #include "e-calendar-view.h" #include "gnome-cal.h" -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS /* * EWeekView - displays the Week & Month views of the calendar. @@ -449,8 +447,6 @@ gboolean e_week_view_is_jump_button_visible (EWeekView *week_view, gint day); void e_week_view_jump_to_button_item (EWeekView *week_view, GnomeCanvasItem *item); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* _E_WEEK_VIEW_H_ */ -- cgit v1.2.3 From 547e123d2777bd3beba36e74e018efb590ed44d4 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 18 Jun 2009 15:26:21 -0400 Subject: Stop abusing forward declarations. --- calendar/gui/dialogs/calendar-setup.c | 18 +++++++++--------- calendar/gui/dialogs/calendar-setup.h | 17 +++++++++-------- calendar/gui/e-cal-popup.h | 23 ++++++++++++----------- calendar/gui/e-calendar-view.h | 4 ++-- calendar/gui/gnome-cal.h | 12 ++++++------ calendar/gui/migration.h | 8 +++----- 6 files changed, 41 insertions(+), 41 deletions(-) (limited to 'calendar') diff --git a/calendar/gui/dialogs/calendar-setup.c b/calendar/gui/dialogs/calendar-setup.c index 32fbc9bd68..de7025fd96 100644 --- a/calendar/gui/dialogs/calendar-setup.c +++ b/calendar/gui/dialogs/calendar-setup.c @@ -211,7 +211,7 @@ name_changed (GtkEntry *entry, ECalConfigTargetSource *t) } static GtkWidget * -eccp_get_source_name (EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data) +eccp_get_source_name (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data) { static GtkWidget *label, *entry; gint row; @@ -252,7 +252,7 @@ offline_status_changed_cb (GtkWidget *widget, CalendarSourceDialog *sdialog) } static GtkWidget * -eccp_general_offline (EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data) +eccp_general_offline (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data) { CalendarSourceDialog *sdialog = data; GtkWidget *offline_setting = NULL; @@ -318,7 +318,7 @@ choose_initial_color (void) } static GtkWidget * -eccp_get_source_color (EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data) +eccp_get_source_color (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data) { CalendarSourceDialog *sdialog = data; static GtkWidget *label, *color_button; @@ -431,7 +431,7 @@ cs_load_sources (CalendarSourceDialog *sdialog, const gchar *conf_key, ESourceGr * Show calendar properties for @source. **/ void -calendar_setup_edit_calendar (struct _GtkWindow *parent, ESource *source, ESourceGroup *group) +calendar_setup_edit_calendar (GtkWindow *parent, ESource *source, ESourceGroup *group) { CalendarSourceDialog *sdialog = g_new0 (CalendarSourceDialog, 1); gchar *xml; @@ -482,13 +482,13 @@ calendar_setup_edit_calendar (struct _GtkWindow *parent, ESource *source, ESourc } void -calendar_setup_new_calendar (struct _GtkWindow *parent) +calendar_setup_new_calendar (GtkWindow *parent) { calendar_setup_edit_calendar (parent, NULL, NULL); } void -calendar_setup_edit_task_list (struct _GtkWindow *parent, ESource *source) +calendar_setup_edit_task_list (GtkWindow *parent, ESource *source) { CalendarSourceDialog *sdialog = g_new0 (CalendarSourceDialog, 1); gchar *xml; @@ -538,13 +538,13 @@ calendar_setup_edit_task_list (struct _GtkWindow *parent, ESource *source) } void -calendar_setup_new_task_list (struct _GtkWindow *parent) +calendar_setup_new_task_list (GtkWindow *parent) { calendar_setup_edit_task_list (parent, NULL); } void -calendar_setup_edit_memo_list (struct _GtkWindow *parent, ESource *source) +calendar_setup_edit_memo_list (GtkWindow *parent, ESource *source) { CalendarSourceDialog *sdialog = g_new0 (CalendarSourceDialog, 1); gchar *xml; @@ -594,7 +594,7 @@ calendar_setup_edit_memo_list (struct _GtkWindow *parent, ESource *source) } void -calendar_setup_new_memo_list (struct _GtkWindow *parent) +calendar_setup_new_memo_list (GtkWindow *parent) { calendar_setup_edit_memo_list (parent, NULL); } diff --git a/calendar/gui/dialogs/calendar-setup.h b/calendar/gui/dialogs/calendar-setup.h index d92993c1a6..18dc042848 100644 --- a/calendar/gui/dialogs/calendar-setup.h +++ b/calendar/gui/dialogs/calendar-setup.h @@ -24,19 +24,20 @@ #ifndef __CALENDAR_SETUP_H__ #define __CALENDAR_SETUP_H__ -struct _GtkWindow; -struct _ESource; +#include +#include +#include G_BEGIN_DECLS -void calendar_setup_edit_calendar (struct _GtkWindow *parent, struct _ESource *source, struct _ESourceGroup *group); -void calendar_setup_new_calendar (struct _GtkWindow *parent); +void calendar_setup_edit_calendar (GtkWindow *parent, ESource *source, ESourceGroup *group); +void calendar_setup_new_calendar (GtkWindow *parent); -void calendar_setup_edit_task_list (struct _GtkWindow *parent, struct _ESource *source); -void calendar_setup_new_task_list (struct _GtkWindow *parent); +void calendar_setup_edit_task_list (GtkWindow *parent, ESource *source); +void calendar_setup_new_task_list (GtkWindow *parent); -void calendar_setup_edit_memo_list (struct _GtkWindow *parent, ESource *source); -void calendar_setup_new_memo_list (struct _GtkWindow *parent); +void calendar_setup_edit_memo_list (GtkWindow *parent, ESource *source); +void calendar_setup_new_memo_list (GtkWindow *parent); G_END_DECLS diff --git a/calendar/gui/e-cal-popup.h b/calendar/gui/e-cal-popup.h index ed59ae29e6..2cd20ebd9d 100644 --- a/calendar/gui/e-cal-popup.h +++ b/calendar/gui/e-cal-popup.h @@ -25,17 +25,14 @@ #define __E_CAL_POPUP_H__ #include +#include -#include "e-util/e-popup.h" +#include #include "dialogs/comp-editor.h" +#include "e-cal-model.h" G_BEGIN_DECLS -typedef struct _ECalPopup ECalPopup; -typedef struct _ECalPopupClass ECalPopupClass; - -struct _ECalendarView; - /** * enum _e_cal_popup_target_t - A list of mail popup target types. * @@ -141,7 +138,7 @@ typedef struct _ECalPopupTargetAttachments ECalPopupTargetAttachments; struct _ECalPopupTargetSelect { EPopupTarget target; - struct _ECalModel *model; + ECalModel *model; GPtrArray *events; }; @@ -156,7 +153,7 @@ struct _ECalPopupTargetSelect { struct _ECalPopupTargetSource { EPopupTarget target; - struct _ESourceSelector *selector; + ESourceSelector *selector; }; /** @@ -175,11 +172,15 @@ struct _ECalPopupTargetAttachments { typedef struct _EPopupItem ECalPopupItem; +typedef struct _ECalPopup ECalPopup; +typedef struct _ECalPopupClass ECalPopupClass; +typedef struct _ECalPopupPrivate ECalPopupPrivate; + /* The object */ struct _ECalPopup { EPopup popup; - struct _ECalPopupPrivate *priv; + ECalPopupPrivate *priv; }; struct _ECalPopupClass { @@ -190,8 +191,8 @@ GType e_cal_popup_get_type(void); ECalPopup *e_cal_popup_new(const gchar *menuid); -ECalPopupTargetSelect *e_cal_popup_target_new_select(ECalPopup *eabp, struct _ECalModel *model, GPtrArray *events); -ECalPopupTargetSource *e_cal_popup_target_new_source(ECalPopup *eabp, struct _ESourceSelector *selector); +ECalPopupTargetSelect *e_cal_popup_target_new_select(ECalPopup *eabp, ECalModel *model, GPtrArray *events); +ECalPopupTargetSource *e_cal_popup_target_new_source(ECalPopup *eabp, ESourceSelector *selector); /* ********************************************************************** */ diff --git a/calendar/gui/e-calendar-view.h b/calendar/gui/e-calendar-view.h index 453ec1ff52..57cc811ae7 100644 --- a/calendar/gui/e-calendar-view.h +++ b/calendar/gui/e-calendar-view.h @@ -171,8 +171,8 @@ void e_calendar_view_modify_and_send (ECalComponent *comp, CalObjModType mod, GtkWindow *toplevel, gboolean new); -void e_calendar_utils_show_error_silent (struct _GtkWidget *widget); -void e_calendar_utils_show_info_silent(struct _GtkWidget *widget); +void e_calendar_utils_show_error_silent (GtkWidget *widget); +void e_calendar_utils_show_info_silent(GtkWidget *widget); gboolean e_calendar_view_get_tooltips (ECalendarViewEventData *data); diff --git a/calendar/gui/gnome-cal.h b/calendar/gui/gnome-cal.h index b0bbc8535b..978bad4c0b 100644 --- a/calendar/gui/gnome-cal.h +++ b/calendar/gui/gnome-cal.h @@ -32,15 +32,15 @@ #include #include #include +#include +#include "e-cal-menu.h" #include "e-calendar-table.h" G_BEGIN_DECLS -struct _EPopup; - #define GNOME_TYPE_CALENDAR (gnome_calendar_get_type ()) #define GNOME_CALENDAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_CALENDAR, GnomeCalendar)) #define GNOME_CALENDAR_CLASS(klass) (G_TYPE_CHECK_INSTANCE_CAST_CLASS ((klass), GNOME_TYPE_CALENDAR, \ @@ -140,14 +140,14 @@ GtkWidget *gnome_calendar_get_search_bar_widget (GnomeCalendar *gcal); GtkWidget *gnome_calendar_get_view_notebook_widget (GnomeCalendar *gcal); GtkWidget *gnome_calendar_get_tag (GnomeCalendar *gcal); -struct _ECalMenu *gnome_calendar_get_taskpad_menu (GnomeCalendar *gcal); -struct _ECalMenu *gnome_calendar_get_calendar_menu (GnomeCalendar *gcal); -struct _ECalMenu *gnome_calendar_get_memopad_menu (GnomeCalendar *gcal); +ECalMenu *gnome_calendar_get_taskpad_menu (GnomeCalendar *gcal); +ECalMenu *gnome_calendar_get_calendar_menu (GnomeCalendar *gcal); +ECalMenu *gnome_calendar_get_memopad_menu (GnomeCalendar *gcal); void gnome_calendar_setup_view_menus (GnomeCalendar *gcal, BonoboUIComponent *uic); void gnome_calendar_discard_view_menus (GnomeCalendar *gcal); -void gnome_calendar_view_popup_factory (GnomeCalendar *gcal, struct _EPopup *ep, const gchar *prefix); +void gnome_calendar_view_popup_factory (GnomeCalendar *gcal, EPopup *ep, const gchar *prefix); void gnome_calendar_set_selected_time_range (GnomeCalendar *gcal, time_t start_time, diff --git a/calendar/gui/migration.h b/calendar/gui/migration.h index d4bb33c448..78bc501599 100644 --- a/calendar/gui/migration.h +++ b/calendar/gui/migration.h @@ -29,9 +29,7 @@ #include "tasks-component.h" #include "memos-component.h" -struct _GError; - -gboolean migrate_calendars (CalendarComponent *component, gint major, gint minor, gint revision, struct _GError **err); -gboolean migrate_tasks (TasksComponent *component, gint major, gint minor, gint revision, struct _GError **err); -gboolean migrate_memos (MemosComponent *component, gint major, gint minor, gint revision, struct _GError **err); +gboolean migrate_calendars (CalendarComponent *component, gint major, gint minor, gint revision, GError **err); +gboolean migrate_tasks (TasksComponent *component, gint major, gint minor, gint revision, GError **err); +gboolean migrate_memos (MemosComponent *component, gint major, gint minor, gint revision, GError **err); #endif -- cgit v1.2.3 From 186370e3a44a90b6761c373e4290213d1e51d1e7 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 19 Jun 2009 16:26:57 +0200 Subject: Bug #513451 - Select Today for calendar views on the first showing --- calendar/gui/gnome-cal.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'calendar') diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c index 458a5c1dc9..1e943eeb14 100644 --- a/calendar/gui/gnome-cal.c +++ b/calendar/gui/gnome-cal.c @@ -628,7 +628,7 @@ gnome_calendar_get_current_view_widget (GnomeCalendar *gcal) } static void -get_times_for_views (GnomeCalendar *gcal, GnomeCalendarViewType view_type, time_t *start_time, time_t *end_time) +get_times_for_views (GnomeCalendar *gcal, GnomeCalendarViewType view_type, time_t *start_time, time_t *end_time, time_t *select_time) { GnomeCalendarPrivate *priv; gint shown, display_start; @@ -697,6 +697,9 @@ get_times_for_views (GnomeCalendar *gcal, GnomeCalendarViewType view_type, time_ *start_time = icaltime_as_timet_with_zone (tt, priv->zone); *end_time = time_add_day_with_zone (*start_time, days_shown, priv->zone); + + if (select_time && E_DAY_VIEW (priv->views[view_type])->selection_start_day == -1) + time (select_time); break; case GNOME_CAL_WEEK_VIEW: /* FIXME We should be using the same day of the week enum every where */ @@ -704,6 +707,9 @@ get_times_for_views (GnomeCalendar *gcal, GnomeCalendarViewType view_type, time_ *start_time = time_week_begin_with_zone (*start_time, display_start, priv->zone); *end_time = time_add_week_with_zone (*start_time, 1, priv->zone); + + if (select_time && E_WEEK_VIEW (priv->views[view_type])->selection_start_day == -1) + time (select_time); break; case GNOME_CAL_MONTH_VIEW: shown = e_week_view_get_weeks_shown (E_WEEK_VIEW (priv->views[view_type])); @@ -714,6 +720,9 @@ get_times_for_views (GnomeCalendar *gcal, GnomeCalendarViewType view_type, time_ *start_time = time_month_begin_with_zone (*start_time, priv->zone); *start_time = time_week_begin_with_zone (*start_time, display_start, priv->zone); *end_time = time_add_week_with_zone (*start_time, shown, priv->zone); + + if (select_time && E_WEEK_VIEW (priv->views[view_type])->selection_start_day == -1) + time (select_time); break; case GNOME_CAL_LIST_VIEW: /* FIXME What to do here? */ @@ -988,7 +997,7 @@ set_search_query (GnomeCalendar *gcal, const gchar *sexp) e_cal_model_set_search_query_with_time_range (e_calendar_view_get_model (priv->views [i]), sexp, start, end); } else { start = priv->base_view_time; - get_times_for_views (gcal, GNOME_CAL_LIST_VIEW, &start, &end); + get_times_for_views (gcal, GNOME_CAL_LIST_VIEW, &start, &end, NULL); e_cal_model_set_search_query_with_time_range (e_calendar_view_get_model (priv->views [i]), sexp, start, end); @@ -2183,19 +2192,22 @@ update_view_times (GnomeCalendar *gcal, time_t start_time) GnomeCalendarPrivate *priv; ECalModel *model; time_t real_start_time = start_time; - time_t end_time; + time_t end_time, select_time = 0; priv = gcal->priv; priv->base_view_time = start_time; model = e_calendar_view_get_model (priv->views [priv->current_view_type]); - get_times_for_views (gcal, priv->current_view_type, &real_start_time, &end_time); + get_times_for_views (gcal, priv->current_view_type, &real_start_time, &end_time, &select_time); if (priv->current_view_type == GNOME_CAL_LIST_VIEW && !priv->lview_select_daten_range) return; e_cal_model_set_time_range (model, real_start_time, end_time); + + if (select_time != 0 && select_time >= real_start_time && select_time <= end_time) + e_calendar_view_set_selected_time_range (priv->views [priv->current_view_type], select_time, select_time); } static void -- cgit v1.2.3 From 619c1cf37efc97be4bad9b028b3e8fbb080aefd4 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 29 Jun 2009 20:15:58 +0200 Subject: Bug #238058 - Show more from summary for events with icons --- calendar/gui/e-day-view-main-item.c | 19 +++++++++++-------- calendar/gui/e-day-view.c | 2 -- 2 files changed, 11 insertions(+), 10 deletions(-) (limited to 'calendar') diff --git a/calendar/gui/e-day-view-main-item.c b/calendar/gui/e-day-view-main-item.c index 6d65dc063f..48830be99f 100644 --- a/calendar/gui/e-day-view-main-item.c +++ b/calendar/gui/e-day-view-main-item.c @@ -1072,8 +1072,7 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem, e_cal_component_get_categories_list (comp, &categories_list); if (num_icons != 0) { - if (item_h >= (E_DAY_VIEW_ICON_HEIGHT + E_DAY_VIEW_ICON_Y_PAD) - * num_icons) { + if (item_h >= (E_DAY_VIEW_ICON_HEIGHT + E_DAY_VIEW_ICON_Y_PAD) * num_icons) { icon_x_inc = 0; icon_y_inc = E_DAY_VIEW_ICON_HEIGHT + E_DAY_VIEW_ICON_Y_PAD; @@ -1083,7 +1082,9 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem, icon_y_inc = 0; } - if (draw_reminder_icon) { + #define fit_in_event() icon_x + icon_x_inc < item_x + item_w && icon_y + icon_y_inc < item_y + item_h + + if (draw_reminder_icon && fit_in_event ()) { max_icon_w = item_x + item_w - icon_x - E_DAY_VIEW_EVENT_BORDER_WIDTH; max_icon_h = item_y + item_h - icon_y @@ -1102,7 +1103,7 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem, icon_y += icon_y_inc; } - if (draw_recurrence_icon) { + if (draw_recurrence_icon && fit_in_event ()) { max_icon_w = item_x + item_w - icon_x - E_DAY_VIEW_EVENT_BORDER_WIDTH; max_icon_h = item_y + item_h - icon_y @@ -1120,7 +1121,7 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem, icon_x += icon_x_inc; icon_y += icon_y_inc; } - if (draw_attach_icon) { + if (draw_attach_icon && fit_in_event ()) { max_icon_w = item_x + item_w - icon_x - E_DAY_VIEW_EVENT_BORDER_WIDTH; max_icon_h = item_y + item_h - icon_y @@ -1137,7 +1138,7 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem, icon_x += icon_x_inc; icon_y += icon_y_inc; } - if (draw_timezone_icon) { + if (draw_timezone_icon && fit_in_event ()) { max_icon_w = item_x + item_w - icon_x - E_DAY_VIEW_EVENT_BORDER_WIDTH; max_icon_h = item_y + item_h - icon_y @@ -1157,7 +1158,7 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem, } - if (draw_meeting_icon) { + if (draw_meeting_icon && fit_in_event ()) { max_icon_w = item_x + item_w - icon_x - E_DAY_VIEW_EVENT_BORDER_WIDTH; max_icon_h = item_y + item_h - icon_y @@ -1173,7 +1174,7 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem, } /* draw categories icons */ - for (elem = categories_list; elem; elem = elem->next) { + for (elem = categories_list; elem && fit_in_event (); elem = elem->next) { gchar *category; GdkPixmap *pixmap = NULL; GdkBitmap *mask = NULL; @@ -1206,6 +1207,8 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem, icon_y += icon_y_inc; } + #undef fit_in_event + gdk_gc_set_clip_mask (gc, NULL); } diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c index 088f544aae..a0ac7098e1 100644 --- a/calendar/gui/e-day-view.c +++ b/calendar/gui/e-day-view.c @@ -4684,8 +4684,6 @@ e_day_view_reshape_day_event (EDayView *day_view, if (num_icons > 0) { if (item_h >= (E_DAY_VIEW_ICON_HEIGHT + E_DAY_VIEW_ICON_Y_PAD) * num_icons) icons_offset = E_DAY_VIEW_ICON_WIDTH + E_DAY_VIEW_ICON_X_PAD * 2; - else - icons_offset = (E_DAY_VIEW_ICON_WIDTH + E_DAY_VIEW_ICON_X_PAD) * num_icons + E_DAY_VIEW_ICON_X_PAD; } if (!event->canvas_item) { -- cgit v1.2.3 From 2d0ca7939abde5a7cfe1dcbb974e52939637e5a9 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 30 Jun 2009 14:54:43 +0200 Subject: Bug #245723 - Show days with transparent events in italic --- calendar/gui/tag-calendar.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'calendar') diff --git a/calendar/gui/tag-calendar.c b/calendar/gui/tag-calendar.c index 272d822a2c..2eddfbfec6 100644 --- a/calendar/gui/tag-calendar.c +++ b/calendar/gui/tag-calendar.c @@ -98,13 +98,18 @@ tag_calendar_cb (ECalComponent *comp, struct calendar_tag_closure *c = data; struct icaltimetype start_tt, end_tt; ECalComponentTransparency transparency; + guint8 style = 0; /* If we are skipping TRANSPARENT events, return if the event is transparent. */ - if (c->skip_transparent_events) { - e_cal_component_get_transparency (comp, &transparency); - if (transparency == E_CAL_COMPONENT_TRANSP_TRANSPARENT) + e_cal_component_get_transparency (comp, &transparency); + if (transparency == E_CAL_COMPONENT_TRANSP_TRANSPARENT) { + if (c->skip_transparent_events) return TRUE; + + style = E_CALENDAR_ITEM_MARK_ITALIC; + } else { + style = E_CALENDAR_ITEM_MARK_BOLD; } start_tt = icaltime_from_timet_with_zone (istart, FALSE, c->zone); @@ -114,7 +119,8 @@ tag_calendar_cb (ECalComponent *comp, start_tt.day, end_tt.year, end_tt.month - 1, end_tt.day, - E_CALENDAR_ITEM_MARK_BOLD); + style, + TRUE); return TRUE; } -- cgit v1.2.3 From 42e75c9162402078ac629740821c3533925ee342 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 30 Jun 2009 17:18:36 -0400 Subject: Use AM_CPPFLAGS instead of INCLUDE in all Makefile.am. --- calendar/common/Makefile.am | 2 +- calendar/conduits/calendar/Makefile.am | 2 +- calendar/conduits/common/Makefile.am | 2 +- calendar/conduits/memo/Makefile.am | 2 +- calendar/conduits/todo/Makefile.am | 2 +- calendar/gui/Makefile.am | 2 +- calendar/gui/alarm-notify/Makefile.am | 2 +- calendar/gui/dialogs/Makefile.am | 2 +- calendar/importers/Makefile.am | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) (limited to 'calendar') diff --git a/calendar/common/Makefile.am b/calendar/common/Makefile.am index b8c5d181fb..af2b8e8a5a 100644 --- a/calendar/common/Makefile.am +++ b/calendar/common/Makefile.am @@ -1,6 +1,6 @@ noinst_LTLIBRARIES = libevolution-calendarprivate.la -INCLUDES = \ +AM_CPPFLAGS = \ -DG_LOG_DOMAIN=\"calendar-gui\" \ -I$(top_builddir)/shell \ -I$(top_srcdir)/shell \ diff --git a/calendar/conduits/calendar/Makefile.am b/calendar/conduits/calendar/Makefile.am index 4a957633e7..c3eca002a3 100644 --- a/calendar/conduits/calendar/Makefile.am +++ b/calendar/conduits/calendar/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir)/e-util \ -I$(top_builddir)/e-util \ -I$(top_srcdir)/widgets/misc \ diff --git a/calendar/conduits/common/Makefile.am b/calendar/conduits/common/Makefile.am index 59e4b5aa1f..457d4eb77d 100644 --- a/calendar/conduits/common/Makefile.am +++ b/calendar/conduits/common/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/e-util \ -I$(top_builddir)/e-util \ diff --git a/calendar/conduits/memo/Makefile.am b/calendar/conduits/memo/Makefile.am index 01a04579f7..b8502cba89 100644 --- a/calendar/conduits/memo/Makefile.am +++ b/calendar/conduits/memo/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir)/e-util \ -I$(top_builddir)/e-util \ -I$(top_srcdir)/widgets/misc \ diff --git a/calendar/conduits/todo/Makefile.am b/calendar/conduits/todo/Makefile.am index 5141393c91..f17535f6de 100644 --- a/calendar/conduits/todo/Makefile.am +++ b/calendar/conduits/todo/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir)/e-util \ -I$(top_builddir)/e-util \ -I$(top_srcdir)/widgets/misc \ diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am index 95576afc33..6b515f442a 100644 --- a/calendar/gui/Makefile.am +++ b/calendar/gui/Makefile.am @@ -38,7 +38,7 @@ search_files = tasktypes.xml memotypes.xml caltypes.xml ruledir = $(privdatadir) rule_DATA = $(search_files) -INCLUDES = \ +AM_CPPFLAGS = \ -DG_LOG_DOMAIN=\"calendar-gui\" \ -I$(top_builddir)/shell \ -I$(top_srcdir)/shell \ diff --git a/calendar/gui/alarm-notify/Makefile.am b/calendar/gui/alarm-notify/Makefile.am index 9b001a0da0..680c5e95e5 100644 --- a/calendar/gui/alarm-notify/Makefile.am +++ b/calendar/gui/alarm-notify/Makefile.am @@ -17,7 +17,7 @@ $(CORBA_GENERATED_C): $(CORBA_GENERATED_H) privlibexec_PROGRAMS = evolution-alarm-notify -INCLUDES = \ +AM_CPPFLAGS = \ -DG_LOG_DOMAIN=\"evolution-alarm-notify\" \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ diff --git a/calendar/gui/dialogs/Makefile.am b/calendar/gui/dialogs/Makefile.am index 8e7a1bf916..a9c752701d 100644 --- a/calendar/gui/dialogs/Makefile.am +++ b/calendar/gui/dialogs/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -DG_LOG_DOMAIN=\"calendar-gui\" \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ diff --git a/calendar/importers/Makefile.am b/calendar/importers/Makefile.am index 16a3fee232..8fa711b035 100644 --- a/calendar/importers/Makefile.am +++ b/calendar/importers/Makefile.am @@ -1,6 +1,6 @@ privsolib_LTLIBRARIES = libevolution-calendar-importers.la -INCLUDES = \ +AM_CPPFLAGS = \ -DEVOLUTION_SOUNDDIR=\""$(soundsdir)"\" \ -DG_LOG_DOMAIN=\"Evolution-Importer\" \ -I$(top_srcdir) \ -- cgit v1.2.3