diff --git a/app/flatpak-cli-transaction.c b/app/flatpak-cli-transaction.c index d19cad76..47cfa3df 100644 --- a/app/flatpak-cli-transaction.c +++ b/app/flatpak-cli-transaction.c @@ -236,7 +236,7 @@ operation_error (FlatpakTransaction *transaction, const char *remote, FlatpakTransactionOperationType operation_type, GError *error, - FlatpakTransactionError detail, + FlatpakTransactionErrorDetails detail, gpointer data) { FlatpakCliTransaction *cli = data; @@ -252,7 +252,7 @@ operation_error (FlatpakTransaction *transaction, return TRUE; } - if (detail & FLATPAK_TRANSACTION_ERROR_NON_FATAL) + if (detail & FLATPAK_TRANSACTION_ERROR_DETAILS_NON_FATAL) { g_printerr (_("Warning: Failed to %s %s: %s\n"), op_type_to_string (operation_type), pref, error->message); diff --git a/common/flatpak-transaction.c b/common/flatpak-transaction.c index a6e98ad6..6329bf57 100644 --- a/common/flatpak-transaction.c +++ b/common/flatpak-transaction.c @@ -372,7 +372,7 @@ flatpak_transaction_class_init (FlatpakTransactionClass *klass) * @remote: The remote * @operation_type: A #FlatpakTransactionOperationType specifying operation type * @error: A #GError - * @details: A #FlatpakTransactionError with Details about the error + * @details: A #FlatpakTransactionErrorDetails with Details about the error * * Returns: the %TRUE to contine transaction, %FALSE to stop */ @@ -1191,12 +1191,12 @@ flatpak_transaction_run (FlatpakTransaction *self, if (!res) { gboolean do_cont = FALSE; - FlatpakTransactionError error_details = 0; + FlatpakTransactionErrorDetails error_details = 0; op->failed = TRUE; if (op->non_fatal) - error_details |= FLATPAK_TRANSACTION_ERROR_NON_FATAL; + error_details |= FLATPAK_TRANSACTION_ERROR_DETAILS_NON_FATAL; g_signal_emit (self, signals[OPERATION_ERROR], 0, op->ref, diff --git a/common/flatpak-transaction.h b/common/flatpak-transaction.h index 0443a9f9..395557a9 100644 --- a/common/flatpak-transaction.h +++ b/common/flatpak-transaction.h @@ -33,8 +33,8 @@ typedef enum { } FlatpakTransactionOperationType; typedef enum { - FLATPAK_TRANSACTION_ERROR_NON_FATAL = 1 << 0, -} FlatpakTransactionError; + FLATPAK_TRANSACTION_ERROR_DETAILS_NON_FATAL = 1 << 0, +} FlatpakTransactionErrorDetails; typedef enum { FLATPAK_TRANSACTION_RESULT_NO_CHANGE = 1 << 0,