aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/addressbook/addressbook-config.c10
-rw-r--r--modules/addressbook/e-book-shell-view-actions.c10
-rw-r--r--modules/calendar/e-cal-shell-sidebar.c6
-rw-r--r--modules/calendar/e-cal-shell-view-actions.c3
-rw-r--r--modules/calendar/e-cal-shell-view-private.h1
-rw-r--r--modules/calendar/e-memo-shell-sidebar.c6
-rw-r--r--modules/calendar/e-memo-shell-view-actions.c3
-rw-r--r--modules/calendar/e-memo-shell-view-private.h1
-rw-r--r--modules/calendar/e-task-shell-sidebar.c6
-rw-r--r--modules/calendar/e-task-shell-view-actions.c3
-rw-r--r--modules/calendar/e-task-shell-view-private.h1
-rw-r--r--modules/mail/e-mail-attachment-handler.c4
-rw-r--r--modules/mail/e-mail-junk-hook.c4
-rw-r--r--modules/mail/e-mail-shell-backend.c4
-rw-r--r--modules/mail/e-mail-shell-migrate.c4
-rw-r--r--modules/mail/e-mail-shell-view.c1
-rw-r--r--modules/mail/em-account-prefs.c6
-rw-r--r--modules/mail/em-composer-prefs.c1
-rw-r--r--modules/mail/em-network-prefs.c1
19 files changed, 37 insertions, 38 deletions
diff --git a/modules/addressbook/addressbook-config.c b/modules/addressbook/addressbook-config.c
index 10ab0a33e1..11b3eca445 100644
--- a/modules/addressbook/addressbook-config.c
+++ b/modules/addressbook/addressbook-config.c
@@ -45,7 +45,7 @@
#include "addressbook-config.h"
#include "e-util/e-util.h"
-#include "e-util/e-error.h"
+#include "e-util/e-alert.h"
#include "e-util/e-util-private.h"
#include "addressbook/gui/widgets/eab-config.h"
@@ -267,7 +267,7 @@ addressbook_ldap_init (GtkWidget *window, ESource *source)
return NULL;
if (!(ldap = ldap_init (host, port))) {
- e_error_run ((GtkWindow *) window, "addressbook:ldap-init", NULL);
+ e_alert_run_dialog_for_args ((GtkWindow *) window, "addressbook:ldap-init", NULL);
goto done;
}
@@ -290,7 +290,7 @@ addressbook_ldap_auth (GtkWidget *window, LDAP *ldap)
/* XXX use auth info from source */
ldap_error = ldap_simple_bind_s (ldap, NULL, NULL);
if (LDAP_SUCCESS != ldap_error)
- e_error_run ((GtkWindow *) window, "addressbook:ldap-auth", NULL);
+ e_alert_run_dialog_for_args ((GtkWindow *) window, "addressbook:ldap-auth", NULL);
return ldap_error;
}
@@ -310,7 +310,7 @@ addressbook_root_dse_query (AddressbookSourceDialog *dialog, LDAP *ldap,
"(objectclass=*)",
(gchar **) attrs, 0, NULL, NULL, &timeout, LDAP_NO_LIMIT, resp);
if (LDAP_SUCCESS != ldap_error)
- e_error_run (GTK_WINDOW (dialog->window), "addressbook:ldap-search-base", NULL);
+ e_alert_run_dialog_for_args (GTK_WINDOW (dialog->window), "addressbook:ldap-search-base", NULL);
return ldap_error;
}
@@ -342,7 +342,7 @@ do_ldap_root_dse_query (AddressbookSourceDialog *sdialog, GtkListStore *model, E
values = ldap_get_values (ldap, resp, "namingContexts");
if (!values || values[0] == NULL || strlen (values[0]) == 0) {
- e_error_run (GTK_WINDOW (sdialog->window), "addressbook:ldap-search-base", NULL);
+ e_alert_run_dialog_for_args (GTK_WINDOW (sdialog->window), "addressbook:ldap-search-base", NULL);
goto fail;
}
diff --git a/modules/addressbook/e-book-shell-view-actions.c b/modules/addressbook/e-book-shell-view-actions.c
index a12dc7f6de..cf5c615238 100644
--- a/modules/addressbook/e-book-shell-view-actions.c
+++ b/modules/addressbook/e-book-shell-view-actions.c
@@ -21,7 +21,7 @@
#include "e-book-shell-view-private.h"
-#include <e-util/e-error.h>
+#include <e-util/e-alert.h>
#include <e-util/e-util.h>
#include <filter/e-filter-rule.h>
@@ -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_dialog_for_args (
+ response = e_alert_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_dialog_for_args (
+ e_alert_run_dialog_for_args (
GTK_WINDOW (shell_window),
"addressbook:remove-addressbook", NULL);
g_object_unref (book);
@@ -274,7 +274,7 @@ action_address_book_save_as_cb (GtkAction *action,
/* XXX No callback means errors are discarded.
*
- * There's an EError for this which I'm not using
+ * There's an EAlert for this which I'm not using
* until I figure out a better way to display errors:
*
* "addressbook:save-error"
@@ -575,7 +575,7 @@ action_contact_save_as_cb (GtkAction *action,
/* XXX No callback means errors are discarded.
*
- * There an EError for this which I'm not using
+ * There an EAlert for this which I'm not using
* until I figure out a better way to display errors:
*
* "addressbook:save-error"
diff --git a/modules/calendar/e-cal-shell-sidebar.c b/modules/calendar/e-cal-shell-sidebar.c
index af49db3c3b..70ddebf4f9 100644
--- a/modules/calendar/e-cal-shell-sidebar.c
+++ b/modules/calendar/e-cal-shell-sidebar.c
@@ -24,7 +24,7 @@
#include <string.h>
#include <glib/gi18n.h>
-#include "e-util/e-error.h"
+#include "e-util/e-alert.h"
#include "e-util/e-binding.h"
#include "e-util/gconf-bridge.h"
#include "widgets/misc/e-paned.h"
@@ -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_dialog_for_args (
+ e_alert_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_dialog_for_args (
+ e_alert_run_dialog_for_args (
GTK_WINDOW (shell_window),
"calendar:prompt-no-contents-offline-calendar",
NULL);
diff --git a/modules/calendar/e-cal-shell-view-actions.c b/modules/calendar/e-cal-shell-view-actions.c
index f95461419c..c1aebdbc33 100644
--- a/modules/calendar/e-cal-shell-view-actions.c
+++ b/modules/calendar/e-cal-shell-view-actions.c
@@ -19,6 +19,7 @@
*
*/
+#include "e-util/e-alert.h"
#include "e-cal-shell-view-private.h"
/* This is for radio action groups whose value is persistent. We
@@ -87,7 +88,7 @@ action_calendar_delete_cb (GtkAction *action,
g_return_if_fail (E_IS_SOURCE (source));
/* Ask for confirmation. */
- response = e_error_run_dialog_for_args (
+ response = e_alert_run_dialog_for_args (
GTK_WINDOW (shell_window),
"calendar:prompt-delete-calendar",
e_source_peek_name (source));
diff --git a/modules/calendar/e-cal-shell-view-private.h b/modules/calendar/e-cal-shell-view-private.h
index c92fb8cffe..1f9dc17f87 100644
--- a/modules/calendar/e-cal-shell-view-private.h
+++ b/modules/calendar/e-cal-shell-view-private.h
@@ -35,7 +35,6 @@
#include "e-util/e-selection.h"
#include "e-util/e-dialog-utils.h"
#include "e-util/e-file-utils.h"
-#include "e-util/e-error.h"
#include "e-util/e-util.h"
#include "shell/e-shell-utils.h"
#include "widgets/misc/e-popup-action.h"
diff --git a/modules/calendar/e-memo-shell-sidebar.c b/modules/calendar/e-memo-shell-sidebar.c
index 8af86fa4fa..378fe51964 100644
--- a/modules/calendar/e-memo-shell-sidebar.c
+++ b/modules/calendar/e-memo-shell-sidebar.c
@@ -26,7 +26,7 @@
#include <libecal/e-cal.h>
#include "e-util/e-binding.h"
-#include "e-util/e-error.h"
+#include "e-util/e-alert.h"
#include "e-util/e-util.h"
#include "calendar/common/authentication.h"
#include "calendar/gui/calendar-config.h"
@@ -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_dialog_for_args (
+ e_alert_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_dialog_for_args (
+ e_alert_run_dialog_for_args (
GTK_WINDOW (shell_window),
"calendar:prompt-no-contents-offline-memos",
NULL);
diff --git a/modules/calendar/e-memo-shell-view-actions.c b/modules/calendar/e-memo-shell-view-actions.c
index cbf52fd1a2..aa95991c96 100644
--- a/modules/calendar/e-memo-shell-view-actions.c
+++ b/modules/calendar/e-memo-shell-view-actions.c
@@ -19,6 +19,7 @@
*
*/
+#include "e-util/e-alert.h"
#include "e-memo-shell-view-private.h"
static void
@@ -188,7 +189,7 @@ action_memo_list_delete_cb (GtkAction *action,
g_return_if_fail (E_IS_SOURCE (source));
/* Ask for confirmation. */
- response = e_error_run_dialog_for_args (
+ response = e_alert_run_dialog_for_args (
GTK_WINDOW (shell_window),
"calendar:prompt-delete-memo-list",
e_source_peek_name (source));
diff --git a/modules/calendar/e-memo-shell-view-private.h b/modules/calendar/e-memo-shell-view-private.h
index 1818ba0808..ac50d209a4 100644
--- a/modules/calendar/e-memo-shell-view-private.h
+++ b/modules/calendar/e-memo-shell-view-private.h
@@ -32,7 +32,6 @@
#include "e-util/e-binding.h"
#include "e-util/e-dialog-utils.h"
#include "e-util/e-file-utils.h"
-#include "e-util/e-error.h"
#include "e-util/e-util.h"
#include "e-util/gconf-bridge.h"
#include "shell/e-shell-utils.h"
diff --git a/modules/calendar/e-task-shell-sidebar.c b/modules/calendar/e-task-shell-sidebar.c
index 0015028f43..09f8baeb74 100644
--- a/modules/calendar/e-task-shell-sidebar.c
+++ b/modules/calendar/e-task-shell-sidebar.c
@@ -25,7 +25,7 @@
#include <glib/gi18n.h>
#include <libecal/e-cal.h>
-#include "e-util/e-error.h"
+#include "e-util/e-alert.h"
#include "e-util/e-util.h"
#include "calendar/common/authentication.h"
#include "calendar/gui/calendar-config.h"
@@ -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_dialog_for_args (
+ e_alert_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_dialog_for_args (
+ e_alert_run_dialog_for_args (
GTK_WINDOW (shell_window),
"calendar:prompt-no-contents-offline-tasks",
NULL);
diff --git a/modules/calendar/e-task-shell-view-actions.c b/modules/calendar/e-task-shell-view-actions.c
index 0b78b85794..e5d861526d 100644
--- a/modules/calendar/e-task-shell-view-actions.c
+++ b/modules/calendar/e-task-shell-view-actions.c
@@ -19,6 +19,7 @@
*
*/
+#include "e-util/e-alert.h"
#include "e-task-shell-view-private.h"
static void
@@ -219,7 +220,7 @@ action_task_list_delete_cb (GtkAction *action,
g_return_if_fail (E_IS_SOURCE (source));
/* Ask for confirmation. */
- response = e_error_run_dialog_for_args (
+ response = e_alert_run_dialog_for_args (
GTK_WINDOW (shell_window),
"calendar:prompt-delete-task-list",
e_source_peek_name (source));
diff --git a/modules/calendar/e-task-shell-view-private.h b/modules/calendar/e-task-shell-view-private.h
index 4418fd7136..a76403f721 100644
--- a/modules/calendar/e-task-shell-view-private.h
+++ b/modules/calendar/e-task-shell-view-private.h
@@ -33,7 +33,6 @@
#include "e-util/e-binding.h"
#include "e-util/e-dialog-utils.h"
#include "e-util/e-file-utils.h"
-#include "e-util/e-error.h"
#include "e-util/e-util.h"
#include "e-util/gconf-bridge.h"
#include "shell/e-shell-utils.h"
diff --git a/modules/mail/e-mail-attachment-handler.c b/modules/mail/e-mail-attachment-handler.c
index 2cde45083f..a1946c6f68 100644
--- a/modules/mail/e-mail-attachment-handler.c
+++ b/modules/mail/e-mail-attachment-handler.c
@@ -25,7 +25,7 @@
#include <camel/camel-folder.h>
#include <camel/camel-stream-mem.h>
-#include "e-util/e-error.h"
+#include "e-util/e-alert.h"
#include "mail/em-composer-utils.h"
#include "mail/mail-tools.h"
@@ -358,7 +358,7 @@ exit:
else
folder_name = g_strdup (data);
- e_error_run_dialog_for_args (
+ e_alert_run_dialog_for_args (
parent, "mail-composer:attach-nomessages",
folder_name, camel_exception_get_description (&ex),
NULL);
diff --git a/modules/mail/e-mail-junk-hook.c b/modules/mail/e-mail-junk-hook.c
index 6089ffc570..47637eb1d4 100644
--- a/modules/mail/e-mail-junk-hook.c
+++ b/modules/mail/e-mail-junk-hook.c
@@ -24,7 +24,7 @@
#include <glib/gi18n.h>
#include <camel/camel-junk-plugin.h>
-#include "e-util/e-error.h"
+#include "e-util/e-alert.h"
#include "shell/e-shell.h"
#include "mail/em-junk.h"
@@ -52,7 +52,7 @@ mail_junk_hook_idle_cb (struct ErrorData *data)
{
GtkWidget *widget;
- widget = e_error_new_dialog_for_args (e_shell_get_active_window (NULL),
+ widget = e_alert_new_dialog_for_args (e_shell_get_active_window (NULL),
data->error_message, data->error->message, NULL);
em_utils_show_error_silent (widget);
diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c
index c19ab0d336..8dd3caf643 100644
--- a/modules/mail/e-mail-shell-backend.c
+++ b/modules/mail/e-mail-shell-backend.c
@@ -29,7 +29,7 @@
#include "e-util/e-account-utils.h"
#include "e-util/e-binding.h"
-#include "e-util/e-error.h"
+#include "e-util/e-alert.h"
#include "e-util/e-import.h"
#include "e-util/e-util.h"
#include "shell/e-shell.h"
@@ -673,7 +673,7 @@ mail_shell_backend_quit_requested_cb (EShell *shell,
if (unsent == 0)
return;
- response = e_error_run_dialog_for_args (e_shell_get_active_window (shell), "mail:exit-unsaved", NULL);
+ response = e_alert_run_dialog_for_args (e_shell_get_active_window (shell), "mail:exit-unsaved", NULL);
if (response == GTK_RESPONSE_YES)
return;
diff --git a/modules/mail/e-mail-shell-migrate.c b/modules/mail/e-mail-shell-migrate.c
index 2e39c18a62..7231cc8061 100644
--- a/modules/mail/e-mail-shell-migrate.c
+++ b/modules/mail/e-mail-shell-migrate.c
@@ -58,7 +58,7 @@
#include "e-util/e-account-utils.h"
#include "e-util/e-bconf-map.h"
-#include "e-util/e-error.h"
+#include "e-util/e-alert.h"
#include "e-util/e-util-private.h"
#include "e-util/e-plugin.h"
#include "e-util/e-signature-utils.h"
@@ -1598,7 +1598,7 @@ em_migrate_folder(EMMigrateSession *session, const gchar *dirname, const gchar *
if (errno == EEXIST) {
gint save = errno;
- switch (e_error_run_dialog_for_args (e_shell_get_active_window (NULL), "mail:ask-migrate-existing", src->str, dest->str, NULL)) {
+ switch (e_alert_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;
diff --git a/modules/mail/e-mail-shell-view.c b/modules/mail/e-mail-shell-view.c
index 895bd33903..c18b3e68b0 100644
--- a/modules/mail/e-mail-shell-view.c
+++ b/modules/mail/e-mail-shell-view.c
@@ -20,6 +20,7 @@
*/
#include "e-mail-shell-view-private.h"
+#include "filter/e-filter-input.h"
static gpointer parent_class;
static GType mail_shell_view_type;
diff --git a/modules/mail/em-account-prefs.c b/modules/mail/em-account-prefs.c
index d0cc34f608..81ce907e18 100644
--- a/modules/mail/em-account-prefs.c
+++ b/modules/mail/em-account-prefs.c
@@ -34,7 +34,7 @@
#include <glib/gi18n.h>
-#include "e-util/e-error.h"
+#include "e-util/e-alert.h"
#include "e-mail-store.h"
#include "em-config.h"
@@ -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_dialog_for_args (
+ response = e_alert_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_dialog_for_args (
+ response = e_alert_run_dialog_for_args (
parent, has_proxies ?
"mail:ask-delete-account-with-proxies" :
"mail:ask-delete-account", NULL);
diff --git a/modules/mail/em-composer-prefs.c b/modules/mail/em-composer-prefs.c
index 57ce4dd4c8..ba7e2296c9 100644
--- a/modules/mail/em-composer-prefs.c
+++ b/modules/mail/em-composer-prefs.c
@@ -48,7 +48,6 @@
#include <editor/gtkhtml-spell-language.h>
#include "e-util/e-util.h"
-#include "e-util/e-error.h"
#include "e-util/e-util-private.h"
#include "widgets/misc/e-charset-combo-box.h"
#include "widgets/misc/e-signature-editor.h"
diff --git a/modules/mail/em-network-prefs.c b/modules/mail/em-network-prefs.c
index baed9ca948..6b419d0c2e 100644
--- a/modules/mail/em-network-prefs.c
+++ b/modules/mail/em-network-prefs.c
@@ -38,7 +38,6 @@
#include <glib/gstdio.h>
#include "e-util/e-util.h"
-#include "e-util/e-error.h"
#include "e-util/e-util-private.h"
#include "mail-config.h"
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 02:20:14 +0800