port modules/ to new EError API.
This should be everything now. https://bugzilla.gnome.org/show_bug.cgi?id=602963
This commit is contained in:
@ -68,7 +68,7 @@ action_address_book_delete_cb (GtkAction *action,
|
||||
source = e_source_selector_peek_primary_selection (selector);
|
||||
g_return_if_fail (source != NULL);
|
||||
|
||||
response = e_error_run (
|
||||
response = e_error_run_dialog_for_args (
|
||||
GTK_WINDOW (shell_window),
|
||||
"addressbook:ask-delete-addressbook",
|
||||
e_source_peek_name (source));
|
||||
@ -84,7 +84,7 @@ action_address_book_delete_cb (GtkAction *action,
|
||||
}
|
||||
|
||||
if (!e_book_remove (book, NULL)) {
|
||||
e_error_run (
|
||||
e_error_run_dialog_for_args (
|
||||
GTK_WINDOW (shell_window),
|
||||
"addressbook:remove-addressbook", NULL);
|
||||
g_object_unref (book);
|
||||
|
||||
@ -119,7 +119,7 @@ cal_shell_sidebar_backend_died_cb (ECalShellSidebar *cal_shell_sidebar,
|
||||
g_hash_table_remove (client_table, uid);
|
||||
cal_shell_sidebar_emit_status_message (cal_shell_sidebar, NULL);
|
||||
|
||||
e_error_run (
|
||||
e_error_run_dialog_for_args (
|
||||
GTK_WINDOW (shell_window),
|
||||
"calendar:calendar-crashed", NULL);
|
||||
|
||||
@ -200,7 +200,7 @@ cal_shell_sidebar_client_opened_cb (ECalShellSidebar *cal_shell_sidebar,
|
||||
break;
|
||||
|
||||
case E_CALENDAR_STATUS_REPOSITORY_OFFLINE:
|
||||
e_error_run (
|
||||
e_error_run_dialog_for_args (
|
||||
GTK_WINDOW (shell_window),
|
||||
"calendar:prompt-no-contents-offline-calendar",
|
||||
NULL);
|
||||
|
||||
@ -87,7 +87,7 @@ action_calendar_delete_cb (GtkAction *action,
|
||||
g_return_if_fail (E_IS_SOURCE (source));
|
||||
|
||||
/* Ask for confirmation. */
|
||||
response = e_error_run (
|
||||
response = e_error_run_dialog_for_args (
|
||||
GTK_WINDOW (shell_window),
|
||||
"calendar:prompt-delete-calendar",
|
||||
e_source_peek_name (source));
|
||||
|
||||
@ -116,7 +116,7 @@ memo_shell_sidebar_backend_died_cb (EMemoShellSidebar *memo_shell_sidebar,
|
||||
g_hash_table_remove (client_table, uid);
|
||||
memo_shell_sidebar_emit_status_message (memo_shell_sidebar, NULL);
|
||||
|
||||
e_error_run (
|
||||
e_error_run_dialog_for_args (
|
||||
GTK_WINDOW (shell_window),
|
||||
"calendar:memos-crashed", NULL);
|
||||
|
||||
@ -197,7 +197,7 @@ memo_shell_sidebar_client_opened_cb (EMemoShellSidebar *memo_shell_sidebar,
|
||||
break;
|
||||
|
||||
case E_CALENDAR_STATUS_REPOSITORY_OFFLINE:
|
||||
e_error_run (
|
||||
e_error_run_dialog_for_args (
|
||||
GTK_WINDOW (shell_window),
|
||||
"calendar:prompt-no-contents-offline-memos",
|
||||
NULL);
|
||||
|
||||
@ -188,7 +188,7 @@ action_memo_list_delete_cb (GtkAction *action,
|
||||
g_return_if_fail (E_IS_SOURCE (source));
|
||||
|
||||
/* Ask for confirmation. */
|
||||
response = e_error_run (
|
||||
response = e_error_run_dialog_for_args (
|
||||
GTK_WINDOW (shell_window),
|
||||
"calendar:prompt-delete-memo-list",
|
||||
e_source_peek_name (source));
|
||||
|
||||
@ -114,7 +114,7 @@ task_shell_sidebar_backend_died_cb (ETaskShellSidebar *task_shell_sidebar,
|
||||
g_hash_table_remove (client_table, uid);
|
||||
task_shell_sidebar_emit_status_message (task_shell_sidebar, NULL);
|
||||
|
||||
e_error_run (
|
||||
e_error_run_dialog_for_args (
|
||||
GTK_WINDOW (shell_window),
|
||||
"calendar:tasks-crashed", NULL);
|
||||
|
||||
@ -195,7 +195,7 @@ task_shell_sidebar_client_opened_cb (ETaskShellSidebar *task_shell_sidebar,
|
||||
break;
|
||||
|
||||
case E_CALENDAR_STATUS_REPOSITORY_OFFLINE:
|
||||
e_error_run (
|
||||
e_error_run_dialog_for_args (
|
||||
GTK_WINDOW (shell_window),
|
||||
"calendar:prompt-no-contents-offline-tasks",
|
||||
NULL);
|
||||
|
||||
@ -219,7 +219,7 @@ action_task_list_delete_cb (GtkAction *action,
|
||||
g_return_if_fail (E_IS_SOURCE (source));
|
||||
|
||||
/* Ask for confirmation. */
|
||||
response = e_error_run (
|
||||
response = e_error_run_dialog_for_args (
|
||||
GTK_WINDOW (shell_window),
|
||||
"calendar:prompt-delete-task-list",
|
||||
e_source_peek_name (source));
|
||||
|
||||
@ -358,7 +358,7 @@ exit:
|
||||
else
|
||||
folder_name = g_strdup (data);
|
||||
|
||||
e_error_run (
|
||||
e_error_run_dialog_for_args (
|
||||
parent, "mail-composer:attach-nomessages",
|
||||
folder_name, camel_exception_get_description (&ex),
|
||||
NULL);
|
||||
|
||||
@ -52,7 +52,7 @@ mail_junk_hook_idle_cb (struct ErrorData *data)
|
||||
{
|
||||
GtkWidget *widget;
|
||||
|
||||
widget = e_error_new (e_shell_get_active_window (NULL),
|
||||
widget = e_error_new_dialog_for_args (e_shell_get_active_window (NULL),
|
||||
data->error_message, data->error->message, NULL);
|
||||
em_utils_show_error_silent (widget);
|
||||
|
||||
|
||||
@ -673,7 +673,7 @@ mail_shell_backend_quit_requested_cb (EShell *shell,
|
||||
if (unsent == 0)
|
||||
return;
|
||||
|
||||
response = e_error_run (e_shell_get_active_window (shell), "mail:exit-unsaved", NULL);
|
||||
response = e_error_run_dialog_for_args (e_shell_get_active_window (shell), "mail:exit-unsaved", NULL);
|
||||
|
||||
if (response == GTK_RESPONSE_YES)
|
||||
return;
|
||||
|
||||
@ -1598,7 +1598,7 @@ em_migrate_folder(EMMigrateSession *session, const gchar *dirname, const gchar *
|
||||
if (errno == EEXIST) {
|
||||
gint save = errno;
|
||||
|
||||
switch (e_error_run (e_shell_get_active_window (NULL), "mail:ask-migrate-existing", src->str, dest->str, NULL)) {
|
||||
switch (e_error_run_dialog_for_args (e_shell_get_active_window (NULL), "mail:ask-migrate-existing", src->str, dest->str, NULL)) {
|
||||
case GTK_RESPONSE_ACCEPT:
|
||||
mode = CP_OVERWRITE;
|
||||
goto retry_copy;
|
||||
|
||||
@ -82,7 +82,7 @@ account_prefs_disable_account_cb (EAccountTreeView *tree_view)
|
||||
parent = gtk_widget_get_toplevel (GTK_WIDGET (tree_view));
|
||||
parent = GTK_WIDGET_TOPLEVEL (parent) ? parent : NULL;
|
||||
|
||||
response = e_error_run (
|
||||
response = e_error_run_dialog_for_args (
|
||||
parent, "mail:ask-delete-proxy-accounts", NULL);
|
||||
|
||||
if (response != GTK_RESPONSE_YES) {
|
||||
@ -201,7 +201,7 @@ account_prefs_delete_account (EAccountManager *manager)
|
||||
has_proxies =
|
||||
e_account_list_account_has_proxies (account_list, account);
|
||||
|
||||
response = e_error_run (
|
||||
response = e_error_run_dialog_for_args (
|
||||
parent, has_proxies ?
|
||||
"mail:ask-delete-account-with-proxies" :
|
||||
"mail:ask-delete-account", NULL);
|
||||
|
||||
Reference in New Issue
Block a user