confirm expunging of the tasks (tasks_control_expunge_cmd): verb callback

2002-01-03  JP Rosevear  <jpr@ximian.com>

	* gui/tasks-control.c (confirm_expunge): confirm expunging of the
	tasks
	(tasks_control_expunge_cmd): verb callback

	* gui/calendar-config.c (config_read): read confirm expunge value
	(calendar_config_write): write confirm expunge value
	(calendar_config_write_on_exit): ditto
	(calendar_config_get_confirm_expunge): get value
	(calendar_config_set_confirm_expunge): set value

	* gui/calendar-config.h: new proto

	* gui/e-itip-control.c (start_calendar_server): kill warning

	* gui/e-tasks.c (e_tasks_init): init query member to NULL
	(set_status_message): util function to set status message
	(e_tasks_open): use above
	(cal_opened_cb): ditto
	(create_sexp): create sexp of items to be deleted
	(query_obj_updated_cb): remove any items found
	(query_eval_error_cb): bail out on error
	(query_query_done_cb): tidy when done
	(e_tasks_delete_completed): set up query

	* gui/e-tasks.h: new proto

	* gui/calendar-model.c (query_query_done_cb): use g_warning
	instead of printing to stderr
	(query_eval_error_cb): ditto
	(update_query): clear the status message if we can't create the
	query

	* gui/tag-calendar.c (resolve_tzid_cb): make this static

svn path=/trunk/; revision=15233

1 files changed, 3 insertions, 2 deletions

diff --git a/calendar/gui/calendar-model.c b/calendar/gui/calendar-model.c
index f2b9d8b428..e8317402ac 100644
--- a/calendar/gui/calendar-model.c
+++ b/calendar/gui/calendar-model.c
@@ -1891,7 +1891,7 @@ query_query_done_cb (CalQuery *query, CalQueryDoneStatus status, const char *err
 	calendar_model_set_status_message (model, NULL);
 
 	if (status != CAL_QUERY_DONE_SUCCESS)
-		fprintf (stderr, "query done: %s\n", error_str);
+		g_warning ("query done: %s\n", error_str);
 }
 
 /* Callback used when an evaluation error occurs when running a query */
@@ -1906,7 +1906,7 @@ query_eval_error_cb (CalQuery *query, const char *error_str, gpointer data)
 
 	calendar_model_set_status_message (model, NULL);
 
-	fprintf (stderr, "eval error: %s\n", error_str);
+	g_warning ("eval error: %s\n", error_str);
 }
 
 /* Builds a complete query sexp for the calendar model by adding the predicates
@@ -1987,6 +1987,7 @@ update_query (CalendarModel *model)
 
 	if (!priv->query) {
 		g_message ("update_query(): Could not create the query");
+		calendar_model_set_status_message (model, NULL);
 		return;
 	}