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

gapplication: skip unexpected -psn_ parameter

Browse Source 
When an application is launched using Launch Services
osx will add an extra parameter which we were not
handling and then gapplication would abort. Instead we make
an initial parsing and like this we avoid the abort if this
parameter is provided

Fixes https://gitlab.gnome.org/GNOME/glib/issues/1784
This commit is contained in:
Ignacio Casal Quinteiro 2019-05-22 09:11:26 +02:00
parent dfa7a5b5b5
commit e367a4f66f
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;