[gnome-todo] task-lists-workspace: Cleanup

[Georges Basile Stavracas Neto <gbsneto src gnome org>]

commit 6699c6feab30fc396282a8afca490d69a7d20f5f
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Fri May 1 11:56:22 2020 -0300

    task-lists-workspace: Cleanup

 .../gtd-plugin-task-lists-workspace.c              | 139 ---------------------
 .../gtd-task-lists-workspace.c                     |   3 +
 plugins/task-lists-workspace/meson.build           |  13 +-
 ...s-workspace.h => task-lists-workspace-plugin.c} |  21 ++--
 ...space.plugin.in => task-lists-workspace.plugin} |   2 +-
 5 files changed, 15 insertions(+), 163 deletions(-)
---
diff --git a/plugins/task-lists-workspace/gtd-task-lists-workspace.c 
b/plugins/task-lists-workspace/gtd-task-lists-workspace.c
index f073a7d..f6e3cb5 100644
--- a/plugins/task-lists-workspace/gtd-task-lists-workspace.c
+++ b/plugins/task-lists-workspace/gtd-task-lists-workspace.c
@@ -22,6 +22,7 @@
 
 #include "gtd-task-lists-workspace.h"
 
+#include "task-lists-workspace.h"
 #include "sidebar/gtd-sidebar.h"
 #include "gtd-task-list-panel.h"
 
@@ -429,6 +430,8 @@ gtd_task_lists_workspace_class_init (GtdTaskListsWorkspaceClass *klass)
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 
+  g_resources_register (task_lists_workspace_get_resource ());
+
   object_class->constructed = gtd_task_lists_workspace_constructed;
   object_class->get_property = gtd_task_lists_workspace_get_property;
   object_class->set_property = gtd_task_lists_workspace_set_property;
diff --git a/plugins/task-lists-workspace/meson.build b/plugins/task-lists-workspace/meson.build
index 130a032..a654c55 100644
--- a/plugins/task-lists-workspace/meson.build
+++ b/plugins/task-lists-workspace/meson.build
@@ -1,23 +1,17 @@
 plugin_name = 'task-lists-workspace'
 
-plugins_ldflags += ['-Wl,--undefined=gtd_plugin_task_lists_workspace_register_types']
+plugins_ldflags += ['-Wl,--undefined=task_lists_workspace_plugin_register_types']
 
 plugin_data = plugin_name + '.plugin'
 
-plugin_in = configure_file(
-          input: plugin_data + '.in',
-         output: plugin_data,
-  configuration: plugins_conf
-)
-
 sources = files(
   'sidebar/gtd-sidebar.c',
   'sidebar/gtd-sidebar-list-row.c',
   'sidebar/gtd-sidebar-panel-row.c',
   'sidebar/gtd-sidebar-provider-row.c',
-  'gtd-plugin-task-lists-workspace.c',
   'gtd-task-list-panel.c',
   'gtd-task-lists-workspace.c',
+  'task-lists-workspace-plugin.c',
 )
 
 sources += gnome.compile_resources(
@@ -25,7 +19,6 @@ sources += gnome.compile_resources(
   'task-lists-workspace.gresource.xml',
        c_name: 'task_lists_workspace',
        export: true,
- dependencies: plugin_in,
 )
 
 plugins_libs += static_library(
@@ -34,5 +27,3 @@ plugins_libs += static_library(
   include_directories: plugins_incs,
          dependencies: gnome_todo_deps
 )
-
-plugins_confs += plugin_in
diff --git a/plugins/task-lists-workspace/gtd-plugin-task-lists-workspace.h 
b/plugins/task-lists-workspace/task-lists-workspace-plugin.c
similarity index 65%
rename from plugins/task-lists-workspace/gtd-plugin-task-lists-workspace.h
rename to plugins/task-lists-workspace/task-lists-workspace-plugin.c
index 57f211c..1f9de4a 100644
--- a/plugins/task-lists-workspace/gtd-plugin-task-lists-workspace.h
+++ b/plugins/task-lists-workspace/task-lists-workspace-plugin.c
@@ -1,4 +1,4 @@
-/* gtd-plugin-task-lists-workspace.h
+/* gtd-plugin-task-lists-workspace.c
  *
  * Copyright 2020 Georges Basile Stavracas Neto <georges stavracas gmail com>
  *
@@ -18,17 +18,14 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-#pragma once
-
 #include "gnome-todo.h"
 
-#include <glib.h>
-
-G_BEGIN_DECLS
-
-#define GTD_TYPE_PLUGIN_TASK_LISTS_WORKSPACE (gtd_plugin_task_lists_workspace_get_type())
-G_DECLARE_FINAL_TYPE (GtdPluginTaskListsWorkspace, gtd_plugin_task_lists_workspace, GTD, 
PLUGIN_TASK_LISTS_WORKSPACE, PeasExtensionBase)
-
-G_MODULE_EXPORT void gtd_plugin_task_lists_workspace_register_types   (PeasObjectModule   *module);
+#include "gtd-task-lists-workspace.h"
 
-G_END_DECLS
+G_MODULE_EXPORT void
+task_lists_workspace_plugin_register_types (PeasObjectModule *module)
+{
+  peas_object_module_register_extension_type (module,
+                                              GTD_TYPE_WORKSPACE,
+                                              GTD_TYPE_TASK_LISTS_WORKSPACE);
+}
diff --git a/plugins/task-lists-workspace/task-lists-workspace.plugin.in 
b/plugins/task-lists-workspace/task-lists-workspace.plugin
similarity index 86%
rename from plugins/task-lists-workspace/task-lists-workspace.plugin.in
rename to plugins/task-lists-workspace/task-lists-workspace.plugin
index 391c2ae..dd03cbd 100644
--- a/plugins/task-lists-workspace/task-lists-workspace.plugin.in
+++ b/plugins/task-lists-workspace/task-lists-workspace.plugin
@@ -10,5 +10,5 @@ Builtin = true
 Hidden = true
 License = GPL
 Loader = C
-Embedded = gtd_plugin_task_lists_workspace_register_types
+Embedded = task_lists_workspace_plugin_register_types
 Depends =