[gnome-todo] project: Reorganize plugin structure

From: Georges Basile Stavracas Neto <gbsneto src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-todo] project: Reorganize plugin structure
Date: Sat, 2 May 2020 02:12:46 +0000 (UTC)
commit 1a45a25e3651b8a7e803ef068ffd8ed5eff5b222
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Fri May 1 17:28:38 2020 -0300

    project: Reorganize plugin structure
    
    We all need a bit of sanity, after all.

 meson.build                                        | 33 ++----------
 plugins/all-tasks-panel/meson.build                | 13 -----
 plugins/background/meson.build                     | 30 -----------
 plugins/dark-theme/meson.build                     | 18 -------
 plugins/eds/meson.build                            | 40 ---------------
 plugins/inbox-panel/meson.build                    | 13 -----
 plugins/meson.build                                | 37 --------------
 plugins/next-week-panel/meson.build                | 13 -----
 plugins/night-light/meson.build                    | 14 ------
 plugins/peace/meson.build                          | 13 -----
 plugins/scheduled-panel/meson.build                | 23 ---------
 plugins/today-panel/meson.build                    | 17 -------
 plugins/todo-txt/org.gnome.todo.txt.gschema.valid  |  0
 src/gtd-vcs.h.in                                   | 29 +++++++++++
 src/meson.build                                    | 58 +++++++++++++---------
 .../all-tasks-panel/all-tasks-panel-plugin.c       |  0
 .../all-tasks-panel/all-tasks-panel.plugin         |  0
 .../plugins}/all-tasks-panel/gtd-all-tasks-panel.c |  0
 .../plugins}/all-tasks-panel/gtd-all-tasks-panel.h |  0
 src/plugins/all-tasks-panel/meson.build            |  8 +++
 .../plugins/background/background.plugin           |  0
 .../plugins}/background/gtd-plugin-background.c    |  0
 .../plugins}/background/gtd-plugin-background.h    |  0
 src/plugins/background/meson.build                 | 14 ++++++
 .../org.gnome.todo.background.gschema.xml          |  0
 .../plugins}/background/ui/preferences.ui          |  0
 .../plugins/dark-theme/dark-theme.plugin           |  0
 .../plugins}/dark-theme/gtd-plugin-dark-theme.c    |  0
 .../plugins}/dark-theme/gtd-plugin-dark-theme.h    |  0
 src/plugins/dark-theme/meson.build                 |  5 ++
 {plugins => src/plugins}/eds/e-source-gnome-todo.c |  0
 {plugins => src/plugins}/eds/e-source-gnome-todo.h |  0
 .../eds.plugin.in => src/plugins/eds/eds.plugin    |  0
 {plugins => src/plugins}/eds/gtd-eds-autoptr.h     |  0
 {plugins => src/plugins}/eds/gtd-plugin-eds.c      |  0
 {plugins => src/plugins}/eds/gtd-plugin-eds.h      |  0
 {plugins => src/plugins}/eds/gtd-provider-eds.c    |  0
 {plugins => src/plugins}/eds/gtd-provider-eds.h    |  0
 {plugins => src/plugins}/eds/gtd-provider-goa.c    |  0
 {plugins => src/plugins}/eds/gtd-provider-goa.h    |  0
 {plugins => src/plugins}/eds/gtd-provider-local.c  |  0
 {plugins => src/plugins}/eds/gtd-provider-local.h  |  0
 {plugins => src/plugins}/eds/gtd-task-eds.c        |  0
 {plugins => src/plugins}/eds/gtd-task-eds.h        |  0
 {plugins => src/plugins}/eds/gtd-task-list-eds.c   |  0
 {plugins => src/plugins}/eds/gtd-task-list-eds.h   |  0
 src/plugins/eds/meson.build                        | 20 ++++++++
 .../plugins}/inbox-panel/gtd-inbox-panel.c         |  0
 .../plugins}/inbox-panel/gtd-inbox-panel.h         |  0
 .../plugins}/inbox-panel/inbox-panel-plugin.c      |  0
 .../plugins}/inbox-panel/inbox-panel.plugin        |  0
 src/plugins/inbox-panel/meson.build                |  6 +++
 src/plugins/meson.build                            | 58 ++++++++++++++++++++++
 .../plugins}/next-week-panel/gtd-next-week-panel.c |  0
 .../plugins}/next-week-panel/gtd-next-week-panel.h |  0
 src/plugins/next-week-panel/meson.build            |  6 +++
 .../next-week-panel/next-week-panel-plugin.c       |  0
 .../next-week-panel/next-week-panel.plugin         |  0
 .../plugins}/next-week-panel/theme/Adwaita.css     |  0
 .../plugins}/night-light/gtd-night-light-plugin.c  |  0
 .../plugins}/night-light/gtd-night-light-plugin.h  |  0
 src/plugins/night-light/meson.build                |  5 ++
 .../plugins/night-light/night-light.plugin         |  0
 .../plugins}/peace/gtd-peace-omni-area-addin.c     |  0
 .../plugins}/peace/gtd-peace-omni-area-addin.h     |  0
 src/plugins/peace/meson.build                      |  6 +++
 {plugins => src/plugins}/peace/peace-plugin.c      |  0
 {plugins => src/plugins}/peace/peace.plugin        |  0
 {plugins => src/plugins}/plugins.gresource.xml     |  0
 .../plugins}/scheduled-panel/gtd-panel-scheduled.c |  0
 .../plugins}/scheduled-panel/gtd-panel-scheduled.h |  0
 .../scheduled-panel/gtd-plugin-scheduled-panel.c   |  0
 .../scheduled-panel/gtd-plugin-scheduled-panel.h   |  0
 src/plugins/scheduled-panel/meson.build            |  6 +++
 .../plugins/scheduled-panel/scheduled-panel.plugin |  0
 .../plugins}/scheduled-panel/theme/Adwaita.css     |  0
 .../task-lists-workspace/gtd-task-list-panel.c     |  0
 .../task-lists-workspace/gtd-task-list-panel.h     |  0
 .../task-lists-workspace/gtd-task-list-panel.ui    |  0
 .../gtd-task-lists-workspace.c                     |  0
 .../gtd-task-lists-workspace.h                     |  0
 .../gtd-task-lists-workspace.ui                    |  0
 .../plugins}/task-lists-workspace/meson.build      | 15 ++----
 .../sidebar/gtd-sidebar-list-row.c                 |  0
 .../sidebar/gtd-sidebar-list-row.h                 |  0
 .../sidebar/gtd-sidebar-list-row.ui                |  0
 .../sidebar/gtd-sidebar-panel-row.c                |  0
 .../sidebar/gtd-sidebar-panel-row.h                |  0
 .../sidebar/gtd-sidebar-panel-row.ui               |  0
 .../sidebar/gtd-sidebar-provider-row.c             |  0
 .../sidebar/gtd-sidebar-provider-row.h             |  0
 .../sidebar/gtd-sidebar-provider-row.ui            |  0
 .../task-lists-workspace/sidebar/gtd-sidebar.c     |  2 +-
 .../task-lists-workspace/sidebar/gtd-sidebar.h     |  0
 .../task-lists-workspace/sidebar/gtd-sidebar.ui    |  0
 .../task-lists-workspace-plugin.c                  |  0
 .../task-lists-workspace.gresource.xml             |  0
 .../task-lists-workspace.plugin                    |  0
 .../plugins}/today-panel/gtd-panel-today.c         |  2 +-
 .../plugins}/today-panel/gtd-panel-today.h         |  0
 .../today-panel/gtd-today-omni-area-addin.c        |  0
 .../today-panel/gtd-today-omni-area-addin.h        |  0
 src/plugins/today-panel/meson.build                |  9 ++++
 .../plugins}/today-panel/theme/Adwaita.css         |  0
 .../plugins}/today-panel/today-panel-plugin.c      |  2 +-
 .../plugins}/today-panel/today-panel.plugin        |  0
 .../plugins}/todo-txt/gtd-plugin-todo-txt.c        |  0
 .../plugins}/todo-txt/gtd-plugin-todo-txt.h        |  0
 .../plugins}/todo-txt/gtd-provider-todo-txt.c      |  0
 .../plugins}/todo-txt/gtd-provider-todo-txt.h      |  0
 .../plugins}/todo-txt/gtd-task-todo-txt.c          |  0
 .../plugins}/todo-txt/gtd-task-todo-txt.h          |  0
 .../plugins}/todo-txt/gtd-todo-txt-parser.c        |  0
 .../plugins}/todo-txt/gtd-todo-txt-parser.h        |  0
 {plugins => src/plugins}/todo-txt/meson.build      |  0
 .../todo-txt/org.gnome.todo.txt.gschema.xml        |  0
 {plugins => src/plugins}/todo-txt/syntax.md        |  0
 .../plugins}/todo-txt/todo-txt.plugin.in           |  0
 .../plugins}/todoist/gtd-plugin-todoist.c          |  0
 .../plugins}/todoist/gtd-plugin-todoist.h          |  0
 .../plugins}/todoist/gtd-provider-todoist.c        |  0
 .../plugins}/todoist/gtd-provider-todoist.h        |  0
 .../todoist/gtd-todoist-preferences-panel.c        |  0
 .../todoist/gtd-todoist-preferences-panel.h        |  0
 {plugins => src/plugins}/todoist/meson.build       |  0
 {plugins => src/plugins}/todoist/todoist.plugin.in |  0
 {plugins => src/plugins}/todoist/ui/preferences.ui |  0
 .../plugins}/unscheduled-panel/meson.build         | 10 ----
 .../unscheduled-panel/unscheduled-panel.plugin     |  0
 .../unscheduled-panel/__init__.py                  |  0
 tests/meson.build                                  |  3 +-
 131 files changed, 217 insertions(+), 311 deletions(-)
---
diff --git a/meson.build b/meson.build
index 8e2b289..ee0f341 100644
--- a/meson.build
+++ b/meson.build
@@ -74,8 +74,8 @@ set_defines = [
   ['PACKAGE_STRING', '@0@ @1@'.format(meson.project_name(), gnome_todo_version)],
   ['PACKAGE_TARNAME', meson.project_name()],
   ['PACKAGE_URL', 'https://wiki.gnome.org/Apps/Todo'],
-  ['PACKAGE_VERSION', '@VCS_TAG@'],
-  ['VERSION', '@VCS_TAG@'],
+  ['PACKAGE_VERSION', meson.project_version()],
+  ['VERSION', meson.project_version()],
   # i18n
   ['GETTEXT_PACKAGE', meson.project_name()]
 ]
@@ -161,45 +161,18 @@ gnome_todo_deps = [
   cc.find_library('m', required: true)
 ]
 
-
-#######
-# VCS #
-#######
-
-vcs_identifier_h = declare_dependency(
-  sources: vcs_tag(
-    fallback: get_option('profile') != 'default'? 'devel' : 'stable',
-    input: configure_file(
-      output: 'config.h.in',
-      configuration: config_h
-    ),
-    output: 'config.h'
-  )
-)
+configure_file(output: 'config.h', configuration: config_h)
 
 gnome = import('gnome')
 i18n = import('i18n')
 pkg = import('pkgconfig')
 
-top_inc = include_directories('.')
-src_inc = include_directories(
-  'src',
-  'src/engine',
-  'src/interfaces',
-  'src/models',
-  'src/notification',
-  'src/provider',
-  'src/task-list-view',
-  'src/widgets',
-)
-
 data_dir = join_paths(meson.source_root(), 'data')
 icons_dir = join_paths(data_dir, 'icons')
 po_dir = join_paths(meson.source_root(), 'po')
 plugins_dir = join_paths(meson.source_root(), 'plugins')
 
 subdir('build-aux')
-subdir('plugins')
 subdir('src')
 subdir('data')
 subdir('po')
diff --git a/src/gtd-vcs.h.in b/src/gtd-vcs.h.in
new file mode 100644
index 0000000..9c499df
--- /dev/null
+++ b/src/gtd-vcs.h.in
@@ -0,0 +1,29 @@
+/* gtd-vcs.h
+ *
+ * Copyright 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+#pragma once
+
+#include <glib.h>
+
+G_BEGIN_DECLS
+
+#define GTD_VCS_TAG "@VCS_TAG@"
+
+G_END_DECLS
diff --git a/src/meson.build b/src/meson.build
index 0ede9ff..c2b8262 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,4 +1,37 @@
 
+sources = []
+
+#######
+# VCS #
+#######
+
+vcs_tag = vcs_tag(
+  fallback: get_option('profile') != 'default'? 'devel' : 'stable',
+     input: 'gtd-vcs.h.in',
+    output: 'gtd-vcs.h'
+)
+
+vcs_identifier_h = declare_dependency(sources: vcs_tag)
+
+gnome_todo_deps += vcs_identifier_h
+
+###########
+# Plugins #
+###########
+
+incs = include_directories(
+  'engine',
+  'interfaces',
+  'logging',
+  'models',
+  'notification',
+  'provider',
+  'task-list-view',
+  'widgets',
+)
+
+subdir('plugins')
+
 ################
 # Dependencies #
 ################
@@ -45,7 +78,7 @@ install_headers(headers, subdir: meson.project_name())
 # Source files #
 ################
 
-sources = files(
+sources += files(
   'engine/gtd-manager.c',
   'engine/gtd-plugin-manager.c',
   'interfaces/gtd-activatable.c',
@@ -101,15 +134,6 @@ sources += gnome.compile_resources(
   export: true,
 )
 
-sources += gnome.compile_resources(
-  'gtd-plugin-resources',
-  join_paths(plugins_dir, 'plugins.gresource.xml'),
-    source_dir: [ plugins_dir, join_paths(meson.build_root(), 'plugins') ],
-        c_name: 'todo_plugins',
-  dependencies: plugins_confs,
-        export: true,
-)
-
 sources += gnome.compile_resources(
   'gtd-icon-resources',
   join_paths(icons_dir, 'icons.gresource.xml'),
@@ -127,19 +151,6 @@ sources += gnome.mkenums(
   h_template: enum + '.h.template'
 )
 
-incs = [
-  top_inc,
-  include_directories(
-    'engine',
-    'provider',
-    'logging',
-    'task-list-view',
-    'notification',
-    'interfaces',
-    'widgets',
-  )
-]
-
 cflags = [
   '-DPACKAGE_DATA_DIR="@0@"'.format(gnome_todo_pkgdatadir),
   '-DPACKAGE_LIB_DIR="@0@"'.format(gnome_todo_pkglibdir),
@@ -201,7 +212,6 @@ libgtd = shared_library(
 
 libgtd_dep = declare_dependency(
             link_with: libgtd,
-  include_directories: src_inc,
          dependencies: gtd_deps
 )
 
diff --git a/plugins/all-tasks-panel/all-tasks-panel-plugin.c 
b/src/plugins/all-tasks-panel/all-tasks-panel-plugin.c
similarity index 100%
rename from plugins/all-tasks-panel/all-tasks-panel-plugin.c
rename to src/plugins/all-tasks-panel/all-tasks-panel-plugin.c
diff --git a/plugins/all-tasks-panel/all-tasks-panel.plugin 
b/src/plugins/all-tasks-panel/all-tasks-panel.plugin
similarity index 100%
rename from plugins/all-tasks-panel/all-tasks-panel.plugin
rename to src/plugins/all-tasks-panel/all-tasks-panel.plugin
diff --git a/plugins/all-tasks-panel/gtd-all-tasks-panel.c b/src/plugins/all-tasks-panel/gtd-all-tasks-panel.c
similarity index 100%
rename from plugins/all-tasks-panel/gtd-all-tasks-panel.c
rename to src/plugins/all-tasks-panel/gtd-all-tasks-panel.c
diff --git a/plugins/all-tasks-panel/gtd-all-tasks-panel.h b/src/plugins/all-tasks-panel/gtd-all-tasks-panel.h
similarity index 100%
rename from plugins/all-tasks-panel/gtd-all-tasks-panel.h
rename to src/plugins/all-tasks-panel/gtd-all-tasks-panel.h
diff --git a/src/plugins/all-tasks-panel/meson.build b/src/plugins/all-tasks-panel/meson.build
new file mode 100644
index 0000000..a89535c
--- /dev/null
+++ b/src/plugins/all-tasks-panel/meson.build
@@ -0,0 +1,8 @@
+plugins_ldflags += ['-Wl,--undefined=all_tasks_panel_plugin_register_types']
+
+all_tasks_panel_sources = files(
+  'all-tasks-panel-plugin.c',
+  'gtd-all-tasks-panel.c'
+)
+
+plugins_sources += all_tasks_panel_sources
diff --git a/plugins/background/background.plugin.in b/src/plugins/background/background.plugin
similarity index 100%
rename from plugins/background/background.plugin.in
rename to src/plugins/background/background.plugin
diff --git a/plugins/background/gtd-plugin-background.c b/src/plugins/background/gtd-plugin-background.c
similarity index 100%
rename from plugins/background/gtd-plugin-background.c
rename to src/plugins/background/gtd-plugin-background.c
diff --git a/plugins/background/gtd-plugin-background.h b/src/plugins/background/gtd-plugin-background.h
similarity index 100%
rename from plugins/background/gtd-plugin-background.h
rename to src/plugins/background/gtd-plugin-background.h
diff --git a/src/plugins/background/meson.build b/src/plugins/background/meson.build
new file mode 100644
index 0000000..5acd0fc
--- /dev/null
+++ b/src/plugins/background/meson.build
@@ -0,0 +1,14 @@
+plugins_ldflags += ['-Wl,--undefined=gtd_plugin_background_register_types']
+
+plugins_deps += [
+  dependency('libportal'),
+]
+
+plugins_sources += files(
+  'gtd-plugin-background.c',
+)
+
+install_data(
+  'org.gnome.todo.background.gschema.xml',
+  install_dir: gnome_todo_schemadir
+)
diff --git a/plugins/background/org.gnome.todo.background.gschema.xml 
b/src/plugins/background/org.gnome.todo.background.gschema.xml
similarity index 100%
rename from plugins/background/org.gnome.todo.background.gschema.xml
rename to src/plugins/background/org.gnome.todo.background.gschema.xml
diff --git a/plugins/background/ui/preferences.ui b/src/plugins/background/ui/preferences.ui
similarity index 100%
rename from plugins/background/ui/preferences.ui
rename to src/plugins/background/ui/preferences.ui
diff --git a/plugins/dark-theme/dark-theme.plugin.in b/src/plugins/dark-theme/dark-theme.plugin
similarity index 100%
rename from plugins/dark-theme/dark-theme.plugin.in
rename to src/plugins/dark-theme/dark-theme.plugin
diff --git a/plugins/dark-theme/gtd-plugin-dark-theme.c b/src/plugins/dark-theme/gtd-plugin-dark-theme.c
similarity index 100%
rename from plugins/dark-theme/gtd-plugin-dark-theme.c
rename to src/plugins/dark-theme/gtd-plugin-dark-theme.c
diff --git a/plugins/dark-theme/gtd-plugin-dark-theme.h b/src/plugins/dark-theme/gtd-plugin-dark-theme.h
similarity index 100%
rename from plugins/dark-theme/gtd-plugin-dark-theme.h
rename to src/plugins/dark-theme/gtd-plugin-dark-theme.h
diff --git a/src/plugins/dark-theme/meson.build b/src/plugins/dark-theme/meson.build
new file mode 100644
index 0000000..2330d3b
--- /dev/null
+++ b/src/plugins/dark-theme/meson.build
@@ -0,0 +1,5 @@
+plugins_ldflags += ['-Wl,--undefined=gtd_plugin_dark_theme_register_types']
+
+plugins_sources += files(
+  'gtd-plugin-dark-theme.c'
+)
diff --git a/plugins/eds/e-source-gnome-todo.c b/src/plugins/eds/e-source-gnome-todo.c
similarity index 100%
rename from plugins/eds/e-source-gnome-todo.c
rename to src/plugins/eds/e-source-gnome-todo.c
diff --git a/plugins/eds/e-source-gnome-todo.h b/src/plugins/eds/e-source-gnome-todo.h
similarity index 100%
rename from plugins/eds/e-source-gnome-todo.h
rename to src/plugins/eds/e-source-gnome-todo.h
diff --git a/plugins/eds/eds.plugin.in b/src/plugins/eds/eds.plugin
similarity index 100%
rename from plugins/eds/eds.plugin.in
rename to src/plugins/eds/eds.plugin
diff --git a/plugins/eds/gtd-eds-autoptr.h b/src/plugins/eds/gtd-eds-autoptr.h
similarity index 100%
rename from plugins/eds/gtd-eds-autoptr.h
rename to src/plugins/eds/gtd-eds-autoptr.h
diff --git a/plugins/eds/gtd-plugin-eds.c b/src/plugins/eds/gtd-plugin-eds.c
similarity index 100%
rename from plugins/eds/gtd-plugin-eds.c
rename to src/plugins/eds/gtd-plugin-eds.c
diff --git a/plugins/eds/gtd-plugin-eds.h b/src/plugins/eds/gtd-plugin-eds.h
similarity index 100%
rename from plugins/eds/gtd-plugin-eds.h
rename to src/plugins/eds/gtd-plugin-eds.h
diff --git a/plugins/eds/gtd-provider-eds.c b/src/plugins/eds/gtd-provider-eds.c
similarity index 100%
rename from plugins/eds/gtd-provider-eds.c
rename to src/plugins/eds/gtd-provider-eds.c
diff --git a/plugins/eds/gtd-provider-eds.h b/src/plugins/eds/gtd-provider-eds.h
similarity index 100%
rename from plugins/eds/gtd-provider-eds.h
rename to src/plugins/eds/gtd-provider-eds.h
diff --git a/plugins/eds/gtd-provider-goa.c b/src/plugins/eds/gtd-provider-goa.c
similarity index 100%
rename from plugins/eds/gtd-provider-goa.c
rename to src/plugins/eds/gtd-provider-goa.c
diff --git a/plugins/eds/gtd-provider-goa.h b/src/plugins/eds/gtd-provider-goa.h
similarity index 100%
rename from plugins/eds/gtd-provider-goa.h
rename to src/plugins/eds/gtd-provider-goa.h
diff --git a/plugins/eds/gtd-provider-local.c b/src/plugins/eds/gtd-provider-local.c
similarity index 100%
rename from plugins/eds/gtd-provider-local.c
rename to src/plugins/eds/gtd-provider-local.c
diff --git a/plugins/eds/gtd-provider-local.h b/src/plugins/eds/gtd-provider-local.h
similarity index 100%
rename from plugins/eds/gtd-provider-local.h
rename to src/plugins/eds/gtd-provider-local.h
diff --git a/plugins/eds/gtd-task-eds.c b/src/plugins/eds/gtd-task-eds.c
similarity index 100%
rename from plugins/eds/gtd-task-eds.c
rename to src/plugins/eds/gtd-task-eds.c
diff --git a/plugins/eds/gtd-task-eds.h b/src/plugins/eds/gtd-task-eds.h
similarity index 100%
rename from plugins/eds/gtd-task-eds.h
rename to src/plugins/eds/gtd-task-eds.h
diff --git a/plugins/eds/gtd-task-list-eds.c b/src/plugins/eds/gtd-task-list-eds.c
similarity index 100%
rename from plugins/eds/gtd-task-list-eds.c
rename to src/plugins/eds/gtd-task-list-eds.c
diff --git a/plugins/eds/gtd-task-list-eds.h b/src/plugins/eds/gtd-task-list-eds.h
similarity index 100%
rename from plugins/eds/gtd-task-list-eds.h
rename to src/plugins/eds/gtd-task-list-eds.h
diff --git a/src/plugins/eds/meson.build b/src/plugins/eds/meson.build
new file mode 100644
index 0000000..bbcae42
--- /dev/null
+++ b/src/plugins/eds/meson.build
@@ -0,0 +1,20 @@
+plugins_ldflags += ['-Wl,--undefined=gtd_plugin_eds_register_types']
+
+################
+# Dependencies #
+################
+
+plugins_deps += [
+  dependency('libecal-2.0', version: '>= 3.33.2'),
+  dependency('libedataserver-1.2', version: '>= 3.32.0'),
+]
+
+plugins_sources += files(
+  'e-source-gnome-todo.c',
+  'gtd-plugin-eds.c',
+  'gtd-provider-eds.c',
+  'gtd-provider-goa.c',
+  'gtd-provider-local.c',
+  'gtd-task-eds.c',
+  'gtd-task-list-eds.c',
+)
diff --git a/plugins/inbox-panel/gtd-inbox-panel.c b/src/plugins/inbox-panel/gtd-inbox-panel.c
similarity index 100%
rename from plugins/inbox-panel/gtd-inbox-panel.c
rename to src/plugins/inbox-panel/gtd-inbox-panel.c
diff --git a/plugins/inbox-panel/gtd-inbox-panel.h b/src/plugins/inbox-panel/gtd-inbox-panel.h
similarity index 100%
rename from plugins/inbox-panel/gtd-inbox-panel.h
rename to src/plugins/inbox-panel/gtd-inbox-panel.h
diff --git a/plugins/inbox-panel/inbox-panel-plugin.c b/src/plugins/inbox-panel/inbox-panel-plugin.c
similarity index 100%
rename from plugins/inbox-panel/inbox-panel-plugin.c
rename to src/plugins/inbox-panel/inbox-panel-plugin.c
diff --git a/plugins/inbox-panel/inbox-panel.plugin b/src/plugins/inbox-panel/inbox-panel.plugin
similarity index 100%
rename from plugins/inbox-panel/inbox-panel.plugin
rename to src/plugins/inbox-panel/inbox-panel.plugin
diff --git a/src/plugins/inbox-panel/meson.build b/src/plugins/inbox-panel/meson.build
new file mode 100644
index 0000000..6bbc2ea
--- /dev/null
+++ b/src/plugins/inbox-panel/meson.build
@@ -0,0 +1,6 @@
+plugins_ldflags += ['-Wl,--undefined=inbox_panel_plugin_register_types']
+
+plugins_sources += files(
+  'gtd-inbox-panel.c',
+  'inbox-panel-plugin.c'
+)
diff --git a/src/plugins/meson.build b/src/plugins/meson.build
new file mode 100644
index 0000000..96a3a52
--- /dev/null
+++ b/src/plugins/meson.build
@@ -0,0 +1,58 @@
+plugins_incs = [
+  incs,
+  include_directories('..'),
+]
+
+plugins_sources = []
+plugins_deps = [ gnome_todo_deps ]
+plugins_ldflags = []
+plugins_libs = []
+plugins_confs = []
+
+plugins_conf = configuration_data()
+plugins_conf.set('VERSION', gnome_todo_version)
+
+subdir('all-tasks-panel')
+subdir('background')
+subdir('dark-theme')
+subdir('eds')
+subdir('inbox-panel')
+subdir('next-week-panel')
+subdir('night-light')
+subdir('peace')
+subdir('scheduled-panel')
+subdir('task-lists-workspace')
+subdir('today-panel')
+
+#if get_option('unscheduled_panel_plugin')
+  #subdir('unscheduled-panel')
+#endif
+
+#if get_option('todo_txt_plugin')
+  #subdir('todo-txt')
+#endif
+
+#if get_option('todoist_plugin')
+  #subdir('todoist')
+#endif
+
+plugins_sources += gnome.compile_resources(
+  'gtd-plugin-resources',
+  'plugins.gresource.xml',
+        c_name: 'todo_plugins',
+  dependencies: plugins_confs,
+        export: true,
+)
+
+plugins_lib = static_library(
+            'plugins',
+      plugins_sources,
+         dependencies: plugins_deps,
+  include_directories: plugins_incs,
+            link_with: plugins_libs,
+            link_args: plugins_ldflags,
+)
+
+plugins_dep = declare_dependency(
+  link_whole: plugins_lib,
+)
diff --git a/plugins/next-week-panel/gtd-next-week-panel.c b/src/plugins/next-week-panel/gtd-next-week-panel.c
similarity index 100%
rename from plugins/next-week-panel/gtd-next-week-panel.c
rename to src/plugins/next-week-panel/gtd-next-week-panel.c
diff --git a/plugins/next-week-panel/gtd-next-week-panel.h b/src/plugins/next-week-panel/gtd-next-week-panel.h
similarity index 100%
rename from plugins/next-week-panel/gtd-next-week-panel.h
rename to src/plugins/next-week-panel/gtd-next-week-panel.h
diff --git a/src/plugins/next-week-panel/meson.build b/src/plugins/next-week-panel/meson.build
new file mode 100644
index 0000000..3dc865d
--- /dev/null
+++ b/src/plugins/next-week-panel/meson.build
@@ -0,0 +1,6 @@
+plugins_ldflags += ['-Wl,--undefined=next_week_panel_plugin_register_types']
+
+plugins_sources += files(
+  'gtd-next-week-panel.c',
+  'next-week-panel-plugin.c'
+)
diff --git a/plugins/next-week-panel/next-week-panel-plugin.c 
b/src/plugins/next-week-panel/next-week-panel-plugin.c
similarity index 100%
rename from plugins/next-week-panel/next-week-panel-plugin.c
rename to src/plugins/next-week-panel/next-week-panel-plugin.c
diff --git a/plugins/next-week-panel/next-week-panel.plugin 
b/src/plugins/next-week-panel/next-week-panel.plugin
similarity index 100%
rename from plugins/next-week-panel/next-week-panel.plugin
rename to src/plugins/next-week-panel/next-week-panel.plugin
diff --git a/plugins/next-week-panel/theme/Adwaita.css b/src/plugins/next-week-panel/theme/Adwaita.css
similarity index 100%
rename from plugins/next-week-panel/theme/Adwaita.css
rename to src/plugins/next-week-panel/theme/Adwaita.css
diff --git a/plugins/night-light/gtd-night-light-plugin.c b/src/plugins/night-light/gtd-night-light-plugin.c
similarity index 100%
rename from plugins/night-light/gtd-night-light-plugin.c
rename to src/plugins/night-light/gtd-night-light-plugin.c
diff --git a/plugins/night-light/gtd-night-light-plugin.h b/src/plugins/night-light/gtd-night-light-plugin.h
similarity index 100%
rename from plugins/night-light/gtd-night-light-plugin.h
rename to src/plugins/night-light/gtd-night-light-plugin.h
diff --git a/src/plugins/night-light/meson.build b/src/plugins/night-light/meson.build
new file mode 100644
index 0000000..84aeace
--- /dev/null
+++ b/src/plugins/night-light/meson.build
@@ -0,0 +1,5 @@
+plugins_ldflags += ['-Wl,--undefined=gtd_night_light_plugin_register_types']
+
+plugins_sources += files(
+  'gtd-night-light-plugin.c',
+)
diff --git a/plugins/night-light/night-light.plugin.in b/src/plugins/night-light/night-light.plugin
similarity index 100%
rename from plugins/night-light/night-light.plugin.in
rename to src/plugins/night-light/night-light.plugin
diff --git a/plugins/peace/gtd-peace-omni-area-addin.c b/src/plugins/peace/gtd-peace-omni-area-addin.c
similarity index 100%
rename from plugins/peace/gtd-peace-omni-area-addin.c
rename to src/plugins/peace/gtd-peace-omni-area-addin.c
diff --git a/plugins/peace/gtd-peace-omni-area-addin.h b/src/plugins/peace/gtd-peace-omni-area-addin.h
similarity index 100%
rename from plugins/peace/gtd-peace-omni-area-addin.h
rename to src/plugins/peace/gtd-peace-omni-area-addin.h
diff --git a/src/plugins/peace/meson.build b/src/plugins/peace/meson.build
new file mode 100644
index 0000000..ad1cb20
--- /dev/null
+++ b/src/plugins/peace/meson.build
@@ -0,0 +1,6 @@
+plugins_ldflags += ['-Wl,--undefined=peace_plugin_register_types']
+
+plugins_sources += files(
+  'gtd-peace-omni-area-addin.c',
+  'peace-plugin.c',
+)
diff --git a/plugins/peace/peace-plugin.c b/src/plugins/peace/peace-plugin.c
similarity index 100%
rename from plugins/peace/peace-plugin.c
rename to src/plugins/peace/peace-plugin.c
diff --git a/plugins/peace/peace.plugin b/src/plugins/peace/peace.plugin
similarity index 100%
rename from plugins/peace/peace.plugin
rename to src/plugins/peace/peace.plugin
diff --git a/plugins/plugins.gresource.xml b/src/plugins/plugins.gresource.xml
similarity index 100%
rename from plugins/plugins.gresource.xml
rename to src/plugins/plugins.gresource.xml
diff --git a/plugins/scheduled-panel/gtd-panel-scheduled.c b/src/plugins/scheduled-panel/gtd-panel-scheduled.c
similarity index 100%
rename from plugins/scheduled-panel/gtd-panel-scheduled.c
rename to src/plugins/scheduled-panel/gtd-panel-scheduled.c
diff --git a/plugins/scheduled-panel/gtd-panel-scheduled.h b/src/plugins/scheduled-panel/gtd-panel-scheduled.h
similarity index 100%
rename from plugins/scheduled-panel/gtd-panel-scheduled.h
rename to src/plugins/scheduled-panel/gtd-panel-scheduled.h
diff --git a/plugins/scheduled-panel/gtd-plugin-scheduled-panel.c 
b/src/plugins/scheduled-panel/gtd-plugin-scheduled-panel.c
similarity index 100%
rename from plugins/scheduled-panel/gtd-plugin-scheduled-panel.c
rename to src/plugins/scheduled-panel/gtd-plugin-scheduled-panel.c
diff --git a/plugins/scheduled-panel/gtd-plugin-scheduled-panel.h 
b/src/plugins/scheduled-panel/gtd-plugin-scheduled-panel.h
similarity index 100%
rename from plugins/scheduled-panel/gtd-plugin-scheduled-panel.h
rename to src/plugins/scheduled-panel/gtd-plugin-scheduled-panel.h
diff --git a/src/plugins/scheduled-panel/meson.build b/src/plugins/scheduled-panel/meson.build
new file mode 100644
index 0000000..e720573
--- /dev/null
+++ b/src/plugins/scheduled-panel/meson.build
@@ -0,0 +1,6 @@
+plugins_ldflags += ['-Wl,--undefined=gtd_plugin_scheduled_panel_register_types']
+
+plugins_sources += files(
+  'gtd-panel-scheduled.c',
+  'gtd-plugin-scheduled-panel.c'
+)
diff --git a/plugins/scheduled-panel/scheduled-panel.plugin.in 
b/src/plugins/scheduled-panel/scheduled-panel.plugin
similarity index 100%
rename from plugins/scheduled-panel/scheduled-panel.plugin.in
rename to src/plugins/scheduled-panel/scheduled-panel.plugin
diff --git a/plugins/scheduled-panel/theme/Adwaita.css b/src/plugins/scheduled-panel/theme/Adwaita.css
similarity index 100%
rename from plugins/scheduled-panel/theme/Adwaita.css
rename to src/plugins/scheduled-panel/theme/Adwaita.css
diff --git a/plugins/task-lists-workspace/gtd-task-list-panel.c 
b/src/plugins/task-lists-workspace/gtd-task-list-panel.c
similarity index 100%
rename from plugins/task-lists-workspace/gtd-task-list-panel.c
rename to src/plugins/task-lists-workspace/gtd-task-list-panel.c
diff --git a/plugins/task-lists-workspace/gtd-task-list-panel.h 
b/src/plugins/task-lists-workspace/gtd-task-list-panel.h
similarity index 100%
rename from plugins/task-lists-workspace/gtd-task-list-panel.h
rename to src/plugins/task-lists-workspace/gtd-task-list-panel.h
diff --git a/plugins/task-lists-workspace/gtd-task-list-panel.ui 
b/src/plugins/task-lists-workspace/gtd-task-list-panel.ui
similarity index 100%
rename from plugins/task-lists-workspace/gtd-task-list-panel.ui
rename to src/plugins/task-lists-workspace/gtd-task-list-panel.ui
diff --git a/plugins/task-lists-workspace/gtd-task-lists-workspace.c 
b/src/plugins/task-lists-workspace/gtd-task-lists-workspace.c
similarity index 100%
rename from plugins/task-lists-workspace/gtd-task-lists-workspace.c
rename to src/plugins/task-lists-workspace/gtd-task-lists-workspace.c
diff --git a/plugins/task-lists-workspace/gtd-task-lists-workspace.h 
b/src/plugins/task-lists-workspace/gtd-task-lists-workspace.h
similarity index 100%
rename from plugins/task-lists-workspace/gtd-task-lists-workspace.h
rename to src/plugins/task-lists-workspace/gtd-task-lists-workspace.h
diff --git a/plugins/task-lists-workspace/gtd-task-lists-workspace.ui 
b/src/plugins/task-lists-workspace/gtd-task-lists-workspace.ui
similarity index 100%
rename from plugins/task-lists-workspace/gtd-task-lists-workspace.ui
rename to src/plugins/task-lists-workspace/gtd-task-lists-workspace.ui
diff --git a/plugins/task-lists-workspace/meson.build b/src/plugins/task-lists-workspace/meson.build
similarity index 60%
rename from plugins/task-lists-workspace/meson.build
rename to src/plugins/task-lists-workspace/meson.build
index a654c55..b619d42 100644
--- a/plugins/task-lists-workspace/meson.build
+++ b/src/plugins/task-lists-workspace/meson.build
@@ -1,10 +1,6 @@
-plugin_name = 'task-lists-workspace'
-
 plugins_ldflags += ['-Wl,--undefined=task_lists_workspace_plugin_register_types']
 
-plugin_data = plugin_name + '.plugin'
-
-sources = files(
+task_lists_panel_sources = files(
   'sidebar/gtd-sidebar.c',
   'sidebar/gtd-sidebar-list-row.c',
   'sidebar/gtd-sidebar-panel-row.c',
@@ -14,16 +10,11 @@ sources = files(
   'task-lists-workspace-plugin.c',
 )
 
-sources += gnome.compile_resources(
+task_lists_panel_sources += gnome.compile_resources(
   'task-lists-workspace',
   'task-lists-workspace.gresource.xml',
        c_name: 'task_lists_workspace',
        export: true,
 )
 
-plugins_libs += static_library(
-          plugin_name,
-              sources: sources,
-  include_directories: plugins_incs,
-         dependencies: gnome_todo_deps
-)
+plugins_sources += task_lists_panel_sources
diff --git a/plugins/task-lists-workspace/sidebar/gtd-sidebar-list-row.c 
b/src/plugins/task-lists-workspace/sidebar/gtd-sidebar-list-row.c
similarity index 100%
rename from plugins/task-lists-workspace/sidebar/gtd-sidebar-list-row.c
rename to src/plugins/task-lists-workspace/sidebar/gtd-sidebar-list-row.c
diff --git a/plugins/task-lists-workspace/sidebar/gtd-sidebar-list-row.h 
b/src/plugins/task-lists-workspace/sidebar/gtd-sidebar-list-row.h
similarity index 100%
rename from plugins/task-lists-workspace/sidebar/gtd-sidebar-list-row.h
rename to src/plugins/task-lists-workspace/sidebar/gtd-sidebar-list-row.h
diff --git a/plugins/task-lists-workspace/sidebar/gtd-sidebar-list-row.ui 
b/src/plugins/task-lists-workspace/sidebar/gtd-sidebar-list-row.ui
similarity index 100%
rename from plugins/task-lists-workspace/sidebar/gtd-sidebar-list-row.ui
rename to src/plugins/task-lists-workspace/sidebar/gtd-sidebar-list-row.ui
diff --git a/plugins/task-lists-workspace/sidebar/gtd-sidebar-panel-row.c 
b/src/plugins/task-lists-workspace/sidebar/gtd-sidebar-panel-row.c
similarity index 100%
rename from plugins/task-lists-workspace/sidebar/gtd-sidebar-panel-row.c
rename to src/plugins/task-lists-workspace/sidebar/gtd-sidebar-panel-row.c
diff --git a/plugins/task-lists-workspace/sidebar/gtd-sidebar-panel-row.h 
b/src/plugins/task-lists-workspace/sidebar/gtd-sidebar-panel-row.h
similarity index 100%
rename from plugins/task-lists-workspace/sidebar/gtd-sidebar-panel-row.h
rename to src/plugins/task-lists-workspace/sidebar/gtd-sidebar-panel-row.h
diff --git a/plugins/task-lists-workspace/sidebar/gtd-sidebar-panel-row.ui 
b/src/plugins/task-lists-workspace/sidebar/gtd-sidebar-panel-row.ui
similarity index 100%
rename from plugins/task-lists-workspace/sidebar/gtd-sidebar-panel-row.ui
rename to src/plugins/task-lists-workspace/sidebar/gtd-sidebar-panel-row.ui
diff --git a/plugins/task-lists-workspace/sidebar/gtd-sidebar-provider-row.c 
b/src/plugins/task-lists-workspace/sidebar/gtd-sidebar-provider-row.c
similarity index 100%
rename from plugins/task-lists-workspace/sidebar/gtd-sidebar-provider-row.c
rename to src/plugins/task-lists-workspace/sidebar/gtd-sidebar-provider-row.c
diff --git a/plugins/task-lists-workspace/sidebar/gtd-sidebar-provider-row.h 
b/src/plugins/task-lists-workspace/sidebar/gtd-sidebar-provider-row.h
similarity index 100%
rename from plugins/task-lists-workspace/sidebar/gtd-sidebar-provider-row.h
rename to src/plugins/task-lists-workspace/sidebar/gtd-sidebar-provider-row.h
diff --git a/plugins/task-lists-workspace/sidebar/gtd-sidebar-provider-row.ui 
b/src/plugins/task-lists-workspace/sidebar/gtd-sidebar-provider-row.ui
similarity index 100%
rename from plugins/task-lists-workspace/sidebar/gtd-sidebar-provider-row.ui
rename to src/plugins/task-lists-workspace/sidebar/gtd-sidebar-provider-row.ui
diff --git a/plugins/task-lists-workspace/sidebar/gtd-sidebar.c 
b/src/plugins/task-lists-workspace/sidebar/gtd-sidebar.c
similarity index 99%
rename from plugins/task-lists-workspace/sidebar/gtd-sidebar.c
rename to src/plugins/task-lists-workspace/sidebar/gtd-sidebar.c
index 8f4ae02..696cc8f 100644
--- a/plugins/task-lists-workspace/sidebar/gtd-sidebar.c
+++ b/src/plugins/task-lists-workspace/sidebar/gtd-sidebar.c
@@ -20,6 +20,7 @@
 
 #define G_LOG_DOMAIN "GtdSidebar"
 
+#include "../gtd-task-list-panel.h"
 #include "gtd-debug.h"
 #include "gtd-manager.h"
 #include "gtd-panel.h"
@@ -29,7 +30,6 @@
 #include "gtd-sidebar-panel-row.h"
 #include "gtd-sidebar-provider-row.h"
 #include "gtd-task-list.h"
-#include "gtd-task-list-panel.h"
 #include "gtd-utils.h"
 #include "notification/gtd-notification.h"
 
diff --git a/plugins/task-lists-workspace/sidebar/gtd-sidebar.h 
b/src/plugins/task-lists-workspace/sidebar/gtd-sidebar.h
similarity index 100%
rename from plugins/task-lists-workspace/sidebar/gtd-sidebar.h
rename to src/plugins/task-lists-workspace/sidebar/gtd-sidebar.h
diff --git a/plugins/task-lists-workspace/sidebar/gtd-sidebar.ui 
b/src/plugins/task-lists-workspace/sidebar/gtd-sidebar.ui
similarity index 100%
rename from plugins/task-lists-workspace/sidebar/gtd-sidebar.ui
rename to src/plugins/task-lists-workspace/sidebar/gtd-sidebar.ui
diff --git a/plugins/task-lists-workspace/task-lists-workspace-plugin.c 
b/src/plugins/task-lists-workspace/task-lists-workspace-plugin.c
similarity index 100%
rename from plugins/task-lists-workspace/task-lists-workspace-plugin.c
rename to src/plugins/task-lists-workspace/task-lists-workspace-plugin.c
diff --git a/plugins/task-lists-workspace/task-lists-workspace.gresource.xml 
b/src/plugins/task-lists-workspace/task-lists-workspace.gresource.xml
similarity index 100%
rename from plugins/task-lists-workspace/task-lists-workspace.gresource.xml
rename to src/plugins/task-lists-workspace/task-lists-workspace.gresource.xml
diff --git a/plugins/task-lists-workspace/task-lists-workspace.plugin 
b/src/plugins/task-lists-workspace/task-lists-workspace.plugin
similarity index 100%
rename from plugins/task-lists-workspace/task-lists-workspace.plugin
rename to src/plugins/task-lists-workspace/task-lists-workspace.plugin
diff --git a/plugins/today-panel/gtd-panel-today.c b/src/plugins/today-panel/gtd-panel-today.c
similarity index 99%
rename from plugins/today-panel/gtd-panel-today.c
rename to src/plugins/today-panel/gtd-panel-today.c
index 71f438d..9cc861d 100644
--- a/plugins/today-panel/gtd-panel-today.c
+++ b/src/plugins/today-panel/gtd-panel-today.c
@@ -18,7 +18,7 @@
 
 #define G_LOG_DOMAIN "GtdPanelToday"
 
-#include "gnome-todo.h"
+#include <gnome-todo.h>
 #include "gtd-panel-today.h"
 
 #include <glib/gi18n.h>
diff --git a/plugins/today-panel/gtd-panel-today.h b/src/plugins/today-panel/gtd-panel-today.h
similarity index 100%
rename from plugins/today-panel/gtd-panel-today.h
rename to src/plugins/today-panel/gtd-panel-today.h
diff --git a/plugins/today-panel/gtd-today-omni-area-addin.c 
b/src/plugins/today-panel/gtd-today-omni-area-addin.c
similarity index 100%
rename from plugins/today-panel/gtd-today-omni-area-addin.c
rename to src/plugins/today-panel/gtd-today-omni-area-addin.c
diff --git a/plugins/today-panel/gtd-today-omni-area-addin.h 
b/src/plugins/today-panel/gtd-today-omni-area-addin.h
similarity index 100%
rename from plugins/today-panel/gtd-today-omni-area-addin.h
rename to src/plugins/today-panel/gtd-today-omni-area-addin.h
diff --git a/src/plugins/today-panel/meson.build b/src/plugins/today-panel/meson.build
new file mode 100644
index 0000000..b37b748
--- /dev/null
+++ b/src/plugins/today-panel/meson.build
@@ -0,0 +1,9 @@
+plugins_ldflags += ['-Wl,--undefined=today_panel_plugin_register_types']
+
+today_panel_sources = files(
+  'gtd-panel-today.c',
+  'gtd-today-omni-area-addin.c',
+  'today-panel-plugin.c'
+)
+
+plugins_sources += today_panel_sources
diff --git a/plugins/today-panel/theme/Adwaita.css b/src/plugins/today-panel/theme/Adwaita.css
similarity index 100%
rename from plugins/today-panel/theme/Adwaita.css
rename to src/plugins/today-panel/theme/Adwaita.css
diff --git a/plugins/today-panel/today-panel-plugin.c b/src/plugins/today-panel/today-panel-plugin.c
similarity index 98%
rename from plugins/today-panel/today-panel-plugin.c
rename to src/plugins/today-panel/today-panel-plugin.c
index 0d88d1e..89a60e7 100644
--- a/plugins/today-panel/today-panel-plugin.c
+++ b/src/plugins/today-panel/today-panel-plugin.c
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gnome-todo.h"
+#include <gnome-todo.h>
 
 #include "gtd-panel-today.h"
 #include "gtd-today-omni-area-addin.h"
diff --git a/plugins/today-panel/today-panel.plugin b/src/plugins/today-panel/today-panel.plugin
similarity index 100%
rename from plugins/today-panel/today-panel.plugin
rename to src/plugins/today-panel/today-panel.plugin
diff --git a/plugins/todo-txt/gtd-plugin-todo-txt.c b/src/plugins/todo-txt/gtd-plugin-todo-txt.c
similarity index 100%
rename from plugins/todo-txt/gtd-plugin-todo-txt.c
rename to src/plugins/todo-txt/gtd-plugin-todo-txt.c
diff --git a/plugins/todo-txt/gtd-plugin-todo-txt.h b/src/plugins/todo-txt/gtd-plugin-todo-txt.h
similarity index 100%
rename from plugins/todo-txt/gtd-plugin-todo-txt.h
rename to src/plugins/todo-txt/gtd-plugin-todo-txt.h
diff --git a/plugins/todo-txt/gtd-provider-todo-txt.c b/src/plugins/todo-txt/gtd-provider-todo-txt.c
similarity index 100%
rename from plugins/todo-txt/gtd-provider-todo-txt.c
rename to src/plugins/todo-txt/gtd-provider-todo-txt.c
diff --git a/plugins/todo-txt/gtd-provider-todo-txt.h b/src/plugins/todo-txt/gtd-provider-todo-txt.h
similarity index 100%
rename from plugins/todo-txt/gtd-provider-todo-txt.h
rename to src/plugins/todo-txt/gtd-provider-todo-txt.h
diff --git a/plugins/todo-txt/gtd-task-todo-txt.c b/src/plugins/todo-txt/gtd-task-todo-txt.c
similarity index 100%
rename from plugins/todo-txt/gtd-task-todo-txt.c
rename to src/plugins/todo-txt/gtd-task-todo-txt.c
diff --git a/plugins/todo-txt/gtd-task-todo-txt.h b/src/plugins/todo-txt/gtd-task-todo-txt.h
similarity index 100%
rename from plugins/todo-txt/gtd-task-todo-txt.h
rename to src/plugins/todo-txt/gtd-task-todo-txt.h
diff --git a/plugins/todo-txt/gtd-todo-txt-parser.c b/src/plugins/todo-txt/gtd-todo-txt-parser.c
similarity index 100%
rename from plugins/todo-txt/gtd-todo-txt-parser.c
rename to src/plugins/todo-txt/gtd-todo-txt-parser.c
diff --git a/plugins/todo-txt/gtd-todo-txt-parser.h b/src/plugins/todo-txt/gtd-todo-txt-parser.h
similarity index 100%
rename from plugins/todo-txt/gtd-todo-txt-parser.h
rename to src/plugins/todo-txt/gtd-todo-txt-parser.h
diff --git a/plugins/todo-txt/meson.build b/src/plugins/todo-txt/meson.build
similarity index 100%
rename from plugins/todo-txt/meson.build
rename to src/plugins/todo-txt/meson.build
diff --git a/plugins/todo-txt/org.gnome.todo.txt.gschema.xml 
b/src/plugins/todo-txt/org.gnome.todo.txt.gschema.xml
similarity index 100%
rename from plugins/todo-txt/org.gnome.todo.txt.gschema.xml
rename to src/plugins/todo-txt/org.gnome.todo.txt.gschema.xml
diff --git a/plugins/todo-txt/syntax.md b/src/plugins/todo-txt/syntax.md
similarity index 100%
rename from plugins/todo-txt/syntax.md
rename to src/plugins/todo-txt/syntax.md
diff --git a/plugins/todo-txt/todo-txt.plugin.in b/src/plugins/todo-txt/todo-txt.plugin.in
similarity index 100%
rename from plugins/todo-txt/todo-txt.plugin.in
rename to src/plugins/todo-txt/todo-txt.plugin.in
diff --git a/plugins/todoist/gtd-plugin-todoist.c b/src/plugins/todoist/gtd-plugin-todoist.c
similarity index 100%
rename from plugins/todoist/gtd-plugin-todoist.c
rename to src/plugins/todoist/gtd-plugin-todoist.c
diff --git a/plugins/todoist/gtd-plugin-todoist.h b/src/plugins/todoist/gtd-plugin-todoist.h
similarity index 100%
rename from plugins/todoist/gtd-plugin-todoist.h
rename to src/plugins/todoist/gtd-plugin-todoist.h
diff --git a/plugins/todoist/gtd-provider-todoist.c b/src/plugins/todoist/gtd-provider-todoist.c
similarity index 100%
rename from plugins/todoist/gtd-provider-todoist.c
rename to src/plugins/todoist/gtd-provider-todoist.c
diff --git a/plugins/todoist/gtd-provider-todoist.h b/src/plugins/todoist/gtd-provider-todoist.h
similarity index 100%
rename from plugins/todoist/gtd-provider-todoist.h
rename to src/plugins/todoist/gtd-provider-todoist.h
diff --git a/plugins/todoist/gtd-todoist-preferences-panel.c 
b/src/plugins/todoist/gtd-todoist-preferences-panel.c
similarity index 100%
rename from plugins/todoist/gtd-todoist-preferences-panel.c
rename to src/plugins/todoist/gtd-todoist-preferences-panel.c
diff --git a/plugins/todoist/gtd-todoist-preferences-panel.h 
b/src/plugins/todoist/gtd-todoist-preferences-panel.h
similarity index 100%
rename from plugins/todoist/gtd-todoist-preferences-panel.h
rename to src/plugins/todoist/gtd-todoist-preferences-panel.h
diff --git a/plugins/todoist/meson.build b/src/plugins/todoist/meson.build
similarity index 100%
rename from plugins/todoist/meson.build
rename to src/plugins/todoist/meson.build
diff --git a/plugins/todoist/todoist.plugin.in b/src/plugins/todoist/todoist.plugin.in
similarity index 100%
rename from plugins/todoist/todoist.plugin.in
rename to src/plugins/todoist/todoist.plugin.in
diff --git a/plugins/todoist/ui/preferences.ui b/src/plugins/todoist/ui/preferences.ui
similarity index 100%
rename from plugins/todoist/ui/preferences.ui
rename to src/plugins/todoist/ui/preferences.ui
diff --git a/plugins/unscheduled-panel/meson.build b/src/plugins/unscheduled-panel/meson.build
similarity index 50%
rename from plugins/unscheduled-panel/meson.build
rename to src/plugins/unscheduled-panel/meson.build
index 1d4c4be..f2c648a 100644
--- a/plugins/unscheduled-panel/meson.build
+++ b/src/plugins/unscheduled-panel/meson.build
@@ -6,13 +6,3 @@ install_data(
   join_paths(plugin_name, '__init__.py'),
   install_dir: join_paths(plugin_dir, plugin_name)
 )
-
-plugin_data = plugin_name + '.plugin'
-
-plugins_confs += configure_file(
-  input: plugin_data + '.in',
-  output: plugin_data,
-  install: true,
-  install_dir: plugin_dir,
-  configuration: plugins_conf
-)
diff --git a/plugins/unscheduled-panel/unscheduled-panel.plugin.in 
b/src/plugins/unscheduled-panel/unscheduled-panel.plugin
similarity index 100%
rename from plugins/unscheduled-panel/unscheduled-panel.plugin.in
rename to src/plugins/unscheduled-panel/unscheduled-panel.plugin
diff --git a/plugins/unscheduled-panel/unscheduled-panel/__init__.py 
b/src/plugins/unscheduled-panel/unscheduled-panel/__init__.py
similarity index 100%
rename from plugins/unscheduled-panel/unscheduled-panel/__init__.py
rename to src/plugins/unscheduled-panel/unscheduled-panel/__init__.py
diff --git a/tests/meson.build b/tests/meson.build
index 3e0d695..6e43993 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -7,8 +7,9 @@ sources = files(
 )
 
 tests_incs = [
-  src_inc,
+  include_directories('../src'),
   include_directories('.'),
+  incs,
 ]
 
 libgtd_tests = static_library(
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]