diff options
author | Jonathon Jongsma <jonathon@quotidian.org> | 2009-12-01 01:34:43 +0800 |
---|---|---|
committer | Jonathon Jongsma <jonathon@quotidian.org> | 2009-12-01 03:33:04 +0800 |
commit | c2ee0afbc85ce3ddf38ec07497c0cdae4f42a7fc (patch) | |
tree | e6430bf480afc3e4a220fdf713413c8df4a9da41 /filter/e-filter-input.c | |
parent | 495e9bf8001e2209a35e8991c07ec038576efdd4 (diff) | |
download | gsoc2013-evolution-c2ee0afbc85ce3ddf38ec07497c0cdae4f42a7fc.tar gsoc2013-evolution-c2ee0afbc85ce3ddf38ec07497c0cdae4f42a7fc.tar.gz gsoc2013-evolution-c2ee0afbc85ce3ddf38ec07497c0cdae4f42a7fc.tar.bz2 gsoc2013-evolution-c2ee0afbc85ce3ddf38ec07497c0cdae4f42a7fc.tar.lz gsoc2013-evolution-c2ee0afbc85ce3ddf38ec07497c0cdae4f42a7fc.tar.xz 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 'filter/e-filter-input.c')
-rw-r--r-- | filter/e-filter-input.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/filter/e-filter-input.c b/filter/e-filter-input.c index 9166d9272f..f8315d99e3 100644 --- a/filter/e-filter-input.c +++ b/filter/e-filter-input.c @@ -34,7 +34,7 @@ #include <libedataserver/e-sexp.h> -#include "e-util/e-error.h" +#include "e-util/e-alert.h" #include "e-filter-input.h" @@ -70,12 +70,12 @@ filter_input_finalize (GObject *object) static gboolean filter_input_validate (EFilterElement *element, - EError **error) + EAlert **alert) { EFilterInput *input = E_FILTER_INPUT (element); gboolean valid = TRUE; - g_warn_if_fail (error == NULL || *error == NULL); + g_warn_if_fail (alert == NULL || *alert == NULL); if (input->values && !strcmp (input->type, "regex")) { const gchar *pattern; @@ -85,7 +85,7 @@ filter_input_validate (EFilterElement *element, pattern = input->values->data; if ((regerr = regcomp (®expat, pattern, REG_EXTENDED | REG_NEWLINE | REG_ICASE))) { - if (error) { + if (alert) { gsize reglen; gchar *regmsg; @@ -95,7 +95,7 @@ filter_input_validate (EFilterElement *element, regmsg = g_malloc0 (reglen + 1); regerror (regerr, ®expat, regmsg, reglen); - *error = e_error_new ("filter:bad-regexp", + *alert = e_alert_new ("filter:bad-regexp", pattern, regmsg, NULL); g_free (regmsg); } |