mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-08-23 01:36:15 +02:00
Merge branch 'jsparber/open_uri_activation_token' into 'main'
gappinfo: Pass activation token from launch context to open_uri/file portal Closes #2868 See merge request GNOME/glib!3933
This commit is contained in:
Julian Sparber
commit
4b13c93186
@ -25,6 +25,7 @@
|
||||
#include "gappinfo.h"
|
||||
#include "gappinfoprivate.h"
|
||||
#include "gcontextspecificgroup.h"
|
||||
#include "gdesktopappinfo.h"
|
||||
#include "gtask.h"
|
||||
#include "gcancellable.h"
|
||||
|
||||
@ -1021,15 +1022,48 @@ g_app_info_launch_default_for_uri (const char *uri,
|
||||
#ifdef G_OS_UNIX
|
||||
if (!res && glib_should_use_portal ())
|
||||
{
|
||||
GFile *file = NULL;
|
||||
const char *parent_window = NULL;
|
||||
char *startup_id = NULL;
|
||||
|
||||
/* Reset any error previously set by launch_default_for_uri */
|
||||
g_clear_error (error);
|
||||
|
||||
if (launch_context && launch_context->priv->envp)
|
||||
parent_window = g_environ_getenv (launch_context->priv->envp, "PARENT_WINDOW_ID");
|
||||
file = g_file_new_for_uri (uri);
|
||||
|
||||
return g_openuri_portal_open_uri (uri, parent_window, error);
|
||||
if (launch_context)
|
||||
{
|
||||
GApplication *app = NULL;
|
||||
const char *app_id = NULL;
|
||||
|
||||
if (launch_context->priv->envp)
|
||||
parent_window = g_environ_getenv (launch_context->priv->envp, "PARENT_WINDOW_ID");
|
||||
|
||||
app = g_application_get_default ();
|
||||
|
||||
if (app)
|
||||
app_id = g_application_get_application_id (app);
|
||||
|
||||
if (app_id)
|
||||
app_info = G_APP_INFO (g_desktop_app_info_new (app_id));
|
||||
|
||||
if (app_info)
|
||||
{
|
||||
GList *file_list = g_list_prepend (NULL, file);
|
||||
|
||||
startup_id = g_app_launch_context_get_startup_notify_id (launch_context,
|
||||
app_info,
|
||||
file_list);
|
||||
g_list_free (file_list);
|
||||
}
|
||||
|
||||
g_object_unref (app_info);
|
||||
}
|
||||
|
||||
res = g_openuri_portal_open_file (file, parent_window, startup_id, error);
|
||||
|
||||
g_object_unref (file);
|
||||
g_free (startup_id);
|
||||
}
|
||||
#endif
|
||||
|
||||
@ -1059,7 +1093,7 @@ launch_default_for_uri_portal_open_uri_cb (GObject *object,
|
||||
GTask *task = G_TASK (user_data);
|
||||
GError *error = NULL;
|
||||
|
||||
if (g_openuri_portal_open_uri_finish (result, &error))
|
||||
if (g_openuri_portal_open_file_finish (result, &error))
|
||||
g_task_return_boolean (task, TRUE);
|
||||
else
|
||||
g_task_return_error (task, g_steal_pointer (&error));
|
||||
@ -1076,20 +1110,54 @@ launch_default_for_uri_portal_open_uri (GTask *task, GError *error)
|
||||
|
||||
if (glib_should_use_portal ())
|
||||
{
|
||||
GFile *file;
|
||||
const char *parent_window = NULL;
|
||||
char *startup_id = NULL;
|
||||
|
||||
/* Reset any error previously set by launch_default_for_uri */
|
||||
g_error_free (error);
|
||||
|
||||
if (data->context && data->context->priv->envp)
|
||||
parent_window = g_environ_getenv (data->context->priv->envp,
|
||||
"PARENT_WINDOW_ID");
|
||||
file = g_file_new_for_uri (data->uri);
|
||||
|
||||
if (data->context)
|
||||
{
|
||||
GApplication *app = NULL;
|
||||
GAppInfo *app_info = NULL;
|
||||
const char *app_id = NULL;
|
||||
|
||||
if (data->context->priv->envp)
|
||||
parent_window = g_environ_getenv (data->context->priv->envp,
|
||||
"PARENT_WINDOW_ID");
|
||||
|
||||
app = g_application_get_default ();
|
||||
|
||||
if (app)
|
||||
app_id = g_application_get_application_id (app);
|
||||
|
||||
if (app_id)
|
||||
app_info = G_APP_INFO (g_desktop_app_info_new (app_id));
|
||||
|
||||
if (app_info)
|
||||
{
|
||||
GList *file_list = g_list_prepend (NULL, file);
|
||||
|
||||
startup_id = g_app_launch_context_get_startup_notify_id (data->context,
|
||||
app_info,
|
||||
file_list);
|
||||
g_list_free (file_list);
|
||||
}
|
||||
|
||||
g_object_unref (app_info);
|
||||
}
|
||||
g_openuri_portal_open_file_async (file,
|
||||
parent_window,
|
||||
startup_id,
|
||||
cancellable,
|
||||
launch_default_for_uri_portal_open_uri_cb,
|
||||
g_steal_pointer (&task));
|
||||
g_object_unref (file);
|
||||
g_free (startup_id);
|
||||
|
||||
g_openuri_portal_open_uri_async (data->uri,
|
||||
parent_window,
|
||||
cancellable,
|
||||
launch_default_for_uri_portal_open_uri_cb,
|
||||
g_steal_pointer (&task));
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
|
||||
@ -80,11 +80,11 @@ init_openuri_portal (void)
|
||||
}
|
||||
|
||||
gboolean
|
||||
g_openuri_portal_open_uri (const char *uri,
|
||||
const char *parent_window,
|
||||
GError **error)
|
||||
g_openuri_portal_open_file (GFile *file,
|
||||
const char *parent_window,
|
||||
const char *startup_id,
|
||||
GError **error)
|
||||
{
|
||||
GFile *file = NULL;
|
||||
GVariantBuilder opt_builder;
|
||||
gboolean res;
|
||||
|
||||
@ -97,7 +97,11 @@ g_openuri_portal_open_uri (const char *uri,
|
||||
|
||||
g_variant_builder_init (&opt_builder, G_VARIANT_TYPE_VARDICT);
|
||||
|
||||
file = g_file_new_for_uri (uri);
|
||||
if (startup_id)
|
||||
g_variant_builder_add (&opt_builder, "{sv}",
|
||||
"activation_token",
|
||||
g_variant_new_string (startup_id));
|
||||
|
||||
if (g_file_is_native (file))
|
||||
{
|
||||
char *path = NULL;
|
||||
@ -138,6 +142,10 @@ g_openuri_portal_open_uri (const char *uri,
|
||||
}
|
||||
else
|
||||
{
|
||||
char *uri = NULL;
|
||||
|
||||
uri = g_file_get_uri (file);
|
||||
|
||||
res = gxdp_open_uri_call_open_uri_sync (openuri,
|
||||
parent_window ? parent_window : "",
|
||||
uri,
|
||||
@ -145,10 +153,9 @@ g_openuri_portal_open_uri (const char *uri,
|
||||
NULL,
|
||||
NULL,
|
||||
error);
|
||||
g_free (uri);
|
||||
}
|
||||
|
||||
g_object_unref (file);
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
@ -245,15 +252,15 @@ open_call_done (GObject *source,
|
||||
}
|
||||
|
||||
void
|
||||
g_openuri_portal_open_uri_async (const char *uri,
|
||||
const char *parent_window,
|
||||
GCancellable *cancellable,
|
||||
GAsyncReadyCallback callback,
|
||||
gpointer user_data)
|
||||
g_openuri_portal_open_file_async (GFile *file,
|
||||
const char *parent_window,
|
||||
const char *startup_id,
|
||||
GCancellable *cancellable,
|
||||
GAsyncReadyCallback callback,
|
||||
gpointer user_data)
|
||||
{
|
||||
GDBusConnection *connection;
|
||||
GTask *task;
|
||||
GFile *file;
|
||||
GVariant *opts = NULL;
|
||||
int i;
|
||||
guint signal_id;
|
||||
@ -303,12 +310,16 @@ g_openuri_portal_open_uri_async (const char *uri,
|
||||
g_variant_builder_add (&opt_builder, "{sv}", "handle_token", g_variant_new_string (token));
|
||||
g_free (token);
|
||||
|
||||
if (startup_id)
|
||||
g_variant_builder_add (&opt_builder, "{sv}",
|
||||
"activation_token",
|
||||
g_variant_new_string (startup_id));
|
||||
|
||||
opts = g_variant_builder_end (&opt_builder);
|
||||
}
|
||||
else
|
||||
task = NULL;
|
||||
|
||||
file = g_file_new_for_uri (uri);
|
||||
if (g_file_is_native (file))
|
||||
{
|
||||
char *path = NULL;
|
||||
@ -349,6 +360,10 @@ g_openuri_portal_open_uri_async (const char *uri,
|
||||
}
|
||||
else
|
||||
{
|
||||
char *uri = NULL;
|
||||
|
||||
uri = g_file_get_uri (file);
|
||||
|
||||
gxdp_open_uri_call_open_uri (openuri,
|
||||
parent_window ? parent_window : "",
|
||||
uri,
|
||||
@ -356,14 +371,13 @@ g_openuri_portal_open_uri_async (const char *uri,
|
||||
cancellable,
|
||||
task ? open_call_done : NULL,
|
||||
task);
|
||||
g_free (uri);
|
||||
}
|
||||
|
||||
g_object_unref (file);
|
||||
}
|
||||
|
||||
gboolean
|
||||
g_openuri_portal_open_uri_finish (GAsyncResult *result,
|
||||
GError **error)
|
||||
g_openuri_portal_open_file_finish (GAsyncResult *result,
|
||||
GError **error)
|
||||
{
|
||||
return g_task_propagate_boolean (G_TASK (result), error);
|
||||
}
|
||||
|
||||
@ -25,18 +25,20 @@
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
gboolean g_openuri_portal_open_uri (const char *uri,
|
||||
const char *parent_window,
|
||||
GError **error);
|
||||
gboolean g_openuri_portal_open_file (GFile *file,
|
||||
const char *parent_window,
|
||||
const char *startup_id,
|
||||
GError **error);
|
||||
|
||||
void g_openuri_portal_open_uri_async (const char *uri,
|
||||
const char *parent_window,
|
||||
GCancellable *cancellable,
|
||||
GAsyncReadyCallback callback,
|
||||
gpointer user_data);
|
||||
void g_openuri_portal_open_file_async (GFile *file,
|
||||
const char *parent_window,
|
||||
const char *startup_id,
|
||||
GCancellable *cancellable,
|
||||
GAsyncReadyCallback callback,
|
||||
gpointer user_data);
|
||||
|
||||
gboolean g_openuri_portal_open_uri_finish (GAsyncResult *result,
|
||||
GError **error);
|
||||
gboolean g_openuri_portal_open_file_finish (GAsyncResult *result,
|
||||
GError **error);
|
||||
|
||||
G_END_DECLS
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user