From 193625ae674a7dfd8a80c0ffeab390e6fcb65856 Mon Sep 17 00:00:00 2001 From: Jonathon Jongsma Date: Tue, 24 Nov 2009 16:34:24 -0600 Subject: port filter/ classes over to new EError API https://bugzilla.gnome.org/show_bug.cgi?id=602963 --- filter/e-filter-file.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'filter/e-filter-file.c') diff --git a/filter/e-filter-file.c b/filter/e-filter-file.c index 6364475a2e..b518f91f1b 100644 --- a/filter/e-filter-file.c +++ b/filter/e-filter-file.c @@ -65,12 +65,15 @@ filter_file_finalize (GObject *object) static gboolean filter_file_validate (EFilterElement *element, - GtkWindow *error_parent) + EError **error) { EFilterFile *file = E_FILTER_FILE (element); + g_warn_if_fail (error == NULL || *error == NULL); + if (!file->path) { - e_error_run (error_parent, "filter:no-file", NULL); + if (error) + *error = e_error_new ("filter:no-file", NULL); return FALSE; } @@ -78,9 +81,9 @@ filter_file_validate (EFilterElement *element, if (g_strcmp0 (file->type, "file") == 0) { if (!g_file_test (file->path, G_FILE_TEST_IS_REGULAR)) { - e_error_run ( - error_parent, "filter:bad-file", - file->path, NULL); + if (error) + *error = e_error_new ( "filter:bad-file", + file->path, NULL); return FALSE; } } else if (g_strcmp0 (file->type, "command") == 0) { -- cgit v1.2.3