[gnome-builder/wip/gtk4-port: 131/736] libide/gui: some compilation fixes as we transition

[Christian Hergert <chergert src gnome org>]

commit 26fe870982dc48353a3234c95908144f8d2e970f
Author: Christian Hergert <chergert redhat com>
Date:   Mon Mar 28 17:26:43 2022 -0700

    libide/gui: some compilation fixes as we transition

 src/libide/gtk/libide-gtk.h              |  1 +
 src/libide/gui/ide-application-private.h |  2 +-
 src/libide/gui/ide-config-view-addin.c   | 12 ++++++------
 src/libide/gui/ide-config-view-addin.h   |  8 ++++++--
 4 files changed, 14 insertions(+), 9 deletions(-)
---
diff --git a/src/libide/gtk/libide-gtk.h b/src/libide/gtk/libide-gtk.h
index 82a4424d6..1234398d7 100644
--- a/src/libide/gtk/libide-gtk.h
+++ b/src/libide/gtk/libide-gtk.h
@@ -25,6 +25,7 @@
 # include "ide-cell-renderer-fancy.h"
 # include "ide-entry-popover.h"
 # include "ide-fancy-tree-view.h"
+# include "ide-gtk.h"
 # include "ide-gtk-enums.h"
 # include "ide-menu-manager.h"
 # include "ide-progress-icon.h"
diff --git a/src/libide/gui/ide-application-private.h b/src/libide/gui/ide-application-private.h
index 2f4be0108..a2e064f79 100644
--- a/src/libide/gui/ide-application-private.h
+++ b/src/libide/gui/ide-application-private.h
@@ -21,12 +21,12 @@
 #pragma once
 
 #include <libide-core.h>
+#include <libide-gtk.h>
 
 #include <libpeas/peas.h>
 
 #include "ide-application.h"
 #include "ide-keybindings.h"
-#include "ide-menu-manager.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/libide/gui/ide-config-view-addin.c b/src/libide/gui/ide-config-view-addin.c
index 65ebf1492..9cfdc6f26 100644
--- a/src/libide/gui/ide-config-view-addin.c
+++ b/src/libide/gui/ide-config-view-addin.c
@@ -32,15 +32,15 @@ ide_config_view_addin_default_init (IdeConfigViewAddinInterface *iface)
 }
 
 void
-ide_config_view_addin_load (IdeConfigViewAddin *self,
-                            DzlPreferences     *preferences,
-                            IdeConfig   *configuration)
+ide_config_view_addin_load (IdeConfigViewAddin   *self,
+                            IdePreferencesWindow *preferences,
+                            IdeConfig            *config)
 {
   g_return_if_fail (IDE_IS_MAIN_THREAD ());
   g_return_if_fail (IDE_IS_CONFIG_VIEW_ADDIN (self));
-  g_return_if_fail (DZL_IS_PREFERENCES (preferences));
-  g_return_if_fail (IDE_IS_CONFIG (configuration));
+  g_return_if_fail (IDE_IS_PREFERENCES_WINDOW (preferences));
+  g_return_if_fail (IDE_IS_CONFIG (config));
 
   if (IDE_CONFIG_VIEW_ADDIN_GET_IFACE (self)->load)
-    IDE_CONFIG_VIEW_ADDIN_GET_IFACE (self)->load (self, preferences, configuration);
+    IDE_CONFIG_VIEW_ADDIN_GET_IFACE (self)->load (self, preferences, config);
 }
diff --git a/src/libide/gui/ide-config-view-addin.h b/src/libide/gui/ide-config-view-addin.h
index 7d4846a2f..5cddd4e76 100644
--- a/src/libide/gui/ide-config-view-addin.h
+++ b/src/libide/gui/ide-config-view-addin.h
@@ -20,6 +20,10 @@
 
 #pragma once
 
+#if !defined (IDE_GUI_INSIDE) && !defined (IDE_GUI_COMPILATION)
+# error "Only <libide-gui.h> can be included directly."
+#endif
+
 #include <libide-core.h>
 #include <libide-foundry.h>
 
@@ -38,12 +42,12 @@ struct _IdeConfigViewAddinInterface
 
   void (*load) (IdeConfigViewAddin   *self,
                 IdePreferencesWindow *preferences,
-                IdeConfig            *configuration);
+                IdeConfig            *config);
 };
 
 IDE_AVAILABLE_IN_ALL
 void ide_config_view_addin_load (IdeConfigViewAddin   *self,
                                  IdePreferencesWindow *preferences,
-                                 IdeConfig            *configuration);
+                                 IdeConfig            *config);
 
 G_END_DECLS