From 8b42f89e7a3c4391f4937ff983fee89bef127e2d Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Wed, 12 Jun 2019 17:03:50 +0100 Subject: [PATCH] Do not break ABI and cause gnome-software to crash This restores the ABI to the pre-1.4.0 version. This moves the new signal to the *end* of the struct and also correctly decrements the padding. Fixes https://github.com/flatpak/flatpak/issues/2957, although we probably need a 1.4.1 release with this included pretty quickly to avoid chaos. Closes: #2958 Approved by: alexlarsson (cherry picked from commit 4f327649fd6a6347d7ab2c385c924d31676196a8) --- common/flatpak-transaction.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/common/flatpak-transaction.h b/common/flatpak-transaction.h index 9d387ccd..0f4317b3 100644 --- a/common/flatpak-transaction.h +++ b/common/flatpak-transaction.h @@ -114,12 +114,6 @@ struct _FlatpakTransactionClass const char *ref, const char *reason, const char *rebase); - gboolean (*end_of_lifed_with_rebase) (FlatpakTransaction *transaction, - const char *remote, - const char *ref, - const char *reason, - const char *rebased_to_ref, - const char **previous_ids); gboolean (*ready) (FlatpakTransaction *transaction); gboolean (*add_new_remote) (FlatpakTransaction *transaction, @@ -131,8 +125,14 @@ struct _FlatpakTransactionClass gboolean (*run) (FlatpakTransaction *transaction, GCancellable *cancellable, GError **error); + gboolean (*end_of_lifed_with_rebase) (FlatpakTransaction *transaction, + const char *remote, + const char *ref, + const char *reason, + const char *rebased_to_ref, + const char **previous_ids); - gpointer padding[9]; + gpointer padding[8]; }; FLATPAK_EXTERN