callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

s/expunge/purge.

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

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

svn path=/trunk/; revision=21853
This commit is contained in:
Rodrigo Moya
2003-07-17 10:44:01 +00:00
committed by Rodrigo Moya
parent aa13b07254
commit e05eb7f89e
3 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
calendar/ChangeLog
View File

@ -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,

20
calendar/gui/calendar-config.c
View File

@ -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.

20
calendar/gui/tasks-control.c
View File

@ -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);
}