summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Hughes <richard@hughsie.com>2019-06-12 17:03:50 +0100
committerRichard Hughes <richard@hughsie.com>2019-06-12 17:03:52 +0100
commitb285c8cbecac4fb84bed2a16949eb5013f99a04a (patch)
tree945a01a64d1dc5f35a7e244edd9bebcfcb721528
parent1029f2b1d05bf96eb6083b5879c31997fd1d53be (diff)
downloadflatpak-wip/hughsie/do-not-break-abi.tar.gz
Do not break ABI and cause gnome-software to crashwip/hughsie/do-not-break-abi
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.
-rw-r--r--common/flatpak-transaction.h14
1 files 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