[libadwaita/wip/sophie-h/pref-row-markup] More fixes

[Sophie Herold <sophieherold src gnome org>]

commit 25dac1e0edb206a1e2ea0ac278908c4a3c11cf9a
Author: Sophie Herold <sophie hemio de>
Date:   Mon Apr 4 21:04:58 2022 +0200

    More fixes

 src/adw-preferences-row.c    |  3 +--
 src/adw-preferences-row.h    |  2 +-
 src/adw-preferences-window.c | 10 +++-------
 tests/test-expander-row.c    |  2 +-
 4 files changed, 6 insertions(+), 11 deletions(-)
---
diff --git a/src/adw-preferences-row.c b/src/adw-preferences-row.c
index 9f7ccf65..fc531b78 100644
--- a/src/adw-preferences-row.c
+++ b/src/adw-preferences-row.c
@@ -53,7 +53,6 @@ adw_preferences_row_get_property (GObject    *object,
                                   GParamSpec *pspec)
 {
   AdwPreferencesRow *self = ADW_PREFERENCES_ROW (object);
-
   switch (prop_id) {
   case PROP_TITLE:
     g_value_set_string (value, adw_preferences_row_get_title (self));
@@ -387,7 +386,7 @@ adw_preferences_row_get_use_markup (AdwPreferencesRow *self)
  */
 void
 adw_preferences_row_set_use_markup (AdwPreferencesRow *self,
-                                       gboolean           use_markup)
+                                    gboolean           use_markup)
 {
   AdwPreferencesRowPrivate *priv;
 
diff --git a/src/adw-preferences-row.h b/src/adw-preferences-row.h
index 2c088479..f1d40066 100644
--- a/src/adw-preferences-row.h
+++ b/src/adw-preferences-row.h
@@ -59,6 +59,6 @@ ADW_AVAILABLE_IN_ALL
 gboolean adw_preferences_row_get_use_markup (AdwPreferencesRow *self);
 ADW_AVAILABLE_IN_ALL
 void     adw_preferences_row_set_use_markup (AdwPreferencesRow *self,
-                                                gboolean           use_markup);
+                                             gboolean           use_markup);
 
 G_END_DECLS
diff --git a/src/adw-preferences-window.c b/src/adw-preferences-window.c
index c1d986bc..482a0f93 100644
--- a/src/adw-preferences-window.c
+++ b/src/adw-preferences-window.c
@@ -129,21 +129,17 @@ strip_mnemonic (const char *src)
   return new_str;
 }
 
-// Make lowercase, remove mnemonic and markup if applicable
 static char *
 make_comparable (const char        *src,
                  AdwPreferencesRow *row,
-                 gboolean          allow_underline)
+                 gboolean           allow_underline)
 {
   char* plaintext = g_utf8_casefold (src, -1);
-  char *plaintext = g_utf8_casefold (src, -1);
   char *comparable;
   GError *error = NULL;
 
   if (adw_preferences_row_get_use_markup (row)) {
-    char* unparsed = g_strdup (plaintext);
-    pango_parse_markup (unparsed, -1, 0, NULL, &plaintext, NULL, &error);
-    free (unparsed);
+    pango_parse_markup (plaintext, -1, 0, NULL, &plaintext, NULL, &error);
 
     if (error) {
       g_critical ("Couldn't parse markup: %s", error->message);
@@ -153,7 +149,7 @@ make_comparable (const char        *src,
 
   if (adw_preferences_row_get_use_underline (row) && allow_underline) {
     comparable = strip_mnemonic (plaintext);
-    free (plaintext);
+    g_free (plaintext);
   } else {
     comparable = plaintext;
   }
diff --git a/tests/test-expander-row.c b/tests/test-expander-row.c
index 62f490ba..90444f2f 100644
--- a/tests/test-expander-row.c
+++ b/tests/test-expander-row.c
@@ -37,7 +37,7 @@ test_adw_expander_row_subtitle (void)
   adw_expander_row_set_subtitle (row, "Dummy subtitle");
   g_assert_cmpstr (adw_expander_row_get_subtitle (row), ==, "Dummy subtitle");
 
-  adw_preferences_row_set_use_markup(ADW_PREFERENCES_ROW (row), FALSE);
+  adw_preferences_row_set_use_markup (ADW_PREFERENCES_ROW (row), FALSE);
   adw_expander_row_set_subtitle (row, "Invalid <b>markup");
   g_assert_cmpstr (adw_expander_row_get_subtitle (row), ==, "Invalid <b>markup");