[gnome-builder] config-provider: make IdeConfigurationProvider an IdeObject

[Christian Hergert <chergert src gnome org>]

commit 1f693b63a7c94acc0a2f64b9bf31036f146c5013
Author: Christian Hergert <chergert redhat com>
Date:   Tue Jan 23 14:39:56 2018 -0800

    config-provider: make IdeConfigurationProvider an IdeObject
    
    This will give them some context, as we rework to remove the
    IdeConfigurationManager from the parameters.

 .../buildconfig/ide-buildconfig-configuration-provider.c      | 10 ++++++----
 .../buildconfig/ide-buildconfig-configuration-provider.h      |  2 +-
 src/libide/buildsystem/ide-configuration-provider.c           |  2 +-
 src/libide/buildsystem/ide-configuration-provider.h           |  2 +-
 src/plugins/flatpak/gbp-flatpak-configuration-provider.c      | 11 +++++++----
 src/plugins/flatpak/gbp-flatpak-configuration-provider.h      |  2 +-
 6 files changed, 17 insertions(+), 12 deletions(-)
---
diff --git a/src/libide/buildconfig/ide-buildconfig-configuration-provider.c 
b/src/libide/buildconfig/ide-buildconfig-configuration-provider.c
index a195843dd..71b6f64cc 100644
--- a/src/libide/buildconfig/ide-buildconfig-configuration-provider.c
+++ b/src/libide/buildconfig/ide-buildconfig-configuration-provider.c
@@ -37,7 +37,7 @@
 
 struct _IdeBuildconfigConfigurationProvider
 {
-  GObject                  parent_instance;
+  IdeObject                parent_instance;
 
   IdeConfigurationManager *manager;
   GPtrArray               *configurations;
@@ -49,9 +49,11 @@ struct _IdeBuildconfigConfigurationProvider
 
 static void configuration_provider_iface_init (IdeConfigurationProviderInterface *);
 
-G_DEFINE_TYPE_EXTENDED (IdeBuildconfigConfigurationProvider, ide_buildconfig_configuration_provider, 
G_TYPE_OBJECT, 0,
-                        G_IMPLEMENT_INTERFACE (IDE_TYPE_CONFIGURATION_PROVIDER,
-                                               configuration_provider_iface_init))
+G_DEFINE_TYPE_WITH_CODE (IdeBuildconfigConfigurationProvider,
+                         ide_buildconfig_configuration_provider,
+                         IDE_TYPE_OBJECT,
+                         G_IMPLEMENT_INTERFACE (IDE_TYPE_CONFIGURATION_PROVIDER,
+                                                configuration_provider_iface_init))
 
 static void ide_buildconfig_configuration_provider_unload (IdeConfigurationProvider *provider, 
IdeConfigurationManager *manager);
 
diff --git a/src/libide/buildconfig/ide-buildconfig-configuration-provider.h 
b/src/libide/buildconfig/ide-buildconfig-configuration-provider.h
index 6e2b95798..836c03dd0 100644
--- a/src/libide/buildconfig/ide-buildconfig-configuration-provider.h
+++ b/src/libide/buildconfig/ide-buildconfig-configuration-provider.h
@@ -30,7 +30,7 @@ G_BEGIN_DECLS
 
 #define IDE_TYPE_BUILDCONFIG_CONFIGURATION_PROVIDER (ide_buildconfig_configuration_provider_get_type())
 
-G_DECLARE_FINAL_TYPE (IdeBuildconfigConfigurationProvider, ide_buildconfig_configuration_provider, IDE, 
BUILDCONFIG_CONFIGURATION_PROVIDER, GObject)
+G_DECLARE_FINAL_TYPE (IdeBuildconfigConfigurationProvider, ide_buildconfig_configuration_provider, IDE, 
BUILDCONFIG_CONFIGURATION_PROVIDER, IdeObject)
 
 IDE_AVAILABLE_IN_ALL
 void ide_buildconfig_configuration_provider_track_config (IdeBuildconfigConfigurationProvider *self,
diff --git a/src/libide/buildsystem/ide-configuration-provider.c 
b/src/libide/buildsystem/ide-configuration-provider.c
index f76d9cb42..6ef6c40c5 100644
--- a/src/libide/buildsystem/ide-configuration-provider.c
+++ b/src/libide/buildsystem/ide-configuration-provider.c
@@ -22,7 +22,7 @@
 #include "buildsystem/ide-configuration-manager.h"
 #include "buildsystem/ide-configuration-provider.h"
 
-G_DEFINE_INTERFACE (IdeConfigurationProvider, ide_configuration_provider, G_TYPE_OBJECT)
+G_DEFINE_INTERFACE (IdeConfigurationProvider, ide_configuration_provider, IDE_TYPE_OBJECT)
 
 static void
 ide_configuration_provider_real_load_async (IdeConfigurationProvider *self,
diff --git a/src/libide/buildsystem/ide-configuration-provider.h 
b/src/libide/buildsystem/ide-configuration-provider.h
index 9b2a2158b..b1e7dea12 100644
--- a/src/libide/buildsystem/ide-configuration-provider.h
+++ b/src/libide/buildsystem/ide-configuration-provider.h
@@ -28,7 +28,7 @@ G_BEGIN_DECLS
 
 #define IDE_TYPE_CONFIGURATION_PROVIDER (ide_configuration_provider_get_type ())
 
-G_DECLARE_INTERFACE (IdeConfigurationProvider, ide_configuration_provider, IDE, CONFIGURATION_PROVIDER, 
GObject)
+G_DECLARE_INTERFACE (IdeConfigurationProvider, ide_configuration_provider, IDE, CONFIGURATION_PROVIDER, 
IdeObject)
 
 struct _IdeConfigurationProviderInterface
 {
diff --git a/src/plugins/flatpak/gbp-flatpak-configuration-provider.c 
b/src/plugins/flatpak/gbp-flatpak-configuration-provider.c
index e127989c1..d62fdbab5 100644
--- a/src/plugins/flatpak/gbp-flatpak-configuration-provider.c
+++ b/src/plugins/flatpak/gbp-flatpak-configuration-provider.c
@@ -35,7 +35,8 @@
 
 struct _GbpFlatpakConfigurationProvider
 {
-  GObject                  parent_instance;
+  IdeObject                parent_instance;
+
   IdeConfigurationManager *manager;
   GPtrArray               *configurations;
   GPtrArray               *manifest_monitors;
@@ -48,9 +49,11 @@ static void configuration_provider_iface_init         (IdeConfigurationProviderI
 static void gbp_flatpak_configuration_provider_unload (IdeConfigurationProvider           *provider,
                                                        IdeConfigurationManager            *manager);
 
-G_DEFINE_TYPE_EXTENDED (GbpFlatpakConfigurationProvider, gbp_flatpak_configuration_provider, G_TYPE_OBJECT, 
0,
-                        G_IMPLEMENT_INTERFACE (IDE_TYPE_CONFIGURATION_PROVIDER,
-                                               configuration_provider_iface_init))
+G_DEFINE_TYPE_WITH_CODE (GbpFlatpakConfigurationProvider,
+                         gbp_flatpak_configuration_provider,
+                         IDE_TYPE_OBJECT,
+                         G_IMPLEMENT_INTERFACE (IDE_TYPE_CONFIGURATION_PROVIDER,
+                                                configuration_provider_iface_init))
 
 static GRegex *filename_regex;
 
diff --git a/src/plugins/flatpak/gbp-flatpak-configuration-provider.h 
b/src/plugins/flatpak/gbp-flatpak-configuration-provider.h
index 4279a4e7a..e3833cb1b 100644
--- a/src/plugins/flatpak/gbp-flatpak-configuration-provider.h
+++ b/src/plugins/flatpak/gbp-flatpak-configuration-provider.h
@@ -24,6 +24,6 @@ G_BEGIN_DECLS
 
 #define GBP_TYPE_FLATPAK_CONFIGURATION_PROVIDER (gbp_flatpak_configuration_provider_get_type())
 
-G_DECLARE_FINAL_TYPE (GbpFlatpakConfigurationProvider, gbp_flatpak_configuration_provider, GBP, 
FLATPAK_CONFIGURATION_PROVIDER, GObject)
+G_DECLARE_FINAL_TYPE (GbpFlatpakConfigurationProvider, gbp_flatpak_configuration_provider, GBP, 
FLATPAK_CONFIGURATION_PROVIDER, IdeObject)
 
 G_END_DECLS