From 3d68a895f06179a5abeab6c8a2bb6c743210c357 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ant=C3=B3nio=20Fernandes?= Date: Mon, 7 Sep 2020 09:57:48 +0100 Subject: [PATCH 1/2] canvas-dnd: Define function type the usual way Defining an function type inline as a function parameter is a awkward syntax and not used in our codebase except for this one occurence. Although valid C, it confuses our style check tools, breaking the CI style check [1] and failing to align parameters. Instead, let's define a named function type to use as parameter type, and fix parameter misalignment. [1] 831203e9512b29900e8095c91332b49bbbf97047 --- src/nautilus-canvas-dnd.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/nautilus-canvas-dnd.c b/src/nautilus-canvas-dnd.c index 9d5a5c67b6..1f86039c2d 100644 --- a/src/nautilus-canvas-dnd.c +++ b/src/nautilus-canvas-dnd.c @@ -276,13 +276,16 @@ icon_get_data_binder (NautilusCanvasIcon *icon, return TRUE; } +typedef gboolean (*CanvasContainerEachFunc)(NautilusCanvasIcon *, + gpointer); + /* Iterate over each selected icon in a NautilusCanvasContainer, * calling each_function on each. */ static void nautilus_canvas_container_each_selected_icon (NautilusCanvasContainer *container, - gboolean (*each_function)(NautilusCanvasIcon *, gpointer), - gpointer data) + CanvasContainerEachFunc each_function, + gpointer data) { GList *p; NautilusCanvasIcon *icon; -- GitLab From 9dbc32ded35688571eb9104bdc46a64c7578dfee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ant=C3=B3nio=20Fernandes?= Date: Mon, 7 Sep 2020 10:24:01 +0100 Subject: [PATCH 2/2] Revert "ci: Hardcode image version for style check job" This reverts commit 831203e9512b29900e8095c91332b49bbbf97047. The previous commit fixed the issue we were working around. --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5575159afe..24a397f647 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -72,7 +72,7 @@ triage:dry-run: when: manual style check: - image: registry.gitlab.gnome.org/gnome/nautilus:v642646 + image: registry.gitlab.gnome.org/gnome/nautilus:latest stage: test artifacts: name: 'Style check artifacts' -- GitLab