isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-23 16:34:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Consistently pass timestamp as uint64 when creating MetaStartupSequence

Browse Source 
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>
This commit is contained in:
Simon McVittie 2021-12-22 19:22:17 +00:00 committed by Marge Bot
parent 449327093e
commit 4bc5833144
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/meta-launch-context.c
View File

@ -180,7 +180,7 @@ meta_launch_context_get_startup_notify_id (GAppLaunchContext *launch_context,
"application-id", application_id, "application-id", application_id,
"name", g_app_info_get_name (info), "name", g_app_info_get_name (info),
"workspace", workspace_idx, "workspace", workspace_idx,
"timestamp", context->timestamp, "timestamp", (uint64_t) context->timestamp,
NULL); NULL);
meta_startup_notification_add_sequence (sn, seq); meta_startup_notification_add_sequence (sn, seq);

2
src/wayland/meta-wayland-activation.c
View File

@ -149,7 +149,7 @@ token_commit (struct wl_client *client,
MetaXdgActivationToken *token = wl_resource_get_user_data (resource); MetaXdgActivationToken *token = wl_resource_get_user_data (resource);
MetaWaylandActivation *activation = token->activation; MetaWaylandActivation *activation = token->activation;
MetaDisplay *display = meta_get_display (); MetaDisplay *display = meta_get_display ();
uint32_t timestamp; uint64_t timestamp;
if (token->committed) if (token->committed)
{ {

2
src/wayland/meta-wayland-gtk-shell.c
View File

@ -535,7 +535,7 @@ gtk_shell_notify_launch (struct wl_client *client,
{ {
MetaDisplay *display = meta_get_display (); MetaDisplay *display = meta_get_display ();
MetaStartupSequence *sequence; MetaStartupSequence *sequence;
uint32_t timestamp; uint64_t timestamp;
sequence = meta_startup_notification_lookup_sequence (display->startup_notification, sequence = meta_startup_notification_lookup_sequence (display->startup_notification,
startup_id); startup_id);