aboutsummaryrefslogtreecommitdiffstats
path: root/mail/em-folder-tree.c
diff options
context:
space:
mode:
authorJonathon Jongsma <jonathon@quotidian.org>2009-12-01 01:34:43 +0800
committerJonathon Jongsma <jonathon@quotidian.org>2009-12-01 03:33:04 +0800
commitc2ee0afbc85ce3ddf38ec07497c0cdae4f42a7fc (patch)
treee6430bf480afc3e4a220fdf713413c8df4a9da41 /mail/em-folder-tree.c
parent495e9bf8001e2209a35e8991c07ec038576efdd4 (diff)
downloadgsoc2013-evolution-c2ee0afbc85ce3ddf38ec07497c0cdae4f42a7fc.tar.gz
gsoc2013-evolution-c2ee0afbc85ce3ddf38ec07497c0cdae4f42a7fc.tar.zst
gsoc2013-evolution-c2ee0afbc85ce3ddf38ec07497c0cdae4f42a7fc.zip
Rename EError to EAlert to match general use better
The EError mechanism is used both for error dialogs as well as basic alerts or user prompts, so we should give it a more general name which matches this use. This patch also cleans up a few includes of e-alert.h (formerly e-error.h) that were not actually being used. https://bugzilla.gnome.org/show_bug.cgi?id=602963
Diffstat (limited to 'mail/em-folder-tree.c')
-rw-r--r--mail/em-folder-tree.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index 9cc15c2bbb..3a8f2dc3d5 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -51,7 +51,7 @@
#include "e-util/e-account-utils.h"
#include "e-util/e-mktemp.h"
#include "e-util/e-icon-factory.h"
-#include "e-util/e-error.h"
+#include "e-util/e-alert.h"
#include "e-util/e-util.h"
#include "em-vfolder-rule.h"
@@ -439,7 +439,7 @@ folder_tree_cell_edited_cb (EMFolderTree *folder_tree,
/* Check for invalid characters. */
if (strchr (new_name, '/') != NULL) {
- e_error_run_dialog_for_args (
+ e_alert_run_dialog_for_args (
parent, "mail:no-rename-folder",
old_name, new_name,
_("Folder names cannot contain '/'"), NULL);
@@ -458,7 +458,7 @@ folder_tree_cell_edited_cb (EMFolderTree *folder_tree,
folder_info = camel_store_get_folder_info (
store, new_full_name, CAMEL_STORE_FOLDER_INFO_FAST, &ex);
if (folder_info != NULL) {
- e_error_run_dialog_for_args (
+ e_alert_run_dialog_for_args (
parent, "mail:no-rename-folder-exists",
old_name, new_name, NULL);
camel_store_free_folder_info (store, folder_info);
@@ -468,7 +468,7 @@ folder_tree_cell_edited_cb (EMFolderTree *folder_tree,
/* XXX This needs to be asynchronous. */
camel_store_rename_folder (store, old_full_name, new_full_name, &ex);
if (camel_exception_is_set (&ex)) {
- e_error_run_dialog_for_args (
+ e_alert_run_dialog_for_args (
parent, "mail:no-rename-folder",
old_full_name, new_full_name, ex.desc, NULL);
goto exit;