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

macos: Fix URL launcher

Browse Source 
URLs should be provided to the AppInfo.launch_uris() function.
This commit is contained in:
Arjan Molenaar 2024-09-27 19:08:01 +02:00
parent 019de2cbbc
commit fd6c1f34da
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gio/gosxappinfo.m
View File

@ -456,8 +456,6 @@ g_osx_app_info_launch_internal (GAppInfo *appinfo,
gint ret, success = TRUE;
g_return_val_if_fail (G_IS_OSX_APP_INFO (appinfo), FALSE);
g_return_val_if_fail (uris == NULL, FALSE);
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
fill_urlspec_for_appinfo (&urlspec, info, uris, are_files);

25
gio/tests/osx-appinfo.c
View File

@ -35,7 +35,7 @@ async_result_cb (GObject *source_object,
}
static void
test_launch_async (void)
test_launch_async (GList *uris)
{
GAppInfo *app_info;
GAppLaunchContext *context;
@ -48,7 +48,7 @@ test_launch_async (void)
context = g_app_launch_context_new ();
g_app_info_launch_uris_async (G_APP_INFO (app_info), NULL, context, NULL, async_result_cb, &result);
g_app_info_launch_uris_async (G_APP_INFO (app_info), uris, context, NULL, async_result_cb, &result);
while (result == NULL)
g_main_context_iteration (NULL, TRUE);
@ -65,6 +65,24 @@ test_launch_async (void)
g_clear_object (&app_info);
}
static void
test_launch_async_with_uris (void)
{
GList *uris;
uris = g_list_prepend (NULL, "file:///hopefully/an/invalid/path.txt");
test_launch_async (uris);
g_list_free (uris);
}
static void
test_launch_async_without_uris (void)
{
test_launch_async (NULL);
}
static void
test_invalid_uri_scheme (void)
{
@ -80,7 +98,8 @@ main (int argc,
{
g_test_init (&argc, &argv, NULL, NULL);
g_test_add_func ("/osx-app-info/launch-async", test_launch_async);
g_test_add_func ("/osx-app-info/launch-async-with-uris", test_launch_async_with_uris);
g_test_add_func ("/osx-app-info/launch-async-without-uris", test_launch_async_without_uris);
g_test_add_func ("/osx-app-info/invalid-uri-scheme", test_invalid_uri_scheme);
return g_test_run ();