applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

color: Search path for gcm-viewer/gcm-calibrate rather than rely on exact location

Browse source
This commit is contained in:
Robert Ancell 2020-04-17 11:31:04 +12:00 • committed by Benjamin Berg
parent 84c8803d76
commit ed41626c67
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
panels/color/cc-color-panel.c
View file

@ -591,13 +591,13 @@ gcm_prefs_calibrate_cb (CcColorPanel *prefs)
/* run with modal set */
argv = g_ptr_array_new_with_free_func (g_free);
g_ptr_array_add (argv, g_build_filename (BINDIR, "gcm-calibrate", NULL));
g_ptr_array_add (argv, g_strdup ("gcm-calibrate"));
g_ptr_array_add (argv, g_strdup ("--device"));
g_ptr_array_add (argv, g_strdup (cd_device_get_id (prefs->current_device)));
g_ptr_array_add (argv, g_strdup ("--parent-window"));
g_ptr_array_add (argv, g_strdup_printf ("%i", xid));
g_ptr_array_add (argv, NULL);
ret = g_spawn_async (NULL, (gchar**) argv->pdata, NULL, 0,
ret = g_spawn_async (NULL, (gchar**) argv->pdata, NULL, G_SPAWN_SEARCH_PATH,
NULL, NULL, NULL, &error);
if (!ret)
g_warning ("failed to run calibrate: %s", error->message);
@ -1029,13 +1029,13 @@ gcm_prefs_profile_view (CcColorPanel *prefs, CdProfile *profile)
/* open up gcm-viewer as a info pane */
argv = g_ptr_array_new_with_free_func (g_free);
g_ptr_array_add (argv, g_build_filename (BINDIR, "gcm-viewer", NULL));
g_ptr_array_add (argv, g_strdup ("gcm-viewer"));
g_ptr_array_add (argv, g_strdup ("--profile"));
g_ptr_array_add (argv, g_strdup (cd_profile_get_id (profile)));
g_ptr_array_add (argv, g_strdup ("--parent-window"));
g_ptr_array_add (argv, g_strdup_printf ("%i", xid));
g_ptr_array_add (argv, NULL);
ret = g_spawn_async (NULL, (gchar**) argv->pdata, NULL, 0,
ret = g_spawn_async (NULL, (gchar**) argv->pdata, NULL, G_SPAWN_SEARCH_PATH,
NULL, NULL, NULL, &error);
if (!ret)
g_warning ("failed to run calibrate: %s", error->message);

4
panels/color/meson.build
View file

@ -47,10 +47,6 @@ deps = common_deps + [
dependency('libsoup-2.4')
]
cflags += [
'-DBINDIR="@0@"'.format(control_center_bindir)
]
panels_libs += static_library(
cappletname,
sources: sources,