AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'openuri-activation-token' into 'main'

Browse Source 
Pass an activation token to OpenURI

See merge request GNOME/gtk!5389
This commit is contained in:
Matthias Clasen 2023-01-05 14:06:14 +00:00
commit 9b1bee99b8
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gdk/x11/gdkapplaunchcontext-x11.c
View File

@ -283,6 +283,9 @@ gdk_x11_app_launch_context_get_startup_notify_id (GAppLaunchContext *context,
GFileInfo *fileinfo; GFileInfo *fileinfo;
GdkAppLaunchContext *ctx; GdkAppLaunchContext *ctx;
if (!info)
return NULL;
ctx = GDK_APP_LAUNCH_CONTEXT (context); ctx = GDK_APP_LAUNCH_CONTEXT (context);
display = ctx->display; display = ctx->display;

26
gtk/gopenuriportal.c
View File

@ -261,6 +261,7 @@ static void
open_uri (GFile *file, open_uri (GFile *file,
gboolean open_folder, gboolean open_folder,
const char *parent_window, const char *parent_window,
const char *activation_token,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data) gpointer user_data)
{ {
@ -306,6 +307,9 @@ open_uri (GFile *file,
g_variant_builder_add (&opt_builder, "{sv}", "handle_token", g_variant_new_string (token)); g_variant_builder_add (&opt_builder, "{sv}", "handle_token", g_variant_new_string (token));
g_free (token); g_free (token);
if (activation_token)
g_variant_builder_add (&opt_builder, "{sv}", "activation_token", g_variant_new_string (activation_token));
opts = g_variant_builder_end (&opt_builder); opts = g_variant_builder_end (&opt_builder);
if (g_file_is_native (file)) if (g_file_is_native (file))
@ -408,8 +412,28 @@ window_handle_exported (GtkWindow *window,
gpointer user_data) gpointer user_data)
{ {
OpenUriData *data = user_data; OpenUriData *data = user_data;
GdkDisplay *display;
GAppLaunchContext *context;
char *activation_token = NULL;
open_uri (data->file, data->open_folder, handle, open_uri_done, data); if (window)
display = gtk_widget_get_display (GTK_WIDGET (window));
else
display = gdk_display_get_default ();
/* FIXME
* Call the vfunc directly since g_app_launch_context_get_startup_notify_id
* has NULL checks.
*
* We should have a more direct way to do this.
*/
context = G_APP_LAUNCH_CONTEXT (gdk_display_get_app_launch_context (display));
activation_token = G_APP_LAUNCH_CONTEXT_GET_CLASS (context)->get_startup_notify_id (context, NULL, NULL);
g_object_unref (context);
open_uri (data->file, data->open_folder, handle, activation_token, open_uri_done, data);
g_free (activation_token);
} }
void void