mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-02-01 11:31:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

Rename FlatpakTransactionError to FlatpakTransactionErrorDetails

Browse Source 
This makes it more obvious that this is not a GError enum
This commit is contained in:
Alexander Larsson
2018-05-29 12:04:59 +02:00
committed by Alexander Larsson
parent bd94fa48ed
commit 89e673ff70
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/flatpak-cli-transaction.c
View File

@@ -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);

6
common/flatpak-transaction.c
View File

@@ -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,

4
common/flatpak-transaction.h
View File

@@ -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,