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

Merge branch 'osx-psn' into 'master'

Browse Source 
gapplication: skip unexpected -psn_ parameter

Closes #1784

See merge request GNOME/glib!864
This commit is contained in:
Philip Withnall 2019-05-23 10:16:01 +00:00
commit 970599ab7a
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gio/gapplication.c
View File

@ -2458,6 +2458,28 @@ g_application_run (GApplication *application,
sizeof (arguments[0]) * (argc + 1));
}
}
#elif defined(__APPLE__)
{
gint i, j;
/*
* OSX adds an unexpected parameter on the format -psn_X_XXXXXX
* when opening the application using Launch Services. In order
* to avoid that GOption fails to parse this parameter we just
* skip it if it was provided.
* See: https://gitlab.gnome.org/GNOME/glib/issues/1784
*/
arguments = g_new (gchar *, argc + 1);
for (i = 0, j = 0; i < argc; i++)
{
if (!g_str_has_prefix (argv[i], "-psn_"))
{
arguments[j] = g_strdup (argv[i]);
j++;
}
}
arguments[j] = NULL;
}
#else
{
gint i;