Adjust for newer version of uncrustify

Updating our CI image brings in a newer uncrustify, which has resulted
in uncrustify going crazy trying to reformat all our multi-line comments
into a single line. I'm bamboozled as to why it's doing that, so let's
just disable uncrustify's handling of multi-line comments.

Then we can fix this weird style bug that was previously enforced by
uncrustify, which is now fixed.

Part-of: <https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/1180>

2 files changed, 3 insertions, 1 deletions

diff --git a/data/uncrustify.cfg b/data/uncrustify.cfg
index 317a1dac2..211c43836 100644
--- a/data/uncrustify.cfg
+++ b/data/uncrustify.cfg
@@ -102,6 +102,8 @@ cmt_c_nl_end                             = true       # false/true
 # For multi-line comments with a '*' lead, remove leading spaces if the first and last lines of
 # the comment are the same length. Default=True
 cmt_multi_check_last                     = true
+# Disable touching multi-line comments.
+cmt_indent_multi                         = false
 
 # Encoding
 utf8_bom                                 = remove
diff --git a/src/bookmarks/ephy-bookmarks-popover.c b/src/bookmarks/ephy-bookmarks-popover.c
index 5d7c0e993..c1eadc540 100644
--- a/src/bookmarks/ephy-bookmarks-popover.c
+++ b/src/bookmarks/ephy-bookmarks-popover.c
@@ -51,7 +51,7 @@ G_DEFINE_TYPE (EphyBookmarksPopover, ephy_bookmarks_popover, GTK_TYPE_POPOVER)
 #define EPHY_LIST_BOX_ROW_TYPE_BOOKMARK "bookmark"
 #define EPHY_LIST_BOX_ROW_TYPE_TAG "tag"
 
-static GtkWidget * create_bookmark_row (gpointer item, gpointer user_data);
+static GtkWidget *create_bookmark_row (gpointer item, gpointer user_data);
 static GtkWidget *create_tag_row (const char *tag);
 
 static void