diff options
| -rw-r--r-- | calendar/ChangeLog | 8 | ||||
| -rw-r--r-- | calendar/gui/e-cal-model.c | 4 | ||||
| -rw-r--r-- | calendar/gui/e-tasks.c | 8 |
3 files changed, 17 insertions, 3 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 47571ac91a..0df976024d 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,11 @@ +2004-03-15 JP Rosevear <jpr@ximian.com> + + * gui/e-tasks.c (search_bar_sexp_changed_cb): set the search query + (e_tasks_init): set the query to be #t by default + + * gui/e-cal-model.c (redo_queries): use the search query if there + is one (and no time is set), make sure to dup the #f + 2004-03-15 JP Rosevear <jpr@ximian.com> * gui/dialogs/comp-editor-page.c (comp_editor_page_fill_widgets): diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c index 2cf8638f9f..d2ae13f9dc 100644 --- a/calendar/gui/e-cal-model.c +++ b/calendar/gui/e-cal-model.c @@ -1469,8 +1469,10 @@ redo_queries (ECalModel *model) " %s)", iso_start, iso_end, priv->search_sexp ? priv->search_sexp : ""); + } else if (priv->search_sexp) { + priv->full_sexp = g_strdup (priv->search_sexp); } else { - priv->full_sexp = ("#f"); + priv->full_sexp = g_strdup ("#f"); } /* clean up the current contents */ diff --git a/calendar/gui/e-tasks.c b/calendar/gui/e-tasks.c index ea3e9dd12e..a5f70f3b6f 100644 --- a/calendar/gui/e-tasks.c +++ b/calendar/gui/e-tasks.c @@ -382,7 +382,7 @@ search_bar_sexp_changed_cb (CalSearchBar *cal_search, const char *sexp, gpointer priv = tasks->priv; model = e_calendar_table_get_model (E_CALENDAR_TABLE (priv->tasks_view)); - e_cal_model_set_query (model, sexp); + e_cal_model_set_search_query (model, sexp); } /* Callback used when the selected category in the search bar changes */ @@ -642,7 +642,8 @@ static void e_tasks_init (ETasks *tasks) { ETasksPrivate *priv; - + ECalModel *model; + priv = g_new0 (ETasksPrivate, 1); tasks->priv = priv; @@ -654,6 +655,9 @@ e_tasks_init (ETasks *tasks) priv->view_instance = NULL; priv->view_menus = NULL; priv->current_uid = NULL; + + model = e_calendar_table_get_model (E_CALENDAR_TABLE (priv->tasks_view)); + e_cal_model_set_search_query (model, "#t"); } /* Callback used when the set of categories changes in the calendar client */ |