From 6af69a7b7d4eb3cfaaa15654f4c9b2998a734a0e Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Thu, 20 Oct 2022 10:05:13 -0400
Subject: [PATCH] Make GtkColumnViewSorter public

API is yet to come.
---
 gtk/gtk.h                        |  1 +
 gtk/gtkcolumnviewsorter.h        | 42 ++++++++++++++++++++++++++++++++
 gtk/gtkcolumnviewsorterprivate.h |  8 +-----
 gtk/meson.build                  |  1 +
 4 files changed, 45 insertions(+), 7 deletions(-)
 create mode 100644 gtk/gtkcolumnviewsorter.h

diff --git a/gtk/gtk.h b/gtk/gtk.h
index cf139b5dda..21727f7abc 100644
--- a/gtk/gtk.h
+++ b/gtk/gtk.h
@@ -85,6 +85,7 @@
 #include <gtk/gtkcolorutils.h>
 #include <gtk/gtkcolumnview.h>
 #include <gtk/gtkcolumnviewcolumn.h>
+#include <gtk/gtkcolumnviewsorter.h>
 #include <gtk/deprecated/gtkcombobox.h>
 #include <gtk/deprecated/gtkcomboboxtext.h>
 #include <gtk/gtkconstraintlayout.h>
diff --git a/gtk/gtkcolumnviewsorter.h b/gtk/gtkcolumnviewsorter.h
new file mode 100644
index 0000000000..a412768e0b
--- /dev/null
+++ b/gtk/gtkcolumnviewsorter.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2022 Matthias Clasen
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Matthias Clasen <mclasen@redhat.com>
+ */
+
+#ifndef __GTK_COLUMN_VIEW_SORTER_H__
+#define __GTK_COLUMN_VIEW_SORTER_H__
+
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
+#include <gdk/gdk.h>
+#include <gtk/gtksorter.h>
+#include <gtk/gtkcolumnviewcolumn.h>
+
+G_BEGIN_DECLS
+
+#define GTK_TYPE_COLUMN_VIEW_SORTER             (gtk_column_view_sorter_get_type ())
+
+GDK_AVAILABLE_IN_4_10
+G_DECLARE_FINAL_TYPE (GtkColumnViewSorter, gtk_column_view_sorter, GTK, COLUMN_VIEW_SORTER, GtkSorter)
+
+
+G_END_DECLS
+
+#endif /* __GTK_SORTER_H__ */
+
diff --git a/gtk/gtkcolumnviewsorterprivate.h b/gtk/gtkcolumnviewsorterprivate.h
index 81801f3bdf..7b370b7e71 100644
--- a/gtk/gtkcolumnviewsorterprivate.h
+++ b/gtk/gtkcolumnviewsorterprivate.h
@@ -24,16 +24,10 @@
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#include <gdk/gdk.h>
-#include <gtk/gtksorter.h>
-#include <gtk/gtkcolumnviewcolumn.h>
+#include <gtk/gtkcolumnviewsorter.h>
 
 G_BEGIN_DECLS
 
-#define GTK_TYPE_COLUMN_VIEW_SORTER             (gtk_column_view_sorter_get_type ())
-
-G_DECLARE_FINAL_TYPE (GtkColumnViewSorter, gtk_column_view_sorter, GTK, COLUMN_VIEW_SORTER, GtkSorter)
-
 GtkColumnViewSorter *   gtk_column_view_sorter_new              (void);
 
 gboolean                gtk_column_view_sorter_add_column       (GtkColumnViewSorter    *self,
diff --git a/gtk/meson.build b/gtk/meson.build
index bfca55c198..5ce0ae81e3 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -443,6 +443,7 @@ gtk_public_headers = files([
   'gtkcolorutils.h',
   'gtkcolumnview.h',
   'gtkcolumnviewcolumn.h',
+  'gtkcolumnviewsorter.h',
   'gtkconstraintguide.h',
   'gtkconstraintlayout.h',
   'gtkconstraint.h',