[gnome-builder/wip/gtk4-port: 67/343] libide/gui: remove some preferences bits

[Christian Hergert <chergert src gnome org>]

commit 66c2d6fde43ab77af3ddfa024f04251aaee46dbe
Author: Christian Hergert <chergert redhat com>
Date:   Sat Mar 26 23:06:54 2022 -0700

    libide/gui: remove some preferences bits
    
    And start migrating towards preferences window.

 src/libide/gui/ide-config-view-addin.h             |  19 +--
 src/libide/gui/ide-preferences-builtin-private.h   |   4 +-
 src/libide/gui/ide-preferences-builtin.c           |   8 +-
 .../gui/ide-preferences-language-row-private.h     |  31 ----
 src/libide/gui/ide-preferences-language-row.c      | 171 ---------------------
 src/libide/gui/ide-preferences-language-row.ui     |  26 ----
 src/libide/gui/libide-gui.gresource.xml            |   1 -
 src/libide/gui/meson.build                         |   4 -
 8 files changed, 16 insertions(+), 248 deletions(-)
---
diff --git a/src/libide/gui/ide-config-view-addin.h b/src/libide/gui/ide-config-view-addin.h
index 287bcbd24..c7bf83988 100644
--- a/src/libide/gui/ide-config-view-addin.h
+++ b/src/libide/gui/ide-config-view-addin.h
@@ -20,29 +20,30 @@
 
 #pragma once
 
-#include <dazzle.h>
 #include <libide-core.h>
 #include <libide-foundry.h>
 
+#include "ide-preferences-window.h"
+
 G_BEGIN_DECLS
 
 #define IDE_TYPE_CONFIG_VIEW_ADDIN (ide_config_view_addin_get_type())
 
-IDE_AVAILABLE_IN_3_32
+IDE_AVAILABLE_IN_ALL
 G_DECLARE_INTERFACE (IdeConfigViewAddin, ide_config_view_addin, IDE, CONFIG_VIEW_ADDIN, GObject)
 
 struct _IdeConfigViewAddinInterface
 {
   GTypeInterface parent_iface;
 
-  void (*load) (IdeConfigViewAddin *self,
-                DzlPreferences     *preferences,
-                IdeConfig          *configuration);
+  void (*load) (IdeConfigViewAddin   *self,
+                IdePreferencesWIndow *preferences,
+                IdeConfig            *configuration);
 };
 
-IDE_AVAILABLE_IN_3_32
-void ide_config_view_addin_load (IdeConfigViewAddin *self,
-                                 DzlPreferences     *preferences,
-                                 IdeConfig          *configuration);
+IDE_AVAILABLE_IN_ALL
+void ide_config_view_addin_load (IdeConfigViewAddin   *self,
+                                 IdePreferencesWIndow *preferences,
+                                 IdeConfig            *configuration);
 
 G_END_DECLS
diff --git a/src/libide/gui/ide-preferences-builtin-private.h 
b/src/libide/gui/ide-preferences-builtin-private.h
index ca3f8b5be..038d21e6b 100644
--- a/src/libide/gui/ide-preferences-builtin-private.h
+++ b/src/libide/gui/ide-preferences-builtin-private.h
@@ -20,10 +20,10 @@
 
 #pragma once
 
-#include <dazzle.h>
+#include "ide-preferences-window.h"
 
 G_BEGIN_DECLS
 
-void _ide_preferences_builtin_register (DzlPreferences *preferences);
+void _ide_preferences_builtin_register (IdePreferencesWindow *window);
 
 G_END_DECLS
diff --git a/src/libide/gui/ide-preferences-builtin.c b/src/libide/gui/ide-preferences-builtin.c
index 456d6d575..5fa6d1f5b 100644
--- a/src/libide/gui/ide-preferences-builtin.c
+++ b/src/libide/gui/ide-preferences-builtin.c
@@ -22,10 +22,10 @@
 
 #include "config.h"
 
-#include <dazzle.h>
 #include <glib/gi18n.h>
+
+#include <adwaita.h>
 #include <gtksourceview/gtksource.h>
-#include <handy.h>
 #include <libpeas/peas.h>
 
 #include "ide-preferences-builtin-private.h"
@@ -128,7 +128,7 @@ ide_preferences_builtin_register_appearance (DzlPreferences *preferences)
       dzl_preferences_add_radio (preferences, "appearance", "schemes", "org.gnome.builder.editor", 
"style-scheme-name", NULL, variant_str, title, NULL, title, i);
     }
 
-  if (!hdy_style_manager_get_system_supports_color_schemes (hdy_style_manager_get_default ()))
+  if (!adw_style_manager_get_system_supports_color_schemes (adw_style_manager_get_default ()))
     {
       bin = dzl_preferences_get_widget (preferences, follow_style);
       gtk_widget_set_sensitive (bin, FALSE);
@@ -572,7 +572,7 @@ ide_preferences_builtin_register_sdks (DzlPreferences *preferences)
 }
 
 void
-_ide_preferences_builtin_register (DzlPreferences *preferences)
+_ide_preferences_builtin_register (IdePreferencesWindow *window)
 {
   ide_preferences_builtin_register_appearance (preferences);
   ide_preferences_builtin_register_editor (preferences);
diff --git a/src/libide/gui/libide-gui.gresource.xml b/src/libide/gui/libide-gui.gresource.xml
index 19fbeab59..27586bcab 100644
--- a/src/libide/gui/libide-gui.gresource.xml
+++ b/src/libide/gui/libide-gui.gresource.xml
@@ -11,7 +11,6 @@
     <file preprocess="xml-stripblanks">ide-notifications-button.ui</file>
     <file preprocess="xml-stripblanks">ide-omni-bar.ui</file>
     <file preprocess="xml-stripblanks">ide-panel.ui</file>
-    <file preprocess="xml-stripblanks">ide-preferences-language-row.ui</file>
     <file preprocess="xml-stripblanks">ide-preferences-window.ui</file>
     <file preprocess="xml-stripblanks">ide-primary-workspace.ui</file>
     <file preprocess="xml-stripblanks">ide-run-button.ui</file>
diff --git a/src/libide/gui/meson.build b/src/libide/gui/meson.build
index 22aa96778..0568755d2 100644
--- a/src/libide/gui/meson.build
+++ b/src/libide/gui/meson.build
@@ -29,7 +29,6 @@ libide_gui_public_headers = [
   'ide-pane.h',
   'ide-panel.h',
   'ide-preferences-addin.h',
-  'ide-preferences-surface.h',
   'ide-preferences-window.h',
   'ide-primary-workspace.h',
   'ide-search-button.h',
@@ -62,7 +61,6 @@ libide_gui_private_headers = [
   'ide-notification-stack-private.h',
   'ide-notification-view-private.h',
   'ide-preferences-builtin-private.h',
-  'ide-preferences-language-row-private.h',
   'ide-run-button.h',
   'ide-session-private.h',
   'ide-window-settings-private.h',
@@ -83,7 +81,6 @@ libide_gui_private_sources = [
   'ide-notification-view.c',
   'ide-notifications-button-popover.c',
   'ide-preferences-builtin.c',
-  'ide-preferences-language-row.c',
   'ide-primary-workspace-actions.c',
   'ide-run-button.c',
   'ide-session.c',
@@ -118,7 +115,6 @@ libide_gui_public_sources = [
   'ide-panel.c',
   'ide-primary-workspace.c',
   'ide-preferences-addin.c',
-  'ide-preferences-surface.c',
   'ide-preferences-window.c',
   'ide-search-button.c',
   'ide-session-addin.c',