s/expunge/purge.

2003-07-17  Rodrigo Moya <rodrigo@ximian.com>

	* gui/calendar-config.[ch]:
	* gui/tasks-control.c: s/expunge/purge.

svn path=/trunk/; revision=21853

3 files changed, 25 insertions, 20 deletions

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index aa4a22411f..3994474253 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-17  Rodrigo Moya <rodrigo@ximian.com>
+
+	* gui/calendar-config.[ch]:
+	* gui/tasks-control.c: s/expunge/purge.
+
 2003-07-16  Rodrigo Moya <rodrigo@ximian.com>
 
 	* gui/gnome-cal.[ch] (gnome_calendar_purge): new function,
diff --git a/calendar/gui/calendar-config.c b/calendar/gui/calendar-config.c
index 83cd5650c5..84f334beff 100644
--- a/calendar/gui/calendar-config.c
+++ b/calendar/gui/calendar-config.c
@@ -499,30 +499,30 @@ calendar_config_set_confirm_delete (gboolean confirm)
 }
 
 /**
- * calendar_config_get_confirm_expunge:
+ * calendar_config_get_confirm_purge:
  *
  * Queries the configuration value for whether a confirmation dialog is
- * presented when expunging calendar/tasks items.
+ * presented when purging calendar/tasks items.
  *
- * Return value: Whether confirmation is required when expunging items.
+ * Return value: Whether confirmation is required when purging items.
  **/
 gboolean
-calendar_config_get_confirm_expunge (void)
+calendar_config_get_confirm_purge (void)
 {
-	return e_config_listener_get_boolean_with_default (config, "/apps/evolution/calendar/prompts/confirm_expunge", TRUE, NULL);
+	return e_config_listener_get_boolean_with_default (config, "/apps/evolution/calendar/prompts/confirm_purge", TRUE, NULL);
 }
 
 /**
- * calendar_config_set_confirm_expunge:
- * @confirm: Whether confirmation is required when expunging items.
+ * calendar_config_set_confirm_purge:
+ * @confirm: Whether confirmation is required when purging items.
  *
  * Sets the configuration value for whether a confirmation dialog is presented
- * when expunging calendar/tasks items.
+ * when purging calendar/tasks items.
  **/
 void
-calendar_config_set_confirm_expunge (gboolean confirm)
+calendar_config_set_confirm_purge (gboolean confirm)
 {
-	e_config_listener_set_boolean (config, "/apps/evolution/calendar/prompts/confirm_expunge", confirm);
+	e_config_listener_set_boolean (config, "/apps/evolution/calendar/prompts/confirm_purge", confirm);
 }
 
 /* This sets all the common config settings for an ECalendar widget.
diff --git a/calendar/gui/tasks-control.c b/calendar/gui/tasks-control.c
index ebd5834f34..7430adf61c 100644
--- a/calendar/gui/tasks-control.c
+++ b/calendar/gui/tasks-control.c
@@ -93,7 +93,7 @@ static void tasks_control_delete_cmd		(BonoboUIComponent	*uic,
 static void tasks_control_complete_cmd		(BonoboUIComponent	*uic,
 						 gpointer		 data,
 						 const char		*path);
-static void tasks_control_expunge_cmd		(BonoboUIComponent	*uic,
+static void tasks_control_purge_cmd		(BonoboUIComponent	*uic,
 						 gpointer		 data,
 						 const char		*path);
 static void tasks_control_print_cmd		(BonoboUIComponent	*uic,
@@ -257,7 +257,7 @@ sensitize_commands (ETasks *tasks, BonoboControl *control, int n_selected)
 	bonobo_ui_component_set_prop (uic, "/commands/TasksMarkComplete", "sensitive",
 				      n_selected == 0 || read_only ? "0" : "1",
 				      NULL);
-	bonobo_ui_component_set_prop (uic, "/commands/TasksExpunge", "sensitive",
+	bonobo_ui_component_set_prop (uic, "/commands/TasksPurge", "sensitive",
 				      read_only ? "0" : "1",
 				      NULL);
 }
@@ -280,7 +280,7 @@ static BonoboUIVerb verbs [] = {
 	BONOBO_UI_VERB ("TasksPaste", tasks_control_paste_cmd),
 	BONOBO_UI_VERB ("TasksDelete", tasks_control_delete_cmd),
 	BONOBO_UI_VERB ("TasksMarkComplete", tasks_control_complete_cmd),
-	BONOBO_UI_VERB ("TasksExpunge", tasks_control_expunge_cmd),
+	BONOBO_UI_VERB ("TasksPurge", tasks_control_purge_cmd),
 	BONOBO_UI_VERB ("TasksPrint", tasks_control_print_cmd),
 	BONOBO_UI_VERB ("TasksPrintPreview", tasks_control_print_preview_cmd),
 
@@ -431,12 +431,12 @@ tasks_control_complete_cmd		(BonoboUIComponent	*uic,
 }
 
 static gboolean
-confirm_expunge (ETasks *tasks)
+confirm_purge (ETasks *tasks)
 {
 	GtkWidget *dialog, *label, *checkbox, *parent;
 	int button;
 	
-	if (!calendar_config_get_confirm_expunge ())
+	if (!calendar_config_get_confirm_purge ())
 		return TRUE;
 
 	parent = gtk_widget_get_toplevel (GTK_WIDGET (tasks));
@@ -454,22 +454,22 @@ confirm_expunge (ETasks *tasks)
 	
 	button = gtk_dialog_run (GTK_DIALOG (dialog));	
 	if (button == GTK_RESPONSE_YES && gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbox)))
-		calendar_config_set_confirm_expunge (FALSE);
+		calendar_config_set_confirm_purge (FALSE);
 	gtk_widget_destroy (dialog);
 	
 	return button == GTK_RESPONSE_YES ? TRUE : FALSE;
 }
 
 static void
-tasks_control_expunge_cmd		(BonoboUIComponent	*uic,
-					 gpointer		 data,
-					 const char		*path)
+tasks_control_purge_cmd	(BonoboUIComponent	*uic,
+			 gpointer		 data,
+			 const char		*path)
 {
 	ETasks *tasks;
 
 	tasks = E_TASKS (data);
 	
-	if (confirm_expunge (tasks))
+	if (confirm_purge (tasks))
 	    e_tasks_delete_completed (tasks);
 }