[gnome-todo] provider: Remove default task lists



commit 66b6162d57d45bacc370efb1b0ba6b1a3b2f62c6
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Sun Apr 26 18:44:41 2020 -0300

    provider: Remove default task lists

 doc/reference/gnome-todo-sections.txt |  2 -
 plugins/eds/gtd-provider-eds.c        | 86 -----------------------------------
 src/engine/gtd-manager.c              | 69 ----------------------------
 src/engine/gtd-manager.h              |  5 --
 src/interfaces/gtd-provider.c         | 48 -------------------
 src/interfaces/gtd-provider.h         | 10 ----
 tests/dummy-provider.c                | 18 +-------
 7 files changed, 1 insertion(+), 237 deletions(-)
---
diff --git a/doc/reference/gnome-todo-sections.txt b/doc/reference/gnome-todo-sections.txt
index 2c39d76..aae8e52 100644
--- a/doc/reference/gnome-todo-sections.txt
+++ b/doc/reference/gnome-todo-sections.txt
@@ -28,8 +28,6 @@ gtd_manager_get_default
 gtd_manager_get_task_lists
 gtd_manager_get_providers
 gtd_manager_get_panels
-gtd_manager_get_default_provider
-gtd_manager_set_default_provider
 gtd_manager_get_settings
 gtd_manager_get_is_first_run
 gtd_manager_set_is_first_run
diff --git a/plugins/eds/gtd-provider-eds.c b/plugins/eds/gtd-provider-eds.c
index 547219c..7c75f99 100644
--- a/plugins/eds/gtd-provider-eds.c
+++ b/plugins/eds/gtd-provider-eds.c
@@ -61,7 +61,6 @@ enum
 {
   PROP_0,
   PROP_ENABLED,
-  PROP_DEFAULT_TASKLIST,
   PROP_DESCRIPTION,
   PROP_ICON,
   PROP_ID,
@@ -117,7 +116,6 @@ on_task_list_eds_loaded_cb (GObject      *source_object,
                             GAsyncResult *result,
                             gpointer      user_data)
 {
-  g_autoptr (ESource) default_source = NULL;
   g_autoptr (GError) error = NULL;
   GtdProviderEdsPrivate *priv;
   GtdProviderEds *self;
@@ -139,12 +137,6 @@ on_task_list_eds_loaded_cb (GObject      *source_object,
   g_hash_table_insert (priv->task_lists, e_source_dup_uid (source), g_object_ref (list));
   g_object_set_data (G_OBJECT (source), "task-list", list);
 
-  /* Check if the current list is the default one */
-  default_source = e_source_registry_ref_default_task_list (priv->source_registry);
-
-  if (default_source == source)
-    g_object_notify (G_OBJECT (self), "default-task-list");
-
   g_debug ("Task list '%s' successfully connected", e_source_get_display_name (source));
 }
 
@@ -242,27 +234,6 @@ on_source_removed_cb (GtdProviderEds *provider,
   GTD_EXIT;
 }
 
-static void
-on_default_tasklist_changed_cb (ESourceRegistry *source_registry,
-                                GParamSpec      *pspec,
-                                GtdProviderEds  *self)
-{
-  GtdTaskList *list;
-  ESource *default_source;
-
-  default_source = e_source_registry_ref_default_task_list (source_registry);
-  list = g_object_get_data (G_OBJECT (default_source), "task-list");
-
-  /* The list might not be loaded yet */
-  if (!list || gtd_task_list_get_provider (list) != (GtdProvider*) self)
-    goto out;
-
-  g_object_notify (G_OBJECT (self), "default-task-list");
-
-out:
-  g_clear_object (&default_source);
-}
-
 static void
 on_source_refreshed_cb (GObject      *source_object,
                         GAsyncResult *result,
@@ -772,45 +743,6 @@ gtd_provider_eds_get_inbox (GtdProvider *provider)
   return g_hash_table_lookup (priv->task_lists, "system-task-list");
 }
 
-static GtdTaskList*
-gtd_provider_eds_get_default_task_list (GtdProvider *provider)
-{
-  GtdProviderEdsPrivate *priv;
-  GtdTaskList *default_task_list;
-  ESource *default_source;
-
-  priv = gtd_provider_eds_get_instance_private (GTD_PROVIDER_EDS (provider));
-  default_source = e_source_registry_ref_default_task_list (priv->source_registry);
-  default_task_list = g_object_get_data (G_OBJECT (default_source), "task-list");
-
-  g_clear_object (&default_source);
-
-  if (default_task_list &&
-      gtd_task_list_get_provider (default_task_list) != GTD_PROVIDER (provider))
-    {
-      return NULL;
-    }
-
-  return default_task_list;
-}
-
-static void
-gtd_provider_eds_set_default_task_list (GtdProvider *provider,
-                                        GtdTaskList *list)
-{
-  GtdProviderEdsPrivate *priv;
-  ESource *source;
-
-  g_assert (GTD_IS_TASK_LIST_EDS (list));
-
-  priv = gtd_provider_eds_get_instance_private (GTD_PROVIDER_EDS (provider));
-  source = gtd_task_list_eds_get_source (GTD_TASK_LIST_EDS (list));
-
-  e_source_registry_set_default_task_list (priv->source_registry, source);
-
-  g_object_notify (G_OBJECT (provider), "default-task-list");
-}
-
 static void
 gtd_provider_iface_init (GtdProviderInterface *iface)
 {
@@ -829,8 +761,6 @@ gtd_provider_iface_init (GtdProviderInterface *iface)
   iface->remove_task_list = gtd_provider_eds_remove_task_list;
   iface->get_task_lists = gtd_provider_eds_get_task_lists;
   iface->get_inbox = gtd_provider_eds_get_inbox;
-  iface->get_default_task_list = gtd_provider_eds_get_default_task_list;
-  iface->set_default_task_list = gtd_provider_eds_set_default_task_list;
 }
 
 
@@ -844,8 +774,6 @@ gtd_provider_eds_finalize (GObject *object)
   GtdProviderEds *self = (GtdProviderEds *)object;
   GtdProviderEdsPrivate *priv = gtd_provider_eds_get_instance_private (self);
 
-  g_signal_handlers_disconnect_by_func (priv->source_registry, on_default_tasklist_changed_cb, self);
-
   g_cancellable_cancel (priv->cancellable);
 
   g_clear_object (&priv->cancellable);
@@ -891,11 +819,6 @@ gtd_provider_eds_constructed (GObject *object)
                             "source-removed",
                             G_CALLBACK (on_source_removed_cb),
                             self);
-
-  g_signal_connect (priv->source_registry,
-                    "notify::default-task-list",
-                    G_CALLBACK (on_default_tasklist_changed_cb),
-                    self);
 }
 
 static void
@@ -910,10 +833,6 @@ gtd_provider_eds_get_property (GObject    *object,
 
   switch (prop_id)
     {
-    case PROP_DEFAULT_TASKLIST:
-      g_value_set_object (value, gtd_provider_eds_get_default_task_list (provider));
-      break;
-
     case PROP_DESCRIPTION:
       g_value_set_string (value, gtd_provider_eds_get_description (provider));
       break;
@@ -958,10 +877,6 @@ gtd_provider_eds_set_property (GObject      *object,
 
   switch (prop_id)
     {
-    case PROP_DEFAULT_TASKLIST:
-      gtd_provider_eds_set_default_task_list (GTD_PROVIDER (self), g_value_get_object (value));
-      break;
-
     case PROP_REGISTRY:
       if (g_set_object (&priv->source_registry, g_value_get_object (value)))
         g_object_notify (object, "registry");
@@ -982,7 +897,6 @@ gtd_provider_eds_class_init (GtdProviderEdsClass *klass)
   object_class->get_property = gtd_provider_eds_get_property;
   object_class->set_property = gtd_provider_eds_set_property;
 
-  g_object_class_override_property (object_class, PROP_DEFAULT_TASKLIST, "default-task-list");
   g_object_class_override_property (object_class, PROP_DESCRIPTION, "description");
   g_object_class_override_property (object_class, PROP_ENABLED, "enabled");
   g_object_class_override_property (object_class, PROP_ICON, "icon");
diff --git a/src/engine/gtd-manager.c b/src/engine/gtd-manager.c
index d292518..5aab998 100644
--- a/src/engine/gtd-manager.c
+++ b/src/engine/gtd-manager.c
@@ -91,7 +91,6 @@ enum
 {
   PROP_0,
   PROP_DEFAULT_PROVIDER,
-  PROP_DEFAULT_TASKLIST,
   PROP_CLOCK,
   PROP_PLUGIN_MANAGER,
   LAST_PROP
@@ -373,10 +372,6 @@ gtd_manager_get_property (GObject    *object,
       g_value_set_object (value, self->default_provider);
       break;
 
-    case PROP_DEFAULT_TASKLIST:
-      g_value_set_object (value, gtd_provider_get_default_task_list (self->default_provider));
-      break;
-
     case PROP_CLOCK:
       g_value_set_object (value, self->clock);
       break;
@@ -405,10 +400,6 @@ gtd_manager_set_property (GObject      *object,
         g_object_notify (object, "default-provider");
       break;
 
-    case PROP_DEFAULT_TASKLIST:
-      gtd_manager_set_default_task_list (self, g_value_get_object (value));
-      break;
-
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
     }
@@ -437,20 +428,6 @@ gtd_manager_class_init (GtdManagerClass *klass)
                              GTD_TYPE_PROVIDER,
                              G_PARAM_READWRITE));
 
-  /**
-   * GtdManager::default-task-list:
-   *
-   * The default provider.
-   */
-  g_object_class_install_property (
-        object_class,
-        PROP_DEFAULT_TASKLIST,
-        g_param_spec_object ("default-task-list",
-                             "The default task list of the application",
-                             "The default task list of the application",
-                             GTD_TYPE_TASK_LIST,
-                             G_PARAM_READWRITE));
-
   /**
    * GtdManager::clock:
    *
@@ -814,52 +791,6 @@ gtd_manager_get_inbox (GtdManager *self)
   return NULL;
 }
 
-/**
- * gtd_manager_get_default_task_list:
- * @self: a #GtdManager
- *
- * Retrieves the default tasklist of the default provider.
- *
- * Returns: (transfer none)(nullable): a #GtdTaskList
- */
-GtdTaskList*
-gtd_manager_get_default_task_list (GtdManager *self)
-{
-  g_return_val_if_fail (GTD_IS_MANAGER (self), NULL);
-
-  if (!self->default_provider)
-    return NULL;
-
-  return gtd_provider_get_default_task_list (self->default_provider);
-}
-
-/**
- * gtd_manager_set_default_task_list:
- * @self: a #GtdManager
- * @list: (nullable): a #GtdTaskList, or %NULL
- *
- * Sets the default task list of the application.
- */
-void
-gtd_manager_set_default_task_list (GtdManager  *self,
-                                   GtdTaskList *list)
-{
-  g_return_if_fail (GTD_IS_MANAGER (self));
-  g_return_if_fail (GTD_IS_TASK_LIST (list));
-
-  if (list)
-    {
-      GtdProvider *provider;
-
-      provider = gtd_task_list_get_provider (list);
-
-      gtd_manager_set_default_provider (self, provider);
-      gtd_provider_set_default_task_list (provider, list);
-    }
-
-  g_object_notify (G_OBJECT (self), "default-task-list");
-}
-
 /**
  * gtd_manager_get_settings:
  * @manager: a #GtdManager
diff --git a/src/engine/gtd-manager.h b/src/engine/gtd-manager.h
index e041db7..09e71d1 100644
--- a/src/engine/gtd-manager.h
+++ b/src/engine/gtd-manager.h
@@ -51,11 +51,6 @@ void                 gtd_manager_set_default_provider            (GtdManager
 
 GtdTaskList*         gtd_manager_get_inbox                       (GtdManager         *self);
 
-GtdTaskList*         gtd_manager_get_default_task_list           (GtdManager         *self);
-
-void                 gtd_manager_set_default_task_list           (GtdManager         *self,
-                                                                  GtdTaskList        *list);
-
 GSettings*           gtd_manager_get_settings                    (GtdManager         *manager);
 
 gboolean             gtd_manager_get_is_first_run                (GtdManager         *manager);
diff --git a/src/interfaces/gtd-provider.c b/src/interfaces/gtd-provider.c
index c1f28cf..a446322 100644
--- a/src/interfaces/gtd-provider.c
+++ b/src/interfaces/gtd-provider.c
@@ -127,18 +127,6 @@ gtd_provider_default_init (GtdProviderInterface *iface)
                                                             NULL,
                                                             G_PARAM_READABLE));
 
-  /**
-   * GtdProvider::default-task-list:
-   *
-   * The default #GtdTaskList of the provider.
-   */
-  g_object_interface_install_property (iface,
-                                       g_param_spec_object ("default-task-list",
-                                                            "Default tasklist of the provider",
-                                                            "The default tasklist of the provider",
-                                                            GTD_TYPE_TASK_LIST,
-                                                            G_PARAM_READWRITE));
-
   /**
    * GtdProvider::list-added:
    * @provider: a #GtdProvider
@@ -445,42 +433,6 @@ gtd_provider_get_task_lists (GtdProvider *provider)
   return GTD_PROVIDER_GET_IFACE (provider)->get_task_lists (provider);
 }
 
-/**
- * gtd_provider_get_default_task_list:
- * @provider: a #GtdProvider
- *
- * Retrieves the default tasklist of @provider.
- *
- * Returns: (transfer none)(nullable): the default tasklist, or %NULL
- */
-GtdTaskList*
-gtd_provider_get_default_task_list (GtdProvider *provider)
-{
-  g_return_val_if_fail (GTD_IS_PROVIDER (provider), NULL);
-  g_return_val_if_fail (GTD_PROVIDER_GET_IFACE (provider)->get_default_task_list, NULL);
-
-  return GTD_PROVIDER_GET_IFACE (provider)->get_default_task_list (provider);
-}
-
-/**
- * gtd_provider_set_default_task_list:
- * @provider: a #GtdProvider
- * @list: a #GtdTaskList
- *
- * Sets the default tasklist of @provider.
- */
-void
-gtd_provider_set_default_task_list (GtdProvider *provider,
-                                    GtdTaskList *list)
-{
-  g_return_if_fail (GTD_IS_PROVIDER (provider));
-  g_return_if_fail (GTD_IS_TASK_LIST (provider));
-  g_return_if_fail (gtd_task_list_get_provider (list) == provider);
-  g_return_if_fail (GTD_PROVIDER_GET_IFACE (provider)->set_default_task_list);
-
-  return GTD_PROVIDER_GET_IFACE (provider)->set_default_task_list (provider, list);
-}
-
 /**
  * gtd_provider_get_inbox:
  * @provider: a #GtdProvider
diff --git a/src/interfaces/gtd-provider.h b/src/interfaces/gtd-provider.h
index d303c8d..dbdc77e 100644
--- a/src/interfaces/gtd-provider.h
+++ b/src/interfaces/gtd-provider.h
@@ -75,11 +75,6 @@ struct _GtdProviderInterface
 
   GList*             (*get_task_lists)                           (GtdProvider        *provider);
 
-  GtdTaskList*       (*get_default_task_list)                    (GtdProvider        *provider);
-
-  void               (*set_default_task_list)                    (GtdProvider        *provider,
-                                                                  GtdTaskList        *list);
-
   GtdTaskList*       (*get_inbox)                                (GtdProvider        *provider);
 };
 
@@ -119,11 +114,6 @@ void                 gtd_provider_remove_task_list               (GtdProvider
 
 GList*               gtd_provider_get_task_lists                 (GtdProvider        *provider);
 
-GtdTaskList*         gtd_provider_get_default_task_list          (GtdProvider        *provider);
-
-void                 gtd_provider_set_default_task_list          (GtdProvider        *provider,
-                                                                  GtdTaskList        *list);
-
 GtdTaskList*         gtd_provider_get_inbox                      (GtdProvider        *provider);
 
 gint                 gtd_provider_compare                        (GtdProvider        *a,
diff --git a/tests/dummy-provider.c b/tests/dummy-provider.c
index fde9944..cd92984 100644
--- a/tests/dummy-provider.c
+++ b/tests/dummy-provider.c
@@ -1,6 +1,6 @@
 /* dummy-provider.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
@@ -43,7 +43,6 @@ G_DEFINE_TYPE_WITH_CODE (DummyProvider, dummy_provider, GTD_TYPE_OBJECT,
 enum
 {
   PROP_0,
-  PROP_DEFAULT_TASKLIST,
   PROP_DESCRIPTION,
   PROP_ENABLED,
   PROP_ICON,
@@ -196,18 +195,6 @@ dummy_provider_get_task_lists (GtdProvider *provider)
   return sequence_to_list (self->lists);
 }
 
-static GtdTaskList*
-dummy_provider_get_default_task_list (GtdProvider *provider)
-{
-  return NULL;
-}
-
-static void
-dummy_provider_set_default_task_list (GtdProvider *provider,
-                                     GtdTaskList *list)
-{
-}
-
 static void
 gtd_provider_iface_init (GtdProviderInterface *iface)
 {
@@ -224,8 +211,6 @@ gtd_provider_iface_init (GtdProviderInterface *iface)
   iface->update_task_list = dummy_provider_update_task_list;
   iface->remove_task_list = dummy_provider_remove_task_list;
   iface->get_task_lists = dummy_provider_get_task_lists;
-  iface->get_default_task_list = dummy_provider_get_default_task_list;
-  iface->set_default_task_list = dummy_provider_set_default_task_list;
 }
 
 
@@ -300,7 +285,6 @@ dummy_provider_class_init (DummyProviderClass *klass)
   object_class->get_property = dummy_provider_get_property;
   object_class->set_property = dummy_provider_set_property;
 
-  g_object_class_override_property (object_class, PROP_DEFAULT_TASKLIST, "default-task-list");
   g_object_class_override_property (object_class, PROP_DESCRIPTION, "description");
   g_object_class_override_property (object_class, PROP_ENABLED, "enabled");
   g_object_class_override_property (object_class, PROP_ICON, "icon");


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