From 3b562b0b9f81cdd6cedea7c7c53272a98568e63a Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Thu, 12 Apr 2001 16:29:56 +0000 Subject: New function to restart a query for the day view. (query_obj_updated_cb): 2001-04-12 Federico Mena Quintero * gui/e-day-view.c (update_query): New function to restart a query for the day view. (query_obj_updated_cb): Renamed from obj_updated_cb(); updated for queries instead of calendar clients. (query_obj_removed_cb): Likewise. (cal_opened_cb): Just update_query() instead of queueing reloading all the events. (e_day_view_set_cal_client): Likewise. (e_day_view_set_query): Likewise. (e_day_view_set_selected_time_range): Likewise. (e_day_view_set_days_shown): Likewise. (e_day_view_recalc_work_week): Likewise. (e_day_view_queue_reload_events): Removed function now that events are updated entirely by the query. (e_day_view_reload_events_idle_cb): Likewise. (e_day_view_reload_events): Likewise. (e_day_view_init): Use a pretty arrow instead of GDK_TOP_LEFT_ARROW. * gui/e-week-view.c: Analogous changes to the ones in e-day-view.c. (e_week_view_init): Use a pretty arrow instead of GDK_TOP_LEFT_ARROW. * cal-util/timeutil.c (isodate_from_time_t): Return a g_strdup()ed version of the string instead of a pointer to a static buffer. (time_from_isodate): Resurrected function. Polished up to our current standards of paranoia. * pcs/query.c (func_time_now): New function (time-now). (func_make_time): New function (make-time ISODATE). (func_time_add_day): New function (time-add-day TIME N). (func_time_day_begin): New function (time-day-begin TIME). (func_time_day_end): New function (time-day-end TIME). (func_occur_in_time_range): Use time_t values instead of ints. (match_component): Free the stringized component. Free the ESexp result value. * gui/e-day-view.h: Removed a couple of unused prototypes. * pcs/query.c (query_destroy): Oops, disconnect from the backend. * pcs/cal.c (Cal_get_query): Duplicate the query reference before we return it. * gui/calendar-commands.c (pixmaps): Fixed paths to image files. svn path=/trunk/; revision=9266 --- calendar/gui/e-day-view.h | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) (limited to 'calendar/gui/e-day-view.h') diff --git a/calendar/gui/e-day-view.h b/calendar/gui/e-day-view.h index 2379a76b87..18f8187951 100644 --- a/calendar/gui/e-day-view.h +++ b/calendar/gui/e-day-view.h @@ -235,6 +235,10 @@ struct _EDayView /* Calendar client object we are monitoring */ CalClient *client; + /* S-expression for query and the query object */ + char *sexp; + CalQuery *query; + /* The start and end of the days shown. */ time_t lower; time_t upper; @@ -270,9 +274,6 @@ struct _EDayView gboolean long_events_need_reshape; gboolean need_reshape[E_DAY_VIEW_MAX_DAYS]; - /* The id of our idle function to reload all events. */ - gint reload_events_idle_id; - /* The number of minutes per row. 5, 10, 15, 30 or 60. */ gint mins_per_row; @@ -488,6 +489,9 @@ void e_day_view_set_calendar (EDayView *day_view, void e_day_view_set_cal_client (EDayView *day_view, CalClient *client); +void e_day_view_set_query (EDayView *day_view, + const char *sexp); + /* This sets the selected time range. The EDayView will show the day or week corresponding to the start time. If the start_time & end_time are not equal and are both visible in the view, then the selection is set to those times, @@ -501,16 +505,6 @@ void e_day_view_get_selected_time_range (EDayView *day_view, time_t *start_time, time_t *end_time); -/* This is called when one event has been added or updated. */ -void e_day_view_update_event (EDayView *day_view, - const gchar *uid); - -/* This removes all the events associated with the given uid. Note that for - recurring events there may be more than one. If any events are found and - removed we need to layout the events again. */ -void e_day_view_remove_event (EDayView *day_view, - const gchar *uid); - /* Whether we are displaying a work-week, in which case the display always starts on the first day of the working week. */ gboolean e_day_view_get_work_week_view (EDayView *day_view); -- cgit v1.2.3