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

info-overview: Search path for gnome-software rather than rely on exact location

Browse source
This commit is contained in:
Robert Ancell 2020-04-17 11:29:20 +12:00 • committed by Benjamin Berg
parent 5087de2f85
commit 84c8803d76
2 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
panels/info-overview/cc-info-overview-panel.c
View file

@ -722,13 +722,15 @@ info_overview_panel_setup_overview (CcInfoOverviewPanel *self)
static gboolean static gboolean
does_gnome_software_exist (void) does_gnome_software_exist (void)
{ {
return g_file_test (BINDIR "/gnome-software", G_FILE_TEST_EXISTS); g_autofree gchar *path = g_find_program_in_path ("gnome-software");
return path != NULL;
} }
static gboolean static gboolean
does_gpk_update_viewer_exist (void) does_gpk_update_viewer_exist (void)
{ {
return g_file_test (BINDIR "/gpk-update-viewer", G_FILE_TEST_EXISTS); g_autofree gchar *path = g_find_program_in_path ("gpk-update-viewer");
return path != NULL;
} }
static void static void
@ -736,19 +738,20 @@ open_software_update (CcInfoOverviewPanel *self)
{ {
g_autoptr(GError) error = NULL; g_autoptr(GError) error = NULL;
gboolean ret; gboolean ret;
g_auto(GStrv) argv = NULL; char *argv[3];
argv = g_new0 (gchar *, 3);
if (does_gnome_software_exist ()) if (does_gnome_software_exist ())
{ {
argv[0] = g_build_filename (BINDIR, "gnome-software", NULL); argv[0] = "gnome-software";
argv[1] = g_strdup_printf ("--mode=updates"); argv[1] = "--mode=updates";
argv[2] = NULL;
} }
else else
{ {
argv[0] = g_build_filename (BINDIR, "gpk-update-viewer", NULL); argv[0] = "gpk-update-viewer";
argv[1] = NULL;
} }
ret = g_spawn_async (NULL, argv, NULL, 0, NULL, NULL, NULL, &error); ret = g_spawn_async (NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, &error);
if (!ret) if (!ret)
g_warning ("Failed to spawn %s: %s", argv[0], error->message); g_warning ("Failed to spawn %s: %s", argv[0], error->message);
} }

1
panels/info-overview/meson.build
View file

@ -18,7 +18,6 @@ i18n.merge_file(
) )
cflags += [ cflags += [
'-DBINDIR="@0@"'.format(control_center_bindir),
'-DDATADIR="@0@"'.format(control_center_datadir), '-DDATADIR="@0@"'.format(control_center_datadir),
'-DLIBEXECDIR="@0@"'.format(control_center_libexecdir), '-DLIBEXECDIR="@0@"'.format(control_center_libexecdir),
] ]