diff options
author | Benjamin Otte <otte@redhat.com> | 2022-11-23 23:35:11 +0100 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2022-12-24 07:56:57 -0500 |
commit | 977fedfdf1e15bdfb90423e52d07eb1babcf5d6d (patch) | |
tree | 780110377467a58c16de3ee2afe81b7f3d69484a | |
parent | 8957302bd4841b75772214d4e6ea32090733cb35 (diff) | |
download | gtk+-977fedfdf1e15bdfb90423e52d07eb1babcf5d6d.tar.gz |
dialog: GTK_DIALOG_ERROR_ABORTED => GTK_DIALOG_ERROR_CANCELLED
This is done via the GCancellable, so let's call it cancelling.
-rw-r--r-- | gtk/gopenuriportal.c | 8 | ||||
-rw-r--r-- | gtk/gtkalertdialog.c | 6 | ||||
-rw-r--r-- | gtk/gtkcolordialog.c | 2 | ||||
-rw-r--r-- | gtk/gtkdialogerror.h | 6 | ||||
-rw-r--r-- | gtk/gtkfiledialog.c | 2 | ||||
-rw-r--r-- | gtk/gtkfontdialog.c | 2 |
6 files changed, 15 insertions, 11 deletions
diff --git a/gtk/gopenuriportal.c b/gtk/gopenuriportal.c index 8a2ac1db6b..b90771c51c 100644 --- a/gtk/gopenuriportal.c +++ b/gtk/gopenuriportal.c @@ -252,8 +252,8 @@ canceled (GCancellable *cancellable, send_close (data); g_task_return_new_error (task, - GTK_DIALOG_ERROR, GTK_DIALOG_ERROR_ABORTED, - "The OpenURI portal call was cancelled programmatically"); + GTK_DIALOG_ERROR, GTK_DIALOG_ERROR_CANCELLED, + "The OpenURI portal call was cancelled by the application"); g_object_unref (task); } @@ -390,8 +390,8 @@ open_uri_done (GObject *source, { g_error_free (error); g_task_return_new_error (data->task, - GTK_DIALOG_ERROR, GTK_DIALOG_ERROR_ABORTED, - "The operation was aborted programmatically"); + GTK_DIALOG_ERROR, GTK_DIALOG_ERROR_CANCELLED, + "The operation was cancelled by the application"); } else g_task_return_error (data->task, error); diff --git a/gtk/gtkalertdialog.c b/gtk/gtkalertdialog.c index ee40bcf1ee..645ab6d829 100644 --- a/gtk/gtkalertdialog.c +++ b/gtk/gtkalertdialog.c @@ -606,7 +606,11 @@ response_cb (GTask *task, if (cancellable) g_signal_handlers_disconnect_by_func (cancellable, cancelled_cb, task); - if (response >= 0) + if (response == GTK_RESPONSE_CLOSE) + { + g_task_return_new_error (task, GTK_DIALOG_ERROR, GTK_DIALOG_ERROR_CANCELLED, "Cancelled by application"); + } + else if (response >= 0) { g_task_return_int (task, response); } diff --git a/gtk/gtkcolordialog.c b/gtk/gtkcolordialog.c index e5ebe9d978..d93c68ad3f 100644 --- a/gtk/gtkcolordialog.c +++ b/gtk/gtkcolordialog.c @@ -387,7 +387,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS g_task_return_pointer (task, gdk_rgba_copy (&color), (GDestroyNotify) gdk_rgba_free); } else if (response == GTK_RESPONSE_CLOSE) - g_task_return_new_error (task, GTK_DIALOG_ERROR, GTK_DIALOG_ERROR_ABORTED, "Aborted by application"); + g_task_return_new_error (task, GTK_DIALOG_ERROR, GTK_DIALOG_ERROR_CANCELLED, "Cancelled by application"); else if (response == GTK_RESPONSE_CANCEL || response == GTK_RESPONSE_DELETE_EVENT) g_task_return_new_error (task, GTK_DIALOG_ERROR, GTK_DIALOG_ERROR_DISMISSED, "Dismissed by user"); diff --git a/gtk/gtkdialogerror.h b/gtk/gtkdialogerror.h index 809d00e538..9344d62937 100644 --- a/gtk/gtkdialogerror.h +++ b/gtk/gtkdialogerror.h @@ -39,8 +39,8 @@ G_BEGIN_DECLS * GtkDialogError: * @GTK_DIALOG_ERROR_FAILED: Generic error condition for when * an operation fails and no more specific code is applicable - * @GTK_DIALOG_ERROR_ABORTED: The async function call was aborted - * programmatically (via its `GCancellable`) + * @GTK_DIALOG_ERROR_CANCELLED: The async function call was cancelled + * via its `GCancellable` * @GTK_DIALOG_ERROR_DISMISSED: The operation was cancelled * by the user (via a Cancel or Close button) * @@ -52,7 +52,7 @@ G_BEGIN_DECLS typedef enum { GTK_DIALOG_ERROR_FAILED, - GTK_DIALOG_ERROR_ABORTED, + GTK_DIALOG_ERROR_CANCELLED, GTK_DIALOG_ERROR_DISMISSED } GtkDialogError; diff --git a/gtk/gtkfiledialog.c b/gtk/gtkfiledialog.c index a5a42b379d..cf54c8273b 100644 --- a/gtk/gtkfiledialog.c +++ b/gtk/gtkfiledialog.c @@ -652,7 +652,7 @@ G_GNUC_BEGIN_IGNORE_DEPRECATIONS G_GNUC_END_IGNORE_DEPRECATIONS } else if (response == GTK_RESPONSE_CLOSE) - g_task_return_new_error (task, GTK_DIALOG_ERROR, GTK_DIALOG_ERROR_ABORTED, "Aborted by application"); + g_task_return_new_error (task, GTK_DIALOG_ERROR, GTK_DIALOG_ERROR_CANCELLED, "Cancelled by application"); else if (response == GTK_RESPONSE_CANCEL || response == GTK_RESPONSE_DELETE_EVENT) g_task_return_new_error (task, GTK_DIALOG_ERROR, GTK_DIALOG_ERROR_DISMISSED, "Dismissed by user"); diff --git a/gtk/gtkfontdialog.c b/gtk/gtkfontdialog.c index 39e068cec2..fdf6b23107 100644 --- a/gtk/gtkfontdialog.c +++ b/gtk/gtkfontdialog.c @@ -561,7 +561,7 @@ response_cb (GTask *task, } } else if (response == GTK_RESPONSE_CLOSE) - g_task_return_new_error (task, GTK_DIALOG_ERROR, GTK_DIALOG_ERROR_ABORTED, "Aborted by application"); + g_task_return_new_error (task, GTK_DIALOG_ERROR, GTK_DIALOG_ERROR_CANCELLED, "Cancelled by application"); else if (response == GTK_RESPONSE_CANCEL) g_task_return_new_error (task, GTK_DIALOG_ERROR, GTK_DIALOG_ERROR_DISMISSED, "Dismissed by user"); else |