diff options
Diffstat (limited to 'src/notification.c')
| -rw-r--r-- | src/notification.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/notification.c b/src/notification.c index 5412609..35c779c 100644 --- a/src/notification.c +++ b/src/notification.c @@ -366,7 +366,7 @@ validate_icon_more (GVariant *v) int status; g_autofree char *err = NULL; g_autoptr(GError) error = NULL; - const char *icon_validator = LIBEXECDIR "/flatpak-validate-icon"; + const char *icon_validator = LIBEXECDIR "/xdg-desktop-portal-validate-icon"; const char *args[6]; if (G_IS_THEMED_ICON (icon)) @@ -382,12 +382,6 @@ validate_icon_more (GVariant *v) return FALSE; } - if (!g_file_test (icon_validator, G_FILE_TEST_EXISTS)) - { - g_debug ("Icon validation: %s not found, accepting icon without further validation.", icon_validator); - return TRUE; - } - bytes = g_bytes_icon_get_bytes (G_BYTES_ICON (icon)); fd = g_file_open_tmp ("iconXXXXXX", &name, &error); if (fd == -1) @@ -420,14 +414,12 @@ validate_icon_more (GVariant *v) if (!g_spawn_sync (NULL, (char **)args, NULL, 0, NULL, NULL, NULL, &err, &status, &error)) { g_debug ("Icon validation: %s", error->message); - return FALSE; } - if (!g_spawn_check_exit_status (status, &error)) + if (!g_spawn_check_exit_status (status, NULL)) { - g_debug ("Icon validation: %s", error->message); - + g_debug ("Icon validation: %s", err); return FALSE; } |