luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-25 15:06:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

macos: simplify urlspec setup for launch_uris_async

Browse Source 
NB. Using toll-free bridging to cast NSURL to a CFURLRef
See https://developer.apple.com/library/archive/documentation/General/Conceptual/CocoaEncyclopedia/Toll-FreeBridgin/Toll-FreeBridgin.html
This commit is contained in:
Arjan Molenaar 2024-07-24 16:31:27 +02:00
parent 9f0ff882c1
commit edd36a907b
1 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gio/gosxappinfo.m
View File

@ -272,25 +272,19 @@ create_url_list_from_glist (GList *uris,
return (CFArrayRef)array; return (CFArrayRef)array;
} }
static LSLaunchURLSpec * static void
create_urlspec_for_appinfo (GOsxAppInfo *info, fill_urlspec_for_appinfo (LSLaunchURLSpec *urlspec,
GList *uris, GOsxAppInfo *info,
gboolean are_files) GList *uris,
gboolean are_files)
{ {
LSLaunchURLSpec *urlspec = NULL; urlspec->appURL = (CFURLRef) [NSURL fileURLWithPath: [info->bundle bundlePath]];
g_return_val_if_fail (G_IS_OSX_APP_INFO (info), NULL);
urlspec = g_new0 (LSLaunchURLSpec, 1);
urlspec->appURL = CFURLCreateWithFileSystemPath (NULL, CFBridgingRetain([info->bundle bundlePath]), kCFURLPOSIXPathStyle, FALSE);
urlspec->launchFlags = kLSLaunchDefaults;
urlspec->itemURLs = create_url_list_from_glist (uris, are_files); urlspec->itemURLs = create_url_list_from_glist (uris, are_files);
urlspec->launchFlags = kLSLaunchDefaults;
return urlspec;
} }
static void static void
free_urlspec (LSLaunchURLSpec *urlspec) clear_urlspec (LSLaunchURLSpec *urlspec)
{ {
if (urlspec->itemURLs) if (urlspec->itemURLs)
{ {
@ -298,7 +292,6 @@ free_urlspec (LSLaunchURLSpec *urlspec)
CFRelease (urlspec->itemURLs); CFRelease (urlspec->itemURLs);
} }
CFRelease (urlspec->appURL); CFRelease (urlspec->appURL);
g_free (urlspec);
} }
static NSBundle * static NSBundle *
@ -459,15 +452,16 @@ g_osx_app_info_launch_internal (GAppInfo *appinfo,
GError **error) GError **error)
{ {
GOsxAppInfo *info = G_OSX_APP_INFO (appinfo); GOsxAppInfo *info = G_OSX_APP_INFO (appinfo);
LSLaunchURLSpec *urlspec; LSLaunchURLSpec urlspec = {0};
gint ret, success = TRUE; gint ret, success = TRUE;
g_return_val_if_fail (G_IS_OSX_APP_INFO (appinfo), FALSE); 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); g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
urlspec = create_urlspec_for_appinfo (info, uris, are_files); fill_urlspec_for_appinfo (&urlspec, info, uris, are_files);
if ((ret = LSOpenFromURLSpec (urlspec, NULL))) if ((ret = LSOpenFromURLSpec (&urlspec, NULL)))
{ {
/* TODO: Better error codes */ /* TODO: Better error codes */
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
@ -475,7 +469,7 @@ g_osx_app_info_launch_internal (GAppInfo *appinfo,
success = FALSE; success = FALSE;
} }
free_urlspec (urlspec); clear_urlspec (&urlspec);
return success; return success;
} }