luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-01 23:13:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'activation-token' into 'main'

Browse Source 
gdesktopappinfo: Set XDG_ACTIVATION_TOKEN/activation-token startup ID key

Closes #2709

See merge request GNOME/glib!3090
This commit is contained in:
Philip Withnall
2022-12-19 13:05:57 +00:00
parent 953f4fc25f 627f2738e0
commit d3a26bb4de
4 changed files with 39 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gio/gdesktopappinfo.c
View File

@@ -2911,7 +2911,10 @@ g_desktop_app_info_launch_uris_with_spawn (GDesktopAppInfo *info,
G_APP_INFO (info),
launched_files);
if (sn_id)
envp = g_environ_setenv (envp, "DESKTOP_STARTUP_ID", sn_id, TRUE);
{
envp = g_environ_setenv (envp, "DESKTOP_STARTUP_ID", sn_id, TRUE);
envp = g_environ_setenv (envp, "XDG_ACTIVATION_TOKEN", sn_id, TRUE);
}
}
g_list_free_full (launched_files, g_object_unref);
@@ -3088,7 +3091,10 @@ g_desktop_app_info_make_platform_data (GDesktopAppInfo *info,
sn_id = g_app_launch_context_get_startup_notify_id (launch_context, G_APP_INFO (info), launched_files);
if (sn_id)
g_variant_builder_add (&builder, "{sv}", "desktop-startup-id", g_variant_new_take_string (sn_id));
{
g_variant_builder_add (&builder, "{sv}", "desktop-startup-id", g_variant_new_string (sn_id));
g_variant_builder_add (&builder, "{sv}", "activation-token", g_variant_new_take_string (g_steal_pointer (&sn_id)));
}
}
g_list_free_full (launched_files, g_object_unref);