[gnome-builder: 113/139] python-pack: port to updated libide-code

[Christian Hergert <chergert src gnome org>]

commit 45185d78548f76400903bbc329d1b4e1cd5c712d
Author: Christian Hergert <chergert redhat com>
Date:   Wed Jan 9 17:34:40 2019 -0800

    python-pack: port to updated libide-code

 src/plugins/python-pack/ide-python-indenter.c     |  2 +-
 src/plugins/python-pack/ide-python-indenter.h     |  2 +-
 src/plugins/python-pack/meson.build               | 22 ++++++++++------------
 src/plugins/python-pack/python-pack-plugin.c      | 11 ++++++++---
 src/plugins/python-pack/python-pack.gresource.xml |  2 +-
 src/plugins/python-pack/python-pack.plugin        | 17 +++++++++--------
 6 files changed, 30 insertions(+), 26 deletions(-)
---
diff --git a/src/plugins/python-pack/ide-python-indenter.c b/src/plugins/python-pack/ide-python-indenter.c
index 0b218c580..2599a3284 100644
--- a/src/plugins/python-pack/ide-python-indenter.c
+++ b/src/plugins/python-pack/ide-python-indenter.c
@@ -20,8 +20,8 @@
 
 #define G_LOG_DOMAIN "ide-python-indenter"
 
-#include <libpeas/peas.h>
 #include <gtksourceview/gtksource.h>
+#include <libide-sourceview.h>
 #include <string.h>
 
 #include "ide-python-indenter.h"
diff --git a/src/plugins/python-pack/ide-python-indenter.h b/src/plugins/python-pack/ide-python-indenter.h
index 395b70ea9..e158fb27b 100644
--- a/src/plugins/python-pack/ide-python-indenter.h
+++ b/src/plugins/python-pack/ide-python-indenter.h
@@ -20,7 +20,7 @@
 
 #pragma once
 
-#include <ide.h>
+#include <libide-core.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/plugins/python-pack/meson.build b/src/plugins/python-pack/meson.build
index bdddd8818..a369bfa9f 100644
--- a/src/plugins/python-pack/meson.build
+++ b/src/plugins/python-pack/meson.build
@@ -1,18 +1,16 @@
-if get_option('with_python_pack')
+if get_option('plugin_python_pack')
 
-python_pack_resources = gnome.compile_resources(
-  'python-pack-resources',
-  'python-pack.gresource.xml',
-  c_name: 'ide_python_pack',
-)
-
-python_pack_sources = [
+plugins_sources += files([
   'ide-python-indenter.c',
-  'ide-python-indenter.h',
   'python-pack-plugin.c',
-]
+])
+
+plugin_python_pack_resources = gnome.compile_resources(
+  'gbp-python-pack-resources',
+  'python-pack.gresource.xml',
+  c_name: 'gbp_python_pack',
+)
 
-gnome_builder_plugins_sources += files(python_pack_sources)
-gnome_builder_plugins_sources += python_pack_resources[0]
+plugins_sources += plugin_python_pack_resources[0]
 
 endif
diff --git a/src/plugins/python-pack/python-pack-plugin.c b/src/plugins/python-pack/python-pack-plugin.c
index 3398c8c1d..76d4cca9d 100644
--- a/src/plugins/python-pack/python-pack-plugin.c
+++ b/src/plugins/python-pack/python-pack-plugin.c
@@ -18,12 +18,17 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
+#include "config.h"
+
 #include <libpeas/peas.h>
+#include <libide-sourceview.h>
 
 #include "ide-python-indenter.h"
 
-void
-ide_python_pack_register_types (PeasObjectModule *module)
+_IDE_EXTERN void
+_ide_python_pack_register_types (PeasObjectModule *module)
 {
-  peas_object_module_register_extension_type (module, IDE_TYPE_INDENTER, IDE_TYPE_PYTHON_INDENTER);
+  peas_object_module_register_extension_type (module,
+                                              IDE_TYPE_INDENTER,
+                                              IDE_TYPE_PYTHON_INDENTER);
 }
diff --git a/src/plugins/python-pack/python-pack.gresource.xml 
b/src/plugins/python-pack/python-pack.gresource.xml
index a272e6fd7..d82a4475b 100644
--- a/src/plugins/python-pack/python-pack.gresource.xml
+++ b/src/plugins/python-pack/python-pack.gresource.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
-  <gresource prefix="/org/gnome/builder/plugins">
+  <gresource prefix="/plugins/python-pack">
     <file>python-pack.plugin</file>
   </gresource>
 </gresources>
diff --git a/src/plugins/python-pack/python-pack.plugin b/src/plugins/python-pack/python-pack.plugin
index 97401a27e..1ae54ac79 100644
--- a/src/plugins/python-pack/python-pack.plugin
+++ b/src/plugins/python-pack/python-pack.plugin
@@ -1,12 +1,13 @@
 [Plugin]
-Module=python-pack-plugin
-Name=Python Auto-Indenter
-Description=Provides auto-indentation for the Python programming language
 Authors=Christian Hergert <christian hergert me>
-Copyright=Copyright © 2015 Christian Hergert
 Builtin=true
-Embedded=ide_python_pack_register_types
-X-Indenter-Languages=python,python3
-X-Indenter-Languages-Priority=0
-X-Completion-Provider-Languages=python,python3
+Copyright=Copyright © 2015 Christian Hergert
+Depends=editor;
+Description=Provides auto-indentation for the Python programming language
+Embedded=_ide_python_pack_register_types
+Module=python-pack
+Name=Python Auto-Indenter
 X-Completion-Provider-Languages-Priority=0
+X-Completion-Provider-Languages=python,python3
+X-Indenter-Languages-Priority=0
+X-Indenter-Languages=python,python3