[gnome-builder: 94/139] html-completion: port to libide-sourceview

[Christian Hergert <chergert src gnome org>]

commit 78ea5a006177a894b5ccaa2cfefb1c7e4b3a0e40
Author: Christian Hergert <chergert redhat com>
Date:   Wed Jan 9 17:27:19 2019 -0800

    html-completion: port to libide-sourceview

 .../html-completion/html-completion-plugin.c        |  8 +++++---
 .../html-completion/html-completion.gresource.xml   |  2 +-
 src/plugins/html-completion/html-completion.plugin  | 10 +++++-----
 src/plugins/html-completion/ide-html-proposal.h     |  2 +-
 src/plugins/html-completion/meson.build             | 21 ++++++++++-----------
 5 files changed, 22 insertions(+), 21 deletions(-)
---
diff --git a/src/plugins/html-completion/html-completion-plugin.c 
b/src/plugins/html-completion/html-completion-plugin.c
index 767998ca8..fb2781ed6 100644
--- a/src/plugins/html-completion/html-completion-plugin.c
+++ b/src/plugins/html-completion/html-completion-plugin.c
@@ -18,13 +18,15 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-#include <ide.h>
+#include "config.h"
+
+#include <libide-sourceview.h>
 #include <libpeas/peas.h>
 
 #include "ide-html-completion-provider.h"
 
-void
-ide_html_completion_register_types (PeasObjectModule *module)
+_IDE_EXTERN void
+_ide_html_completion_register_types (PeasObjectModule *module)
 {
   peas_object_module_register_extension_type (module,
                                               IDE_TYPE_COMPLETION_PROVIDER,
diff --git a/src/plugins/html-completion/html-completion.gresource.xml 
b/src/plugins/html-completion/html-completion.gresource.xml
index cadc5638f..b6939bdf5 100644
--- a/src/plugins/html-completion/html-completion.gresource.xml
+++ b/src/plugins/html-completion/html-completion.gresource.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
-  <gresource prefix="/org/gnome/builder/plugins">
+  <gresource prefix="/plugins/html-completion">
     <file>html-completion.plugin</file>
   </gresource>
 </gresources>
diff --git a/src/plugins/html-completion/html-completion.plugin 
b/src/plugins/html-completion/html-completion.plugin
index 5fea16855..33c0b4b0c 100644
--- a/src/plugins/html-completion/html-completion.plugin
+++ b/src/plugins/html-completion/html-completion.plugin
@@ -1,9 +1,9 @@
 [Plugin]
-Module=html-completion-plugin
-Name=HTML Auto-Completion
-Description=Provides auto-completion when authoring HTML documents
 Authors=Christian Hergert <christian hergert me>
-Copyright=Copyright © 2015 Christian Hergert
 Builtin=true
+Copyright=Copyright © 2015 Christian Hergert
+Description=Provides auto-completion when authoring HTML documents
+Embedded=_ide_html_completion_register_types
+Module=html-completion
+Name=HTML Auto-Completion
 X-Completion-Provider-Languages=asp,dtl,html,php,css
-Embedded=ide_html_completion_register_types
diff --git a/src/plugins/html-completion/ide-html-proposal.h b/src/plugins/html-completion/ide-html-proposal.h
index e107f0159..1d50c07cb 100644
--- a/src/plugins/html-completion/ide-html-proposal.h
+++ b/src/plugins/html-completion/ide-html-proposal.h
@@ -20,7 +20,7 @@
 
 #pragma once
 
-#include <ide.h>
+#include <libide-sourceview.h>
 
 #include "ide-html-proposals.h"
 
diff --git a/src/plugins/html-completion/meson.build b/src/plugins/html-completion/meson.build
index 1b5b78f83..a44ec62f4 100644
--- a/src/plugins/html-completion/meson.build
+++ b/src/plugins/html-completion/meson.build
@@ -1,19 +1,18 @@
-if get_option('with_html_completion')
+if get_option('plugin_html_completion')
 
-html_completion_resources = gnome.compile_resources(
-  'html-completion-resources',
-  'html-completion.gresource.xml',
-  c_name: 'gbp_html_completion',
-)
-
-html_completion_sources = [
+plugins_sources += files([
   'html-completion-plugin.c',
   'ide-html-completion-provider.c',
   'ide-html-proposal.c',
   'ide-html-proposals.c',
-]
+])
+
+plugin_html_completion_resources = gnome.compile_resources(
+  'gbp-html-completion-resources',
+  'html-completion.gresource.xml',
+  c_name: 'gbp_html_completion',
+)
 
-gnome_builder_plugins_sources += files(html_completion_sources)
-gnome_builder_plugins_sources += html_completion_resources[0]
+plugins_sources += plugin_html_completion_resources[0]
 
 endif