[gnome-todo] task-lists-workspace: Move sidebar to parent folder

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

commit 53515e4026237eaf53aa33d59d051724886c375c
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Fri May 1 22:47:14 2020 -0300

    task-lists-workspace: Move sidebar to parent folder

 .../task-lists-workspace/{sidebar => }/gtd-sidebar-list-row.c     | 2 +-
 .../task-lists-workspace/{sidebar => }/gtd-sidebar-list-row.h     | 0
 .../task-lists-workspace/{sidebar => }/gtd-sidebar-list-row.ui    | 0
 .../task-lists-workspace/{sidebar => }/gtd-sidebar-panel-row.c    | 2 +-
 .../task-lists-workspace/{sidebar => }/gtd-sidebar-panel-row.h    | 0
 .../task-lists-workspace/{sidebar => }/gtd-sidebar-panel-row.ui   | 0
 .../task-lists-workspace/{sidebar => }/gtd-sidebar-provider-row.c | 2 +-
 .../task-lists-workspace/{sidebar => }/gtd-sidebar-provider-row.h | 0
 .../{sidebar => }/gtd-sidebar-provider-row.ui                     | 0
 src/plugins/task-lists-workspace/{sidebar => }/gtd-sidebar.c      | 4 ++--
 src/plugins/task-lists-workspace/{sidebar => }/gtd-sidebar.h      | 0
 src/plugins/task-lists-workspace/{sidebar => }/gtd-sidebar.ui     | 0
 src/plugins/task-lists-workspace/gtd-task-lists-workspace.c       | 2 +-
 src/plugins/task-lists-workspace/meson.build                      | 8 ++++----
 .../task-lists-workspace/task-lists-workspace.gresource.xml       | 8 ++++----
 15 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/src/plugins/task-lists-workspace/sidebar/gtd-sidebar-list-row.c 
b/src/plugins/task-lists-workspace/gtd-sidebar-list-row.c
similarity index 98%
rename from src/plugins/task-lists-workspace/sidebar/gtd-sidebar-list-row.c
rename to src/plugins/task-lists-workspace/gtd-sidebar-list-row.c
index 86e1a73..a18b09c 100644
--- a/src/plugins/task-lists-workspace/sidebar/gtd-sidebar-list-row.c
+++ b/src/plugins/task-lists-workspace/gtd-sidebar-list-row.c
@@ -232,7 +232,7 @@ gtd_sidebar_list_row_class_init (GtdSidebarListRowClass *klass)
 
   g_object_class_install_properties (object_class, N_PROPS, properties);
 
-  gtk_widget_class_set_template_from_resource (widget_class, 
"/org/gnome/todo/plugins/task-lists-workspace/sidebar/gtd-sidebar-list-row.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, 
"/org/gnome/todo/plugins/task-lists-workspace/gtd-sidebar-list-row.ui");
 
   gtk_widget_class_bind_template_child (widget_class, GtdSidebarListRow, color_icon);
   gtk_widget_class_bind_template_child (widget_class, GtdSidebarListRow, name_label);
diff --git a/src/plugins/task-lists-workspace/sidebar/gtd-sidebar-list-row.h 
b/src/plugins/task-lists-workspace/gtd-sidebar-list-row.h
similarity index 100%
rename from src/plugins/task-lists-workspace/sidebar/gtd-sidebar-list-row.h
rename to src/plugins/task-lists-workspace/gtd-sidebar-list-row.h
diff --git a/src/plugins/task-lists-workspace/sidebar/gtd-sidebar-list-row.ui 
b/src/plugins/task-lists-workspace/gtd-sidebar-list-row.ui
similarity index 100%
rename from src/plugins/task-lists-workspace/sidebar/gtd-sidebar-list-row.ui
rename to src/plugins/task-lists-workspace/gtd-sidebar-list-row.ui
diff --git a/src/plugins/task-lists-workspace/sidebar/gtd-sidebar-panel-row.c 
b/src/plugins/task-lists-workspace/gtd-sidebar-panel-row.c
similarity index 98%
rename from src/plugins/task-lists-workspace/sidebar/gtd-sidebar-panel-row.c
rename to src/plugins/task-lists-workspace/gtd-sidebar-panel-row.c
index c133b3d..a379f24 100644
--- a/src/plugins/task-lists-workspace/sidebar/gtd-sidebar-panel-row.c
+++ b/src/plugins/task-lists-workspace/gtd-sidebar-panel-row.c
@@ -150,7 +150,7 @@ gtd_sidebar_panel_row_class_init (GtdSidebarPanelRowClass *klass)
 
   g_object_class_install_properties (object_class, N_PROPS, properties);
 
-  gtk_widget_class_set_template_from_resource (widget_class, 
"/org/gnome/todo/plugins/task-lists-workspace/sidebar/gtd-sidebar-panel-row.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, 
"/org/gnome/todo/plugins/task-lists-workspace/gtd-sidebar-panel-row.ui");
 
   gtk_widget_class_bind_template_child (widget_class, GtdSidebarPanelRow, panel_icon);
   gtk_widget_class_bind_template_child (widget_class, GtdSidebarPanelRow, subtitle_label);
diff --git a/src/plugins/task-lists-workspace/sidebar/gtd-sidebar-panel-row.h 
b/src/plugins/task-lists-workspace/gtd-sidebar-panel-row.h
similarity index 100%
rename from src/plugins/task-lists-workspace/sidebar/gtd-sidebar-panel-row.h
rename to src/plugins/task-lists-workspace/gtd-sidebar-panel-row.h
diff --git a/src/plugins/task-lists-workspace/sidebar/gtd-sidebar-panel-row.ui 
b/src/plugins/task-lists-workspace/gtd-sidebar-panel-row.ui
similarity index 100%
rename from src/plugins/task-lists-workspace/sidebar/gtd-sidebar-panel-row.ui
rename to src/plugins/task-lists-workspace/gtd-sidebar-panel-row.ui
diff --git a/src/plugins/task-lists-workspace/sidebar/gtd-sidebar-provider-row.c 
b/src/plugins/task-lists-workspace/gtd-sidebar-provider-row.c
similarity index 99%
rename from src/plugins/task-lists-workspace/sidebar/gtd-sidebar-provider-row.c
rename to src/plugins/task-lists-workspace/gtd-sidebar-provider-row.c
index 4c66e31..19bb256 100644
--- a/src/plugins/task-lists-workspace/sidebar/gtd-sidebar-provider-row.c
+++ b/src/plugins/task-lists-workspace/gtd-sidebar-provider-row.c
@@ -262,7 +262,7 @@ gtd_sidebar_provider_row_class_init (GtdSidebarProviderRowClass *klass)
 
   g_object_class_install_properties (object_class, N_PROPS, properties);
 
-  gtk_widget_class_set_template_from_resource (widget_class, 
"/org/gnome/todo/plugins/task-lists-workspace/sidebar/gtd-sidebar-provider-row.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, 
"/org/gnome/todo/plugins/task-lists-workspace/gtd-sidebar-provider-row.ui");
 
   gtk_widget_class_bind_template_child (widget_class, GtdSidebarProviderRow, loading_label);
   gtk_widget_class_bind_template_child (widget_class, GtdSidebarProviderRow, provider_label);
diff --git a/src/plugins/task-lists-workspace/sidebar/gtd-sidebar-provider-row.h 
b/src/plugins/task-lists-workspace/gtd-sidebar-provider-row.h
similarity index 100%
rename from src/plugins/task-lists-workspace/sidebar/gtd-sidebar-provider-row.h
rename to src/plugins/task-lists-workspace/gtd-sidebar-provider-row.h
diff --git a/src/plugins/task-lists-workspace/sidebar/gtd-sidebar-provider-row.ui 
b/src/plugins/task-lists-workspace/gtd-sidebar-provider-row.ui
similarity index 100%
rename from src/plugins/task-lists-workspace/sidebar/gtd-sidebar-provider-row.ui
rename to src/plugins/task-lists-workspace/gtd-sidebar-provider-row.ui
diff --git a/src/plugins/task-lists-workspace/sidebar/gtd-sidebar.c 
b/src/plugins/task-lists-workspace/gtd-sidebar.c
similarity index 99%
rename from src/plugins/task-lists-workspace/sidebar/gtd-sidebar.c
rename to src/plugins/task-lists-workspace/gtd-sidebar.c
index 696cc8f..ce69dc5 100644
--- a/src/plugins/task-lists-workspace/sidebar/gtd-sidebar.c
+++ b/src/plugins/task-lists-workspace/gtd-sidebar.c
@@ -20,7 +20,6 @@
 
 #define G_LOG_DOMAIN "GtdSidebar"
 
-#include "../gtd-task-list-panel.h"
 #include "gtd-debug.h"
 #include "gtd-manager.h"
 #include "gtd-panel.h"
@@ -30,6 +29,7 @@
 #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"
 
@@ -804,7 +804,7 @@ gtd_sidebar_class_init (GtdSidebarClass *klass)
 
   object_class->constructed = gtd_sidebar_constructed;
 
-  gtk_widget_class_set_template_from_resource (widget_class, 
"/org/gnome/todo/plugins/task-lists-workspace/sidebar/gtd-sidebar.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, 
"/org/gnome/todo/plugins/task-lists-workspace/gtd-sidebar.ui");
 
   gtk_widget_class_bind_template_child (widget_class, GtdSidebar, archive_listbox);
   gtk_widget_class_bind_template_child (widget_class, GtdSidebar, archive_row);
diff --git a/src/plugins/task-lists-workspace/sidebar/gtd-sidebar.h 
b/src/plugins/task-lists-workspace/gtd-sidebar.h
similarity index 100%
rename from src/plugins/task-lists-workspace/sidebar/gtd-sidebar.h
rename to src/plugins/task-lists-workspace/gtd-sidebar.h
diff --git a/src/plugins/task-lists-workspace/sidebar/gtd-sidebar.ui 
b/src/plugins/task-lists-workspace/gtd-sidebar.ui
similarity index 100%
rename from src/plugins/task-lists-workspace/sidebar/gtd-sidebar.ui
rename to src/plugins/task-lists-workspace/gtd-sidebar.ui
diff --git a/src/plugins/task-lists-workspace/gtd-task-lists-workspace.c 
b/src/plugins/task-lists-workspace/gtd-task-lists-workspace.c
index f6e3cb5..7093479 100644
--- a/src/plugins/task-lists-workspace/gtd-task-lists-workspace.c
+++ b/src/plugins/task-lists-workspace/gtd-task-lists-workspace.c
@@ -23,7 +23,7 @@
 #include "gtd-task-lists-workspace.h"
 
 #include "task-lists-workspace.h"
-#include "sidebar/gtd-sidebar.h"
+#include "gtd-sidebar.h"
 #include "gtd-task-list-panel.h"
 
 #include <libpeas/peas.h>
diff --git a/src/plugins/task-lists-workspace/meson.build b/src/plugins/task-lists-workspace/meson.build
index b619d42..b80dc50 100644
--- a/src/plugins/task-lists-workspace/meson.build
+++ b/src/plugins/task-lists-workspace/meson.build
@@ -1,10 +1,10 @@
 plugins_ldflags += ['-Wl,--undefined=task_lists_workspace_plugin_register_types']
 
 task_lists_panel_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-sidebar.c',
+  'gtd-sidebar-list-row.c',
+  'gtd-sidebar-panel-row.c',
+  'gtd-sidebar-provider-row.c',
   'gtd-task-list-panel.c',
   'gtd-task-lists-workspace.c',
   'task-lists-workspace-plugin.c',
diff --git a/src/plugins/task-lists-workspace/task-lists-workspace.gresource.xml 
b/src/plugins/task-lists-workspace/task-lists-workspace.gresource.xml
index 9add680..cf76721 100644
--- a/src/plugins/task-lists-workspace/task-lists-workspace.gresource.xml
+++ b/src/plugins/task-lists-workspace/task-lists-workspace.gresource.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/org/gnome/todo/plugins/task-lists-workspace">
-    <file>sidebar/gtd-sidebar.ui</file>
-    <file>sidebar/gtd-sidebar-list-row.ui</file>
-    <file>sidebar/gtd-sidebar-panel-row.ui</file>
-    <file>sidebar/gtd-sidebar-provider-row.ui</file>
+    <file>gtd-sidebar.ui</file>
+    <file>gtd-sidebar-list-row.ui</file>
+    <file>gtd-sidebar-panel-row.ui</file>
+    <file>gtd-sidebar-provider-row.ui</file>
     <file>gtd-task-list-panel.ui</file>
     <file>gtd-task-lists-workspace.ui</file>
     <file>task-lists-workspace.plugin</file>