Merge branch 'matthiasc/for-main' into 'main'

sortlistmodel: Cosmetics See merge request GNOME/gtk!6022
2023-05-27 18:30:37 +00:00
parent bcae6271df fc524ed346
commit d90b09f8c3
11 changed files with 12 additions and 20 deletions
--- a/gtk/gtksortlistmodel.c
+++ b/gtk/gtksortlistmodel.c
@@ -1195,11 +1195,7 @@ gtk_sort_list_model_set_sorter (GtkSortListModel *self,
    return;

  gtk_sort_list_model_clear_real_sorter (self);
-  g_clear_object (&self->sorter);
-
-  if (sorter)
-    self->sorter = g_object_ref (sorter);
-
+  g_set_object (&self->sorter, sorter);
  gtk_sort_list_model_ensure_real_sorter (self);

  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_SORTER]);
@@ -1241,11 +1237,7 @@ gtk_sort_list_model_set_section_sorter (GtkSortListModel *self,
    return;

  gtk_sort_list_model_clear_real_sorter (self);
-  g_clear_object (&self->section_sorter);
-
-  if (sorter)
-    self->section_sorter = g_object_ref (sorter);
-
+  g_set_object (&self->section_sorter, sorter);
  gtk_sort_list_model_ensure_real_sorter (self);

  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_SECTION_SORTER]);
--- a/testsuite/gtk/bitmask.c
+++ b/testsuite/gtk/bitmask.c
@@ -1,4 +1,4 @@
-/* GtkRBTree tests.
+/* Bitmask tests.
 *
 * Copyright (C) 2011, Red Hat, Inc.
 * Authors: Benjamin Otte <otte@gnome.org>
--- a/testsuite/gtk/bitset.c
+++ b/testsuite/gtk/bitset.c
@@ -1,4 +1,4 @@
-/* GtkRBTree tests.
+/* Bitset tests.
 *
 * Copyright (C) 2011, Red Hat, Inc.
 * Authors: Benjamin Otte <otte@gnome.org>
--- a/testsuite/gtk/filter.c
+++ b/testsuite/gtk/filter.c
@@ -1,4 +1,4 @@
-/* GtkRBTree tests.
+/* Filter tests.
 *
 * Copyright (C) 2011, Red Hat, Inc.
 * Authors: Benjamin Otte <otte@gnome.org>
--- a/testsuite/gtk/filterlistmodel.c
+++ b/testsuite/gtk/filterlistmodel.c
@@ -1,4 +1,4 @@
-/* GtkRBTree tests.
+/* Filterlistmodel tests.
 *
 * Copyright (C) 2011, Red Hat, Inc.
 * Authors: Benjamin Otte <otte@gnome.org>
--- a/testsuite/gtk/flattenlistmodel.c
+++ b/testsuite/gtk/flattenlistmodel.c
@@ -1,4 +1,4 @@
-/* GtkRBTree tests.
+/* Flattenlistmodel tests.
 *
 * Copyright (C) 2011, Red Hat, Inc.
 * Authors: Benjamin Otte <otte@gnome.org>
--- a/testsuite/gtk/maplistmodel.c
+++ b/testsuite/gtk/maplistmodel.c
@@ -1,4 +1,4 @@
-/* GtkRBTree tests.
+/* Maplistmodel tests.
 *
 * Copyright (C) 2011, Red Hat, Inc.
 * Authors: Benjamin Otte <otte@gnome.org>
--- a/testsuite/gtk/propertylookuplistmodel.c
+++ b/testsuite/gtk/propertylookuplistmodel.c
@@ -1,4 +1,4 @@
-/* GtkRBTree tests.
+/* Propertylookupmodel tests.
 *
 * Copyright (C) 2011, Red Hat, Inc.
 * Authors: Benjamin Otte <otte@gnome.org>
--- a/testsuite/gtk/sortlistmodel.c
+++ b/testsuite/gtk/sortlistmodel.c
@@ -1,4 +1,4 @@
-/* GtkRBTree tests.
+/* sortlistmodel tests
 *
 * Copyright (C) 2011, Red Hat, Inc.
 * Authors: Benjamin Otte <otte@gnome.org>
--- a/testsuite/gtk/treelistmodel.c
+++ b/testsuite/gtk/treelistmodel.c
@@ -1,4 +1,4 @@
-/* GtkRBTree tests.
+/* Treelistmodel tests.
 *
 * Copyright (C) 2011, Red Hat, Inc.
 * Authors: Benjamin Otte <otte@gnome.org>
--- a/testsuite/gtk/treepath.c
+++ b/testsuite/gtk/treepath.c
@@ -1,4 +1,4 @@
-/* GtkTrePath tests.
+/* GtkTreePath tests.
 *
 * Copyright (C) 2011, Red Hat, Inc.
 * Authors: Matthias Clasen <mclasen@redhat.com>