diff options
| author | Jonathon Jongsma <jonathon@quotidian.org> | 2009-11-25 06:34:24 +0800 |
|---|---|---|
| committer | Jonathon Jongsma <jonathon@quotidian.org> | 2009-12-01 03:31:19 +0800 |
| commit | 193625ae674a7dfd8a80c0ffeab390e6fcb65856 (patch) | |
| tree | 625e56c715b4c8115cda20bbfdb7dfdcb18ffcd7 /filter/e-rule-editor.c | |
| parent | ae8f6d681c0512089f9259de0fd1b270396991d5 (diff) | |
| download | gsoc2013-evolution-193625ae674a7dfd8a80c0ffeab390e6fcb65856.tar gsoc2013-evolution-193625ae674a7dfd8a80c0ffeab390e6fcb65856.tar.gz gsoc2013-evolution-193625ae674a7dfd8a80c0ffeab390e6fcb65856.tar.bz2 gsoc2013-evolution-193625ae674a7dfd8a80c0ffeab390e6fcb65856.tar.lz gsoc2013-evolution-193625ae674a7dfd8a80c0ffeab390e6fcb65856.tar.xz gsoc2013-evolution-193625ae674a7dfd8a80c0ffeab390e6fcb65856.tar.zst gsoc2013-evolution-193625ae674a7dfd8a80c0ffeab390e6fcb65856.zip | |
port filter/ classes over to new EError API
https://bugzilla.gnome.org/show_bug.cgi?id=602963
Diffstat (limited to 'filter/e-rule-editor.c')
| -rw-r--r-- | filter/e-rule-editor.c | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/filter/e-rule-editor.c b/filter/e-rule-editor.c index fe4c1e1d52..a919fad7d0 100644 --- a/filter/e-rule-editor.c +++ b/filter/e-rule-editor.c @@ -143,13 +143,17 @@ add_editor_response (GtkWidget *dialog, gint button, ERuleEditor *editor) GtkTreeIter iter; if (button == GTK_RESPONSE_OK) { - if (!e_filter_rule_validate (editor->edit, GTK_WINDOW (dialog))) { - /* no need to popup a dialog because the validate code does that. */ + EError *error = NULL; + if (!e_filter_rule_validate (editor->edit, &error)) { + e_error_run_dialog (GTK_WINDOW (dialog), error); + e_error_free (error); return; } if (e_rule_context_find_rule (editor->context, editor->edit->name, editor->edit->source)) { - e_error_run ((GtkWindow *)dialog, "filter:bad-name-notunique", editor->edit->name, NULL); + e_error_run_dialog_for_args ((GtkWindow *)dialog, + "filter:bad-name-notunique", + editor->edit->name, NULL); return; } @@ -287,14 +291,18 @@ edit_editor_response (GtkWidget *dialog, gint button, ERuleEditor *editor) gint pos; if (button == GTK_RESPONSE_OK) { - if (!e_filter_rule_validate (editor->edit, GTK_WINDOW (dialog))) { - /* no need to popup a dialog because the validate code does that. */ + EError *error = NULL; + if (!e_filter_rule_validate (editor->edit, &error)) { + e_error_run_dialog (GTK_WINDOW (dialog), error); + e_error_free (error); return; } rule = e_rule_context_find_rule (editor->context, editor->edit->name, editor->edit->source); if (rule != NULL && rule != editor->current) { - e_error_run ((GtkWindow *)dialog, "filter:bad-name-notunique", rule->name, NULL); + e_error_run_dialog_for_args ((GtkWindow *)dialog, + "filter:bad-name-notunique", + rule->name, NULL); return; } |