[gnome-todo] all-tasks-panel: Cleanup



commit 4221812cc1262be8aceb15b976d5f16469e3f473
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Fri May 1 11:23:59 2020 -0300

    all-tasks-panel: Cleanup

 ...-all-tasks-panel.h => all-tasks-panel-plugin.c} |  25 ++--
 ...asks-panel.plugin.in => all-tasks-panel.plugin} |   2 +-
 .../all-tasks-panel/gtd-plugin-all-tasks-panel.c   | 133 ---------------------
 plugins/all-tasks-panel/meson.build                |  12 +-
 4 files changed, 16 insertions(+), 156 deletions(-)
---
diff --git a/plugins/all-tasks-panel/gtd-plugin-all-tasks-panel.h 
b/plugins/all-tasks-panel/all-tasks-panel-plugin.c
similarity index 60%
rename from plugins/all-tasks-panel/gtd-plugin-all-tasks-panel.h
rename to plugins/all-tasks-panel/all-tasks-panel-plugin.c
index 3ebc5a3..5ee037b 100644
--- a/plugins/all-tasks-panel/gtd-plugin-all-tasks-panel.h
+++ b/plugins/all-tasks-panel/all-tasks-panel-plugin.c
@@ -1,6 +1,6 @@
-/* gtd-plugin-all-tasks-panel.h
+/* gtd-plugin-all-tasks-panel.c
  *
- * Copyright 2018 Georges Basile Stavracas Neto <georges stavracas gmail com>
+ * Copyright 2018-2020 Georges Basile Stavracas Neto <georges stavracas gmail com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,18 +18,17 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-#pragma once
 
-#include "gnome-todo.h"
-
-#include <glib.h>
-
-G_BEGIN_DECLS
+#define G_LOG_DOMAIN "GtdPluginAllTasksPanel"
 
-#define GTD_TYPE_PLUGIN_ALL_TASKS_PANEL (gtd_plugin_all_tasks_panel_get_type())
-
-G_DECLARE_FINAL_TYPE (GtdPluginAllTasksPanel, gtd_plugin_all_tasks_panel, GTD, PLUGIN_ALL_TASKS_PANEL, 
PeasExtensionBase)
+#include "gnome-todo.h"
 
-G_MODULE_EXPORT void gtd_plugin_all_tasks_panel_register_types   (PeasObjectModule   *module);
+#include "gtd-all-tasks-panel.h"
 
-G_END_DECLS
+G_MODULE_EXPORT void
+all_tasks_panel_plugin_register_types (PeasObjectModule *module)
+{
+  peas_object_module_register_extension_type (module,
+                                              GTD_TYPE_PANEL,
+                                              GTD_TYPE_ALL_TASKS_PANEL);
+}
diff --git a/plugins/all-tasks-panel/all-tasks-panel.plugin.in 
b/plugins/all-tasks-panel/all-tasks-panel.plugin
similarity index 85%
rename from plugins/all-tasks-panel/all-tasks-panel.plugin.in
rename to plugins/all-tasks-panel/all-tasks-panel.plugin
index 148f7c2..01707d2 100644
--- a/plugins/all-tasks-panel/all-tasks-panel.plugin.in
+++ b/plugins/all-tasks-panel/all-tasks-panel.plugin
@@ -9,5 +9,5 @@ Website = https://wiki.gnome.org/Apps/Todo
 Builtin = true
 License = GPL
 Loader = C
-Embedded = gtd_plugin_all_tasks_panel_register_types
+Embedded = all_tasks_panel_plugin_register_types
 Depends =
diff --git a/plugins/all-tasks-panel/meson.build b/plugins/all-tasks-panel/meson.build
index 97bdb8a..6542413 100644
--- a/plugins/all-tasks-panel/meson.build
+++ b/plugins/all-tasks-panel/meson.build
@@ -1,8 +1,8 @@
-plugins_ldflags += ['-Wl,--undefined=gtd_plugin_all_tasks_panel_register_types']
+plugins_ldflags += ['-Wl,--undefined=all_tasks_panel_plugin_register_types']
 
 sources = files(
-  'gtd-all-tasks-panel.c',
-  'gtd-plugin-all-tasks-panel.c'
+  'all-tasks-panel-plugin.c',
+  'gtd-all-tasks-panel.c'
 )
 
 plugins_libs += static_library(
@@ -11,9 +11,3 @@ plugins_libs += static_library(
   include_directories: plugins_incs,
          dependencies: gnome_todo_deps
 )
-
-plugins_confs += configure_file(
-          input: 'all-tasks-panel.plugin.in',
-         output: 'all-tasks-panel.plugin',
-  configuration: plugins_conf
-)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]