diff options
| author | Simon McVittie <smcv@debian.org> | 2021-12-22 19:22:17 +0000 |
|---|---|---|
| committer | Marge Bot <marge-bot@gnome.org> | 2022-09-02 15:21:27 +0000 |
| commit | 4bc58331445a5c5fc0fe80cb97e97c8cbe25ce0b (patch) | |
| tree | 4e3f449465c2335c80e0b083cb362120fdcc2598 /src/wayland | |
| parent | 449327093e56cd70670633799a480783fbbe760c (diff) | |
| download | mutter-4bc58331445a5c5fc0fe80cb97e97c8cbe25ce0b.tar.gz | |
Consistently pass timestamp as uint64 when creating MetaStartupSequence
Passing the wrong type to a varargs function can cause a mismatch
between marshalling and unmarshalling on the stack, particularly on
32-bit architectures. This results in a build-time test failure.
Resolves: https://gitlab.gnome.org/GNOME/mutter/-/issues/2065
Signed-off-by: Simon McVittie <smcv@debian.org>
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2182>
Diffstat (limited to 'src/wayland')
| -rw-r--r-- | src/wayland/meta-wayland-activation.c | 2 | ||||
| -rw-r--r-- | src/wayland/meta-wayland-gtk-shell.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/wayland/meta-wayland-activation.c b/src/wayland/meta-wayland-activation.c index db1f2b10d..89f7ca221 100644 --- a/src/wayland/meta-wayland-activation.c +++ b/src/wayland/meta-wayland-activation.c @@ -149,7 +149,7 @@ token_commit (struct wl_client *client, MetaXdgActivationToken *token = wl_resource_get_user_data (resource); MetaWaylandActivation *activation = token->activation; MetaDisplay *display = meta_get_display (); - uint32_t timestamp; + uint64_t timestamp; if (token->committed) { diff --git a/src/wayland/meta-wayland-gtk-shell.c b/src/wayland/meta-wayland-gtk-shell.c index 3d85c3f88..5fd1d80cf 100644 --- a/src/wayland/meta-wayland-gtk-shell.c +++ b/src/wayland/meta-wayland-gtk-shell.c @@ -535,7 +535,7 @@ gtk_shell_notify_launch (struct wl_client *client, { MetaDisplay *display = meta_get_display (); MetaStartupSequence *sequence; - uint32_t timestamp; + uint64_t timestamp; sequence = meta_startup_notification_lookup_sequence (display->startup_notification, startup_id); |