[gnome-builder] clang: re-enable clang completion provider

[Christian Hergert <chergert src gnome org>]

commit 9f640ce4de7bb800931041a4ccbad2cfb6c8b4ba
Author: Christian Hergert <christian hergert me>
Date:   Mon Aug 31 04:14:42 2015 -0700

    clang: re-enable clang completion provider
    
    This was fallout from plugin-ification.

 libide/ide.h                                  |    1 +
 plugins/clang/clang-plugin.c                  |    4 ++++
 plugins/clang/ide-clang-completion-provider.c |    9 +++++----
 plugins/clang/ide-clang-completion-provider.h |    2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)
---
diff --git a/libide/ide.h b/libide/ide.h
index e6689af..f5d6667 100644
--- a/libide/ide.h
+++ b/libide/ide.h
@@ -33,6 +33,7 @@ G_BEGIN_DECLS
 #include "ide-buffer.h"
 #include "ide-buffer-change-monitor.h"
 #include "ide-buffer-manager.h"
+#include "ide-completion-provider.h"
 #include "ide-context.h"
 #include "ide-debug.h"
 #include "ide-debugger.h"
diff --git a/plugins/clang/clang-plugin.c b/plugins/clang/clang-plugin.c
index f1b09d1..aa69488 100644
--- a/plugins/clang/clang-plugin.c
+++ b/plugins/clang/clang-plugin.c
@@ -17,6 +17,7 @@
  */
 
 #include <libpeas/peas.h>
+#include <ide.h>
 
 #include "ide-clang-completion-item.h"
 #include "ide-clang-completion-provider.h"
@@ -44,4 +45,7 @@ peas_register_types (PeasObjectModule *module)
   peas_object_module_register_extension_type (module,
                                               IDE_TYPE_DIAGNOSTIC_PROVIDER,
                                               IDE_TYPE_CLANG_DIAGNOSTIC_PROVIDER);
+  peas_object_module_register_extension_type (module,
+                                              IDE_TYPE_COMPLETION_PROVIDER,
+                                              IDE_TYPE_CLANG_COMPLETION_PROVIDER);
 }
diff --git a/plugins/clang/ide-clang-completion-provider.c b/plugins/clang/ide-clang-completion-provider.c
index 3fe99bb..f676004 100644
--- a/plugins/clang/ide-clang-completion-provider.c
+++ b/plugins/clang/ide-clang-completion-provider.c
@@ -27,6 +27,7 @@
 #include "ide-clang-completion-provider.h"
 #include "ide-clang-service.h"
 #include "ide-clang-translation-unit.h"
+#include "ide-completion-provider.h"
 #include "ide-context.h"
 #include "ide-debug.h"
 #include "ide-file.h"
@@ -38,7 +39,7 @@
 
 struct _IdeClangCompletionProvider
 {
-  GObject parent_instance;
+  IdeObject      parent_instance;
 
   IdeSourceView *view;
   GPtrArray     *last_results;
@@ -58,10 +59,10 @@ static void completion_provider_iface_init (GtkSourceCompletionProviderIface *);
 
 G_DEFINE_TYPE_EXTENDED (IdeClangCompletionProvider,
                         ide_clang_completion_provider,
-                        G_TYPE_OBJECT,
+                        IDE_TYPE_OBJECT,
                         0,
-                        G_IMPLEMENT_INTERFACE (GTK_SOURCE_TYPE_COMPLETION_PROVIDER,
-                                               completion_provider_iface_init))
+                        G_IMPLEMENT_INTERFACE (GTK_SOURCE_TYPE_COMPLETION_PROVIDER, 
completion_provider_iface_init)
+                        G_IMPLEMENT_INTERFACE (IDE_TYPE_COMPLETION_PROVIDER, NULL))
 
 static DhBookManager *
 get_book_manager (void)
diff --git a/plugins/clang/ide-clang-completion-provider.h b/plugins/clang/ide-clang-completion-provider.h
index 8ae3138..85e4d0a 100644
--- a/plugins/clang/ide-clang-completion-provider.h
+++ b/plugins/clang/ide-clang-completion-provider.h
@@ -28,7 +28,7 @@ G_BEGIN_DECLS
 #define IDE_TYPE_CLANG_COMPLETION_PROVIDER (ide_clang_completion_provider_get_type())
 
 G_DECLARE_FINAL_TYPE (IdeClangCompletionProvider, ide_clang_completion_provider,
-                      IDE, CLANG_COMPLETION_PROVIDER, GObject)
+                      IDE, CLANG_COMPLETION_PROVIDER, IdeObject)
 
 G_END_DECLS