[gnome-todo] Remove GtkContainer API



commit 8b76da334e65abf54c1d41559ae62bc586339451
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Tue May 12 11:22:53 2020 -0300

    Remove GtkContainer API

 src/gtd-application.c                              |   1 -
 src/gtd-omni-area.c                                |   6 +-
 src/gtd-plugin-dialog.c                            |  61 +++---
 src/gtd-window.c                                   |  23 +--
 src/plugins/all-tasks-panel/gtd-all-tasks-panel.c  |   6 +-
 src/plugins/inbox-panel/gtd-inbox-panel.c          |   2 +-
 src/plugins/next-week-panel/gtd-next-week-panel.c  |   4 +-
 src/plugins/scheduled-panel/gtd-panel-scheduled.c  |   6 +-
 src/plugins/task-lists-workspace/gtd-sidebar.c     |  39 ++--
 .../task-lists-workspace/gtd-task-list-panel.c     |   2 +-
 .../gtd-task-lists-workspace.c                     |  18 +-
 src/plugins/today-panel/gtd-panel-today.c          |   2 +-
 src/provider/gtd-provider-popover.ui               |   1 -
 src/provider/gtd-provider-selector.c               | 228 ++++++---------------
 src/provider/gtd-provider-selector.h               |   7 +-
 src/task-list-view/gtd-task-list-popover.c         |   6 +-
 src/task-list-view/gtd-task-list-view.c            |  35 ++--
 src/widgets/gtd-menu-button.c                      |  10 +-
 tests/interactive/test-colorbutton.c               |   2 +-
 tests/interactive/test-filter-sort.c               |  18 +-
 tests/interactive/test-star-widget.c               |   2 +-
 tests/interactive/test-task-model.c                |   8 +-
 22 files changed, 187 insertions(+), 300 deletions(-)
---
diff --git a/src/gtd-application.c b/src/gtd-application.c
index 9574efb..fb06fd5 100644
--- a/src/gtd-application.c
+++ b/src/gtd-application.c
@@ -30,7 +30,6 @@
 #include "gtd-theme-manager.h"
 #include "gtd-vcs.h"
 #include "gtd-window.h"
-#include "gtd-window-private.h"
 
 #include <glib.h>
 #include <glib-object.h>
diff --git a/src/gtd-omni-area.c b/src/gtd-omni-area.c
index f636bbd..828f36c 100644
--- a/src/gtd-omni-area.c
+++ b/src/gtd-omni-area.c
@@ -195,14 +195,14 @@ gtd_omni_area_push_message (GtdOmniArea *self,
   label = gtk_label_new (text);
   gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END);
   gtk_label_set_xalign (GTK_LABEL (label), 0.0);
-  gtk_container_add (GTK_CONTAINER (box), label);
+  gtk_box_append (GTK_BOX (box), label);
 
   if (icon)
     {
       GtkWidget *image = gtk_image_new_from_gicon (icon);
 
       gtk_widget_add_css_class (image, "dim-label");
-      gtk_container_add (GTK_CONTAINER (box), image);
+      gtk_box_append (GTK_BOX (box), image);
     }
 
   gtk_stack_add_named (self->status_stack, box, id);
@@ -244,7 +244,7 @@ gtd_omni_area_withdraw_message (GtdOmniArea *self,
 
   g_debug ("Removing message '%s' from Omni Area", id);
 
-  gtk_container_remove (GTK_CONTAINER (self->status_stack), widget);
+  gtk_stack_remove (self->status_stack, widget);
 
   l = g_queue_find_custom (self->messages, id, (GCompareFunc) g_strcmp0);
   g_queue_delete_link (self->messages, l);
diff --git a/src/gtd-plugin-dialog.c b/src/gtd-plugin-dialog.c
index efb18f9..7ddf91a 100644
--- a/src/gtd-plugin-dialog.c
+++ b/src/gtd-plugin-dialog.c
@@ -33,8 +33,8 @@ struct _GtdPluginDialog
 
   GtkWidget          *back_button;
   GtkWidget          *extension_list_placeholder;
-  GtkWidget          *frame;
-  GtkWidget          *listbox;
+  GtkFrame           *frame;
+  GtkListBox         *listbox;
   GtkWidget          *stack;
 };
 
@@ -60,12 +60,12 @@ show_preferences_cb (GtdPluginDialogRow *row,
   GtkWidget *panel;
 
   /* First, remove the old panel */
-  old_panel = gtk_widget_get_first_child (self->frame);
+  old_panel = gtk_frame_get_child (self->frame);
 
   if (old_panel)
     {
       g_object_ref (old_panel);
-      gtk_container_remove (GTK_CONTAINER (self->frame), old_panel);
+      gtk_frame_set_child (GTK_FRAME (self->frame), NULL);
     }
 
   /* Second, setup the new panel */
@@ -74,7 +74,7 @@ show_preferences_cb (GtdPluginDialogRow *row,
 
   if (panel)
     {
-      gtk_container_add (GTK_CONTAINER (self->frame), panel);
+      gtk_frame_set_child (self->frame, panel);
       gtk_widget_show (panel);
     }
 
@@ -102,7 +102,7 @@ add_plugin (GtdPluginDialog *dialog,
                     G_CALLBACK (show_preferences_cb),
                     dialog);
 
-  gtk_container_add (GTK_CONTAINER (dialog->listbox), row);
+  gtk_list_box_insert (dialog->listbox, row, -1);
 }
 
 static void
@@ -112,35 +112,30 @@ plugin_loaded (GtdPluginManager *manager,
                GtdPluginDialog  *self)
 {
   gboolean contains_plugin;
-  GList *children;
-  GList *l;
+  GtkWidget *child;
 
   contains_plugin = FALSE;
-  children = gtk_container_get_children (GTK_CONTAINER (self->listbox));
 
-  for (l = children; l != NULL; l = l->next)
+  for (child = gtk_widget_get_first_child (GTK_WIDGET (self->listbox));
+       child;
+       child = gtk_widget_get_next_sibling (child))
     {
-      GtdPluginDialogRow *row = l->data;
+      if (!GTD_IS_PLUGIN_DIALOG_ROW (child) ||
+          gtd_plugin_dialog_row_get_info (GTD_PLUGIN_DIALOG_ROW (child)) != info)
+        {
+          continue;
+        }
 
-      if (!GTD_IS_PLUGIN_DIALOG_ROW (row) || gtd_plugin_dialog_row_get_info (row) != info)
-        continue;
-
-      gtd_plugin_dialog_row_set_plugin (l->data, activatable);
+      gtd_plugin_dialog_row_set_plugin (GTD_PLUGIN_DIALOG_ROW (child), activatable);
       contains_plugin = TRUE;
       break;
     }
 
-  g_list_free (children);
-
   /* If we just loaded a plugin that is not yet added
    * to the plugin list, we shall do it now.
    */
   if (!contains_plugin)
-    {
-      add_plugin (self,
-                  info,
-                  activatable);
-    }
+    add_plugin (self, info, activatable);
 }
 
 static void
@@ -149,23 +144,21 @@ plugin_unloaded (GtdPluginManager *manager,
                  GtdActivatable   *activatable,
                  GtdPluginDialog  *self)
 {
-  GList *children;
-  GList *l;
+  GtkWidget *child;
 
-  children = gtk_container_get_children (GTK_CONTAINER (self->listbox));
 
-  for (l = children; l != NULL; l = l->next)
+  for (child = gtk_widget_get_first_child (GTK_WIDGET (self->listbox));
+       child;
+       child = gtk_widget_get_next_sibling (child))
     {
-      GtdPluginDialogRow *row = l->data;
-
-      if (!GTD_IS_PLUGIN_DIALOG_ROW (row) || gtd_plugin_dialog_row_get_info (row) != info)
-        continue;
+      if (!GTD_IS_PLUGIN_DIALOG_ROW (child) ||
+          gtd_plugin_dialog_row_get_info (GTD_PLUGIN_DIALOG_ROW (child)) != info)
+        {
+          continue;
+        }
 
-      gtd_plugin_dialog_row_set_plugin (l->data, NULL);
-      break;
+      gtd_plugin_dialog_row_set_plugin (GTD_PLUGIN_DIALOG_ROW (child), NULL);
     }
-
-  g_list_free (children);
 }
 
 static gint
diff --git a/src/gtd-window.c b/src/gtd-window.c
index e3da295..00c167b 100644
--- a/src/gtd-window.c
+++ b/src/gtd-window.c
@@ -38,7 +38,6 @@
 #include "gtd-task.h"
 #include "gtd-task-list.h"
 #include "gtd-window.h"
-#include "gtd-window-private.h"
 
 #include <glib/gi18n.h>
 #include <libpeas/peas.h>
@@ -61,11 +60,11 @@ struct _GtdWindow
   GtkApplicationWindow application;
 
   GtkHeaderBar       *headerbar;
-  GtkWidget          *headerbar_box;
+  GtkBox             *headerbar_box;
   GtkRevealer        *headerbar_overlay_revealer;
   GtkStack           *stack;
-  GtkWidget          *workspace_box_end;
-  GtkWidget          *workspace_box_start;
+  GtkBox             *workspace_box_end;
+  GtkBox             *workspace_box_start;
   GtkListBox         *workspaces_listbox;
   GtdMenuButton      *workspaces_menu_button;
 
@@ -206,7 +205,7 @@ remove_workspace (GtdWindow    *self,
   if (!g_list_store_find (self->workspaces, workspace, &position))
     return;
 
-  gtk_container_remove (GTK_CONTAINER (self->stack), GTK_WIDGET (workspace));
+  gtk_stack_remove (self->stack, GTK_WIDGET (workspace));
   g_list_store_remove (self->workspaces, position);
 }
 
@@ -227,7 +226,7 @@ remove_all_workspace_header_widgets (GtdWindow *self)
 
       g_assert (parent == GTK_WIDGET (self->workspace_box_start) ||
                 parent == GTK_WIDGET (self->workspace_box_end));
-      gtk_container_remove (GTK_CONTAINER (parent), widget);
+      gtk_box_remove (GTK_BOX (parent), widget);
     }
 
   g_ptr_array_set_size (self->workspace_header_widgets, 0);
@@ -286,7 +285,7 @@ on_action_toggle_fullscreen_state_changed_cb (GSimpleAction *simple,
   if (fullscreen)
     {
       gtk_event_controller_set_propagation_phase (self->overlay_motion_controller, GTK_PHASE_BUBBLE);
-      gtk_container_remove (GTK_CONTAINER (self->headerbar_box), GTK_WIDGET (self->headerbar));
+      gtk_box_remove (self->headerbar_box, GTK_WIDGET (self->headerbar));
       gtk_revealer_set_child (self->headerbar_overlay_revealer, GTK_WIDGET (self->headerbar));
       gtk_revealer_set_reveal_child (self->headerbar_overlay_revealer, TRUE);
       gtk_window_fullscreen (GTK_WINDOW (self));
@@ -298,7 +297,7 @@ on_action_toggle_fullscreen_state_changed_cb (GSimpleAction *simple,
       gtk_event_controller_set_propagation_phase (self->overlay_motion_controller, GTK_PHASE_NONE);
       gtk_revealer_set_child (self->headerbar_overlay_revealer, NULL);
       gtk_revealer_set_reveal_child (self->headerbar_overlay_revealer, FALSE);
-      gtk_container_add (GTK_CONTAINER (self->headerbar_box), GTK_WIDGET (self->headerbar));
+      gtk_box_append (self->headerbar_box, GTK_WIDGET (self->headerbar));
       gtk_window_unfullscreen (GTK_WINDOW (self));
     }
   g_object_unref (self->headerbar);
@@ -490,8 +489,8 @@ create_workspace_row_func (gpointer item,
   gtk_label_set_xalign (GTK_LABEL (label), 0.0);
   g_object_bind_property (item, "title", label, "label", G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE);
 
-  gtk_container_add (GTK_CONTAINER (box), image);
-  gtk_container_add (GTK_CONTAINER (box), label);
+  gtk_box_append (GTK_BOX (box), image);
+  gtk_box_append (GTK_BOX (box), label);
 
   return box;
 }
@@ -708,11 +707,11 @@ gtd_window_embed_widget_in_header (GtdWindow       *self,
   switch (position)
     {
     case GTK_POS_RIGHT:
-      gtk_container_add (GTK_CONTAINER (self->workspace_box_end), widget);
+      gtk_box_append (self->workspace_box_end, widget);
       break;
 
     case GTK_POS_LEFT:
-      gtk_container_add (GTK_CONTAINER (self->workspace_box_start), widget);
+      gtk_box_append (self->workspace_box_start, widget);
       break;
 
     case GTK_POS_TOP:
diff --git a/src/plugins/all-tasks-panel/gtd-all-tasks-panel.c 
b/src/plugins/all-tasks-panel/gtd-all-tasks-panel.c
index 53c5593..ad06865 100644
--- a/src/plugins/all-tasks-panel/gtd-all-tasks-panel.c
+++ b/src/plugins/all-tasks-panel/gtd-all-tasks-panel.c
@@ -1,6 +1,6 @@
 /* gtd-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
@@ -179,7 +179,7 @@ create_label (const gchar *text,
 
   box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 
-  gtk_container_add (GTK_CONTAINER (box), label);
+  gtk_box_append (GTK_BOX (box), label);
 
   return box;
 }
@@ -478,7 +478,7 @@ gtd_all_tasks_panel_init (GtdAllTasksPanel *self)
 
   gtk_widget_set_hexpand (GTK_WIDGET (self->view), TRUE);
   gtk_widget_set_vexpand (GTK_WIDGET (self->view), TRUE);
-  gtk_container_add (GTK_CONTAINER (self), GTK_WIDGET (self->view));
+  gtk_box_append (GTK_BOX (self), GTK_WIDGET (self->view));
 
   gtd_task_list_view_set_header_func (GTD_TASK_LIST_VIEW (self->view),
                                       (GtdTaskListViewHeaderFunc) header_func,
diff --git a/src/plugins/inbox-panel/gtd-inbox-panel.c b/src/plugins/inbox-panel/gtd-inbox-panel.c
index 5f8d691..b9feb98 100644
--- a/src/plugins/inbox-panel/gtd-inbox-panel.c
+++ b/src/plugins/inbox-panel/gtd-inbox-panel.c
@@ -255,7 +255,7 @@ gtd_inbox_panel_init (GtdInboxPanel *self)
 
   gtk_widget_set_hexpand (GTK_WIDGET (self->view), TRUE);
   gtk_widget_set_vexpand (GTK_WIDGET (self->view), TRUE);
-  gtk_container_add (GTK_CONTAINER (self), GTK_WIDGET (self->view));
+  gtk_box_append (GTK_BOX (self), GTK_WIDGET (self->view));
 
   g_signal_connect_object (self->filter_model,
                            "items-changed",
diff --git a/src/plugins/next-week-panel/gtd-next-week-panel.c 
b/src/plugins/next-week-panel/gtd-next-week-panel.c
index 35d65b4..2279d83 100644
--- a/src/plugins/next-week-panel/gtd-next-week-panel.c
+++ b/src/plugins/next-week-panel/gtd-next-week-panel.c
@@ -198,7 +198,7 @@ create_label (const gchar *text,
 
   box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 
-  gtk_container_add (GTK_CONTAINER (box), label);
+  gtk_box_append (GTK_BOX (box), label);
 
   return box;
 }
@@ -536,7 +536,7 @@ gtd_next_week_panel_init (GtdNextWeekPanel *self)
 
   gtk_widget_set_hexpand (GTK_WIDGET (self->view), TRUE);
   gtk_widget_set_vexpand (GTK_WIDGET (self->view), TRUE);
-  gtk_container_add (GTK_CONTAINER (self), GTK_WIDGET (self->view));
+  gtk_box_append (GTK_BOX (self), GTK_WIDGET (self->view));
 
   gtd_task_list_view_set_header_func (GTD_TASK_LIST_VIEW (self->view),
                                       (GtdTaskListViewHeaderFunc) header_func,
diff --git a/src/plugins/scheduled-panel/gtd-panel-scheduled.c 
b/src/plugins/scheduled-panel/gtd-panel-scheduled.c
index 23cabcc..8e3aa48 100644
--- a/src/plugins/scheduled-panel/gtd-panel-scheduled.c
+++ b/src/plugins/scheduled-panel/gtd-panel-scheduled.c
@@ -1,6 +1,6 @@
 /* gtd-panel-scheduled.c
  *
- * Copyright (C) 2015 Georges Basile Stavracas Neto <georges stavracas gmail com>
+ * Copyright (C) 2015-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
@@ -169,7 +169,7 @@ create_label (const gchar *text,
 
   box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 
-  gtk_container_add (GTK_CONTAINER (box), label);
+  gtk_box_append (GTK_BOX (box), label);
 
   return box;
 }
@@ -485,7 +485,7 @@ gtd_panel_scheduled_init (GtdPanelScheduled *self)
 
   gtk_widget_set_hexpand (GTK_WIDGET (self->view), TRUE);
   gtk_widget_set_vexpand (GTK_WIDGET (self->view), TRUE);
-  gtk_container_add (GTK_CONTAINER (self), GTK_WIDGET (self->view));
+  gtk_box_append (GTK_BOX (self), GTK_WIDGET (self->view));
 
   gtd_task_list_view_set_header_func (self->view,
                                       (GtdTaskListViewHeaderFunc) header_func,
diff --git a/src/plugins/task-lists-workspace/gtd-sidebar.c b/src/plugins/task-lists-workspace/gtd-sidebar.c
index ebfeba2..f7c1d52 100644
--- a/src/plugins/task-lists-workspace/gtd-sidebar.c
+++ b/src/plugins/task-lists-workspace/gtd-sidebar.c
@@ -62,34 +62,32 @@ static gboolean
 activate_row_below (GtdSidebar        *self,
                     GtdSidebarListRow *current_row)
 {
-  g_autoptr (GList) children = NULL;
   GtkWidget *next_row;
   GtkWidget *parent;
-  GList *l;
+  GtkWidget *child;
   gboolean after_deleted;
 
   parent = gtk_widget_get_parent (GTK_WIDGET (current_row));
-  children = gtk_container_get_children (GTK_CONTAINER (parent));
   after_deleted = FALSE;
   next_row = NULL;
 
-  for (l = children; l; l = l->next)
+  for (child = gtk_widget_get_first_child (parent);
+       child;
+       child = gtk_widget_get_next_sibling (child))
     {
-      GtkWidget *row = l->data;
-
-      if (row == (GtkWidget*) current_row)
+      if (child == (GtkWidget*) current_row)
         {
           after_deleted = TRUE;
           continue;
         }
 
-      if (!gtk_widget_get_visible (row) ||
-          !gtk_list_box_row_get_activatable (GTK_LIST_BOX_ROW (row)))
+      if (!gtk_widget_get_visible (child) ||
+          !gtk_list_box_row_get_activatable (GTK_LIST_BOX_ROW (child)))
         {
           continue;
         }
 
-      next_row = row;
+      next_row = child;
 
       if (after_deleted)
         break;
@@ -200,15 +198,14 @@ get_row_internal (GtdSidebar  *self,
                   GetDataFunc  get_data_func,
                   gpointer     data)
 {
-  g_autoptr (GList) rows = NULL;
-  GList *l;
-
-  rows = gtk_container_get_children (GTK_CONTAINER (listbox));
+  GtkWidget *child;
 
-  for (l = rows; l; l = l->next)
+  for (child = gtk_widget_get_first_child (GTK_WIDGET (listbox));
+       child;
+       child = gtk_widget_get_next_sibling (child))
     {
-      if (g_type_is_a (G_OBJECT_TYPE (l->data), type) && get_data_func (l->data) == data)
-          return l->data;
+      if (g_type_is_a (G_OBJECT_TYPE (child), type) && get_data_func (child) == data)
+          return child;
     }
 
   return NULL;
@@ -359,7 +356,7 @@ on_panel_removed_cb (GtdManager *manager,
   g_debug ("Removing panel '%s'", gtd_panel_get_panel_name (panel));
 
   if (row)
-    gtk_container_remove (GTK_CONTAINER (self->listbox), GTK_WIDGET (row));
+    gtk_list_box_remove (self->listbox, GTK_WIDGET (row));
 }
 
 static void
@@ -553,10 +550,10 @@ on_provider_removed_cb (GtdManager  *manager,
   g_debug ("Removing provider '%s'", gtd_provider_get_name (provider));
 
   row = get_row_for_provider (self, self->listbox, provider);
-  gtk_container_remove (GTK_CONTAINER (self->listbox), GTK_WIDGET (row));
+  gtk_list_box_remove (self->listbox, GTK_WIDGET (row));
 
   row = get_row_for_provider (self, self->archive_listbox, provider);
-  gtk_container_remove (GTK_CONTAINER (self->archive_listbox), GTK_WIDGET (row));
+  gtk_list_box_remove (self->archive_listbox, GTK_WIDGET (row));
 }
 
 
@@ -598,7 +595,7 @@ on_task_list_changed_cb (GtdManager  *manager,
         activate_appropriate_row (self, row);
 
       /* Destroy the old row */
-      gtk_container_remove (GTK_CONTAINER (listbox), GTK_WIDGET (row));
+      gtk_list_box_remove (listbox, GTK_WIDGET (row));
 
       /* Add a new row */
       add_task_list (self, list);
diff --git a/src/plugins/task-lists-workspace/gtd-task-list-panel.c 
b/src/plugins/task-lists-workspace/gtd-task-list-panel.c
index 9e4da85..0743455 100644
--- a/src/plugins/task-lists-workspace/gtd-task-list-panel.c
+++ b/src/plugins/task-lists-workspace/gtd-task-list-panel.c
@@ -114,7 +114,7 @@ populate_color_grid (GtdTaskListPanel *self)
       button = gtd_color_button_new (&color);
       gtk_widget_set_size_request (button, -1, 24);
 
-      gtk_container_add (GTK_CONTAINER (self->colors_flowbox), button);
+      gtk_flow_box_insert (self->colors_flowbox, button, -1);
     }
 }
 
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 e805f7d..d76a6de 100644
--- a/src/plugins/task-lists-workspace/gtd-task-lists-workspace.c
+++ b/src/plugins/task-lists-workspace/gtd-task-lists-workspace.c
@@ -37,8 +37,8 @@ struct _GtdTaskListsWorkspace
   GtkWidget          *end_box;
   GtkMenuButton      *gear_menu_button;
   GtkWidget          *new_list_button;
-  GtkWidget          *panel_box_end;
-  GtkWidget          *panel_box_start;
+  GtkBox             *panel_box_end;
+  GtkBox             *panel_box_start;
   GtkStack           *stack;
   GtkWidget          *start_box;
   GtdSidebar         *sidebar;
@@ -89,14 +89,14 @@ add_widgets (GtdTaskListsWorkspace *self,
       switch (gtk_widget_get_halign (l->data))
         {
         case GTK_ALIGN_END:
-          gtk_container_add (GTK_CONTAINER (self->panel_box_end), l->data);
+          gtk_box_append (self->panel_box_end, l->data);
           break;
 
         case GTK_ALIGN_START:
         case GTK_ALIGN_BASELINE:
         case GTK_ALIGN_FILL:
         default:
-          gtk_container_add (GTK_CONTAINER (self->panel_box_start), l->data);
+          gtk_box_append (self->panel_box_start, l->data);
           break;
         }
     }
@@ -110,15 +110,15 @@ remove_widgets (GtdTaskListsWorkspace *self,
 
   for (l = widgets; l; l = l->next)
     {
-      GtkWidget *container;
+      GtkBox *box;
 
       if (gtk_widget_get_halign (l->data) == GTK_ALIGN_END)
-        container = self->panel_box_end;
+        box = self->panel_box_end;
       else
-        container = self->panel_box_start;
+        box = self->panel_box_start;
 
       g_object_ref (l->data);
-      gtk_container_remove (GTK_CONTAINER (container), l->data);
+      gtk_box_remove (box, l->data);
     }
 }
 
@@ -223,7 +223,7 @@ on_panel_removed_cb (PeasExtensionSet      *extension_set,
 {
   g_object_ref (panel);
 
-  gtk_container_remove (GTK_CONTAINER (self->stack), GTK_WIDGET (panel));
+  gtk_stack_remove (self->stack, GTK_WIDGET (panel));
   g_signal_emit (self, signals[PANEL_REMOVED], 0, panel);
 
   g_object_unref (panel);
diff --git a/src/plugins/today-panel/gtd-panel-today.c b/src/plugins/today-panel/gtd-panel-today.c
index ca5c065..880df01 100644
--- a/src/plugins/today-panel/gtd-panel-today.c
+++ b/src/plugins/today-panel/gtd-panel-today.c
@@ -444,7 +444,7 @@ gtd_panel_today_init (GtdPanelToday *self)
 
   gtk_widget_set_hexpand (GTK_WIDGET (self->view), TRUE);
   gtk_widget_set_vexpand (GTK_WIDGET (self->view), TRUE);
-  gtk_container_add (GTK_CONTAINER (self), GTK_WIDGET (self->view));
+  gtk_box_append (GTK_BOX (self), GTK_WIDGET (self->view));
 
   gtd_task_list_view_set_header_func (self->view, header_func, self);
 
diff --git a/src/provider/gtd-provider-popover.ui b/src/provider/gtd-provider-popover.ui
index 2468b3b..3dd2479 100644
--- a/src/provider/gtd-provider-popover.ui
+++ b/src/provider/gtd-provider-popover.ui
@@ -142,7 +142,6 @@
                   <object class="GtdProviderSelector" id="provider_selector">
                     <property name="can_focus">True</property>
                     <property name="show_local">True</property>
-                    <property name="select_default">True</property>
                     <property name="show_stub_rows">False</property>
                     <signal name="provider-selected" handler="gtd_provider_popover__provider_selected" 
object="GtdProviderPopover" swapped="yes"/>
                     <layout>
diff --git a/src/provider/gtd-provider-selector.c b/src/provider/gtd-provider-selector.c
index 2659e0b..846b3f6 100644
--- a/src/provider/gtd-provider-selector.c
+++ b/src/provider/gtd-provider-selector.c
@@ -30,7 +30,7 @@ struct _GtdProviderSelector
 {
   GtkBox                     parent;
 
-  GtkWidget                 *listbox;
+  GtkListBox                *listbox;
   GtkWidget                 *local_check;
 
   /* stub rows */
@@ -39,7 +39,6 @@ struct _GtdProviderSelector
   GtkWidget                 *owncloud_stub_row;
   GtkWidget                 *local_row;
 
-  gint                      select_default : 1;
   gint                      show_local_provider : 1;
   gint                      show_stub_rows : 1;
 };
@@ -48,7 +47,6 @@ G_DEFINE_TYPE (GtdProviderSelector, gtd_provider_selector, GTK_TYPE_BOX)
 
 enum {
   PROP_0,
-  PROP_SELECT_DEFAULT,
   PROP_SHOW_LOCAL,
   PROP_SHOW_STUB_ROWS,
   LAST_PROP
@@ -90,35 +88,46 @@ display_header_func (GtkListBoxRow *row,
     }
 }
 
+static void
+unselect_rows (GtdProviderSelector *self)
+{
+  GtkWidget *child;
+
+  for (child = gtk_widget_get_first_child (GTK_WIDGET (self->listbox));
+       child;
+       child = gtk_widget_get_next_sibling (child))
+    {
+      if (GTD_IS_PROVIDER_ROW (child))
+        gtd_provider_row_set_selected (GTD_PROVIDER_ROW (child), FALSE);
+    }
+}
+
 static void
 default_provider_changed_cb (GtdProviderSelector *selector)
 {
   GtdProvider *current;
   GtdManager *manager;
-  GList *children;
-  GList *l;
-
-  if (!selector->select_default)
-    return;
+  GtkWidget *child;
 
   manager = gtd_manager_get_default ();
   current = gtd_manager_get_default_provider (manager);
-  children = gtk_container_get_children (GTK_CONTAINER (selector->listbox));
 
-  for (l = children; l != NULL; l = l->next)
+  for (child = gtk_widget_get_first_child (GTK_WIDGET (selector->listbox));
+       child;
+       child = gtk_widget_get_next_sibling (child))
     {
+      GtdProviderRow *provider_row;
       GtdProvider *provider;
 
-      if (!GTD_IS_PROVIDER_ROW (l->data))
+      if (!GTD_IS_PROVIDER_ROW (child))
         continue;
 
-      provider = gtd_provider_row_get_provider (l->data);
+      provider_row = GTD_PROVIDER_ROW (child);
+      provider = gtd_provider_row_get_provider (provider_row);
 
-      gtd_provider_row_set_selected (l->data, provider == current);
+      gtd_provider_row_set_selected (provider_row, provider == current);
     }
 
-  g_list_free (children);
-
   g_signal_emit (selector, signals[PROVIDER_SELECTED], 0, current);
 }
 
@@ -144,17 +153,10 @@ gtd_provider_selector__listbox_row_activated (GtdProviderSelector *selector,
   else
     {
       GtdProvider *provider;
-      GList *children;
-      GList *l;
 
-      children = gtk_container_get_children (GTK_CONTAINER (selector->listbox));
       provider = gtd_provider_row_get_provider (GTD_PROVIDER_ROW (row));
 
-      for (l = children; l != NULL; l = l->next)
-        {
-          if (GTD_IS_PROVIDER_ROW (l->data))
-            gtd_provider_row_set_selected (l->data, FALSE);
-        }
+      unselect_rows (selector);
 
       /*
        * If the account has it's calendars disabled, we cannot let it
@@ -170,8 +172,6 @@ gtd_provider_selector__listbox_row_activated (GtdProviderSelector *selector,
         {
           spawn ((gchar*) gtd_provider_get_id (provider), NULL);
         }
-
-      g_list_free (children);
     }
 }
 
@@ -190,19 +190,10 @@ gtd_provider_selector__check_toggled (GtdProviderSelector *selector,
   if (gtk_toggle_button_get_active (check))
     {
       GtdProvider *local_provider;
-      GList *children;
-      GList *l;
 
-      children = gtk_container_get_children (GTK_CONTAINER (selector->listbox));
       local_provider = gtd_provider_row_get_provider (GTD_PROVIDER_ROW (selector->local_row));
 
-      for (l = children; l != NULL; l = l->next)
-        {
-          if (GTD_IS_PROVIDER_ROW (l->data))
-            gtd_provider_row_set_selected (l->data, FALSE);
-        }
-
-      g_list_free (children);
+      unselect_rows (selector);
 
       /*
        * Sets the provider location to "local", and don't unset it if the
@@ -220,8 +211,7 @@ static void
 remove_provider (GtdProviderSelector *selector,
                  GtdProvider         *provider)
 {
-  GList *children;
-  GList *l;
+  GtkWidget *child;
   gint exchange;
   gint google;
   gint owncloud;
@@ -229,23 +219,27 @@ remove_provider (GtdProviderSelector *selector,
   g_return_if_fail (GTD_IS_PROVIDER_SELECTOR (selector));
   g_return_if_fail (GTD_IS_PROVIDER (provider));
 
-  children = gtk_container_get_children (GTK_CONTAINER (selector->listbox));
   exchange = google = owncloud = 0;
 
-  for (l = children; l != NULL; l = l->next)
+  for (child = gtk_widget_get_first_child (GTK_WIDGET (selector->listbox));
+       child;
+       child = gtk_widget_get_next_sibling (child))
     {
+      GtdProviderRow *provider_row;
       GtdProvider *row_provider;
       const gchar *provider_id;
 
-      if (!GTD_IS_PROVIDER_ROW (l->data))
+      if (!GTD_IS_PROVIDER_ROW (child))
         continue;
 
-      row_provider = gtd_provider_row_get_provider (l->data);
+      provider_row = GTD_PROVIDER_ROW (child);
+
+      row_provider = gtd_provider_row_get_provider (provider_row);
       provider_id = gtd_provider_get_id (row_provider);
 
       if (row_provider == provider)
         {
-          gtk_container_remove (GTK_CONTAINER (selector->listbox), l->data);
+          gtk_list_box_remove (selector->listbox, child);
         }
       else
         {
@@ -261,8 +255,6 @@ remove_provider (GtdProviderSelector *selector,
   gtk_widget_set_visible (selector->exchange_stub_row, exchange == 0);
   gtk_widget_set_visible (selector->google_stub_row, google == 0);
   gtk_widget_set_visible (selector->owncloud_stub_row, owncloud == 0);
-
-  g_list_free (children);
 }
 
 static void
@@ -280,7 +272,7 @@ add_provider (GtdProviderSelector *selector,
 
   g_debug ("Adding provider %s", provider_id);
 
-  gtk_container_add (GTK_CONTAINER (selector->listbox), row);
+  gtk_list_box_insert (selector->listbox, row, -1);
 
   /* track the local provider row */
   if (g_str_has_prefix (provider_id, "local") == 0)
@@ -290,11 +282,8 @@ add_provider (GtdProviderSelector *selector,
     }
 
   /* Auto selects the default provider row when needed */
-  if (selector->select_default &&
-      !gtd_provider_selector_get_selected_provider (selector))
-    {
-      gtd_provider_selector_set_selected_provider (selector, provider);
-    }
+  if (!gtd_provider_selector_get_selected_provider (selector))
+    gtd_provider_selector_set_selected_provider (selector, provider);
 
   /* hide the related stub row */
   if (g_str_has_prefix (provider_id, "exchange") == 0)
@@ -377,10 +366,6 @@ gtd_provider_selector_get_property (GObject    *object,
 
   switch (prop_id)
     {
-    case PROP_SELECT_DEFAULT:
-      g_value_set_boolean (value, self->select_default);
-      break;
-
     case PROP_SHOW_LOCAL:
       g_value_set_boolean (value, self->show_local_provider);
       break;
@@ -404,10 +389,6 @@ gtd_provider_selector_set_property (GObject      *object,
 
   switch (prop_id)
     {
-    case PROP_SELECT_DEFAULT:
-      gtd_provider_selector_set_select_default (self, g_value_get_boolean (value));
-      break;
-
     case PROP_SHOW_LOCAL:
       gtd_provider_selector_show_local (self, g_value_get_boolean (value));
       break;
@@ -477,20 +458,6 @@ gtd_provider_selector_class_init (GtdProviderSelectorClass *klass)
                               TRUE,
                               G_PARAM_READWRITE));
 
-  /**
-   * GtdProviderSelector::select-default:
-   *
-   * Whether it should auto selects the default provider location row.
-   */
-  g_object_class_install_property (
-        object_class,
-        PROP_SELECT_DEFAULT,
-        g_param_spec_boolean ("select-default",
-                              "Selects default provider row",
-                              "Whether should select the default provider row",
-                              FALSE,
-                              G_PARAM_READWRITE));
-
   gtk_widget_class_set_template_from_resource (widget_class, 
"/org/gnome/todo/ui/provider/gtd-provider-selector.ui");
 
   gtk_widget_class_bind_template_child (widget_class, GtdProviderSelector, exchange_stub_row);
@@ -571,69 +538,6 @@ gtd_provider_selector_show_local (GtdProviderSelector *selector,
     }
 }
 
-/**
- * gtd_provider_selector_get_select_default:
- * @selector: a #GtdProviderSelector
- *
- * Whether the default provider location is selected by default.
- *
- * Returns: %TRUE if the default provider location is selected automatically,
- * %FALSE otherwise.
- */
-gboolean
-gtd_provider_selector_get_select_default (GtdProviderSelector *selector)
-{
-  g_return_val_if_fail (GTD_IS_PROVIDER_SELECTOR (selector), FALSE);
-
-  return selector->select_default;
-}
-
-/**
- * gtd_provider_selector_set_select_default:
- * @selector: a #GtdProviderSelector
- * @select_default: %TRUE to auto select the default provider location.
- *
- * Whether @selector should select the default provider location by default.
- */
-void
-gtd_provider_selector_set_select_default (GtdProviderSelector *selector,
-                                         gboolean            select_default)
-{
-  g_return_if_fail (GTD_IS_PROVIDER_SELECTOR (selector));
-
-  if (selector->select_default != select_default)
-    {
-      selector->select_default = select_default;
-
-      if (select_default)
-        {
-          GList *children;
-          GList *l;
-
-          /* Select the appropriate row */
-          children = gtk_container_get_children (GTK_CONTAINER (selector->listbox));
-
-          for (l = children; l != NULL; l = l->next)
-            {
-              if (GTD_IS_PROVIDER_ROW (l->data))
-                {
-                  GtdProvider *provider = gtd_provider_row_get_provider (l->data);
-
-                  if (FALSE)//gtd_provider_get_is_default (provider))
-                    {
-                      gtd_provider_row_set_selected (l->data, TRUE);
-                      g_signal_emit (selector, signals[PROVIDER_SELECTED], 0, provider);
-                    }
-                }
-            }
-
-          g_list_free (children);
-        }
-
-      g_object_notify (G_OBJECT (selector), "select-default");
-    }
-}
-
 /**
  * gtd_provider_selector_get_selected_provider:
  * @selector: a #GtdProviderSelector
@@ -647,25 +551,29 @@ GtdProvider*
 gtd_provider_selector_get_selected_provider (GtdProviderSelector *selector)
 {
   GtdProvider *provider;
-  GList *children;
-  GList *l;
+  GtkWidget *child;
 
   g_return_val_if_fail (GTD_IS_PROVIDER_SELECTOR (selector), NULL);
 
   provider = NULL;
-  children = gtk_container_get_children (GTK_CONTAINER (selector->listbox));
 
-  for (l = children; l != NULL; l = l->next)
+  for (child = gtk_widget_get_first_child (GTK_WIDGET (selector->listbox));
+       child;
+       child = gtk_widget_get_next_sibling (child))
     {
-      if (GTD_IS_PROVIDER_ROW (l->data) && gtd_provider_row_get_selected (l->data))
+      GtdProviderRow *provider_row;
+
+      if (!GTD_IS_PROVIDER_ROW (child))
+        continue;
+
+      provider_row = GTD_PROVIDER_ROW (child);
+      if (gtd_provider_row_get_selected (provider_row))
         {
-          provider = gtd_provider_row_get_provider (l->data);
+          provider = gtd_provider_row_get_provider (provider_row);
           break;
         }
     }
 
-  g_list_free (children);
-
   return provider;
 }
 
@@ -680,23 +588,24 @@ void
 gtd_provider_selector_set_selected_provider (GtdProviderSelector *selector,
                                            GtdProvider         *provider)
 {
-  GList *children;
-  GList *l;
+  GtkWidget *child;
 
   g_return_if_fail (GTD_IS_PROVIDER_SELECTOR (selector));
 
-  children = gtk_container_get_children (GTK_CONTAINER (selector->listbox));
-
-  for (l = children; l != NULL; l = l->next)
+  for (child = gtk_widget_get_first_child (GTK_WIDGET (selector->listbox));
+       child;
+       child = gtk_widget_get_next_sibling (child))
     {
-      if (!GTD_IS_PROVIDER_ROW (l->data))
+      GtdProviderRow *provider_row;
+
+      if (!GTD_IS_PROVIDER_ROW (child))
         continue;
 
-      gtd_provider_row_set_selected (l->data, gtd_provider_row_get_provider (l->data) == provider);
+      provider_row = GTD_PROVIDER_ROW (child);
+      gtd_provider_row_set_selected (provider_row,
+                                     gtd_provider_row_get_provider (provider_row) == provider);
       g_signal_emit (selector, signals[PROVIDER_SELECTED], 0, provider);
     }
-
-  g_list_free (children);
 }
 
 /**
@@ -740,22 +649,23 @@ gtd_provider_selector_set_show_stub_rows (GtdProviderSelector *selector,
        */
       if (show_stub_rows)
         {
-          GList *children;
-          GList *l;
+          GtkWidget *child;
           gint google_counter;
           gint exchange_counter;
           gint owncloud_counter;
 
-          children = gtk_container_get_children (GTK_CONTAINER (selector->listbox));
           google_counter = 0;
           exchange_counter = 0;
           owncloud_counter = 0;
 
-          for (l = children; l != NULL; l = l->next)
+
+          for (child = gtk_widget_get_first_child (GTK_WIDGET (selector->listbox));
+               child;
+               child = gtk_widget_get_next_sibling (child))
             {
-              if (GTD_IS_PROVIDER_ROW (l->data))
+              if (GTD_IS_PROVIDER_ROW (child))
                 {
-                  GtdProvider *provider = gtd_provider_row_get_provider (l->data);
+                  GtdProvider *provider = gtd_provider_row_get_provider (GTD_PROVIDER_ROW (child));
                   const gchar *type;
 
                   type = gtd_provider_get_id (provider);
@@ -772,8 +682,6 @@ gtd_provider_selector_set_show_stub_rows (GtdProviderSelector *selector,
           gtk_widget_set_visible (selector->google_stub_row, google_counter == 0);
           gtk_widget_set_visible (selector->exchange_stub_row, exchange_counter == 0);
           gtk_widget_set_visible (selector->owncloud_stub_row, owncloud_counter == 0);
-
-          g_list_free (children);
         }
       else
         {
diff --git a/src/provider/gtd-provider-selector.h b/src/provider/gtd-provider-selector.h
index ca53a61..4a29f70 100644
--- a/src/provider/gtd-provider-selector.h
+++ b/src/provider/gtd-provider-selector.h
@@ -1,6 +1,6 @@
 /* gtd-provider-selector.h
  *
- * Copyright (C) 2015 Georges Basile Stavracas Neto <georges stavracas gmail com>
+ * Copyright (C) 2015-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
@@ -35,11 +35,6 @@ GtkWidget*         gtd_provider_selector_new                      (void);
 void               gtd_provider_selector_show_local               (GtdProviderSelector *selector,
                                                                   gboolean            show);
 
-gboolean           gtd_provider_selector_get_select_default       (GtdProviderSelector *selector);
-
-void               gtd_provider_selector_set_select_default       (GtdProviderSelector *selector,
-                                                                  gboolean            select_default);
-
 GtdProvider*        gtd_provider_selector_get_selected_provider     (GtdProviderSelector *selector);
 
 void               gtd_provider_selector_set_selected_provider     (GtdProviderSelector *selector,
diff --git a/src/task-list-view/gtd-task-list-popover.c b/src/task-list-view/gtd-task-list-popover.c
index 2467f93..2a1f89a 100644
--- a/src/task-list-view/gtd-task-list-popover.c
+++ b/src/task-list-view/gtd-task-list-popover.c
@@ -127,7 +127,7 @@ create_list_row_cb (gpointer item,
   gtk_widget_set_halign (icon, GTK_ALIGN_CENTER);
   gtk_widget_set_valign (icon, GTK_ALIGN_CENTER);
 
-  gtk_container_add (GTK_CONTAINER (box), icon);
+  gtk_box_append (GTK_BOX (box), icon);
 
   /* Tasklist name */
   name = g_object_new (GTK_TYPE_LABEL,
@@ -136,7 +136,7 @@ create_list_row_cb (gpointer item,
                        "hexpand", TRUE,
                        NULL);
 
-  gtk_container_add (GTK_CONTAINER (box), name);
+  gtk_box_append (GTK_BOX (box), name);
 
   /* Provider name */
   provider = g_object_new (GTK_TYPE_LABEL,
@@ -145,7 +145,7 @@ create_list_row_cb (gpointer item,
                            NULL);
   gtk_style_context_add_class (gtk_widget_get_style_context (provider), "dim-label");
   gtk_size_group_add_widget (self->sizegroup, provider);
-  gtk_container_add (GTK_CONTAINER (box), provider);
+  gtk_box_append (GTK_BOX (box), provider);
 
   /* The row itself */
   row = gtk_list_box_row_new ();
diff --git a/src/task-list-view/gtd-task-list-view.c b/src/task-list-view/gtd-task-list-view.c
index 310e6ac..be4545b 100644
--- a/src/task-list-view/gtd-task-list-view.c
+++ b/src/task-list-view/gtd-task-list-view.c
@@ -1353,24 +1353,22 @@ gtd_task_list_view_set_show_list_name (GtdTaskListView *view,
 
   if (view->priv->show_list_name != show_list_name)
     {
-      GList *children;
-      GList *l;
+      GtkWidget *child;
 
       view->priv->show_list_name = show_list_name;
 
-      /* update current children */
-      children = gtk_container_get_children (GTK_CONTAINER (view->priv->listbox));
-
-      for (l = children; l != NULL; l = l->next)
+      for (child = gtk_widget_get_first_child (GTK_WIDGET (view->priv->listbox));
+           child;
+           child = gtk_widget_get_next_sibling (child))
         {
-          if (!GTD_IS_TASK_ROW (l->data))
+          GtkWidget *row_child = gtk_list_box_row_get_child (GTK_LIST_BOX_ROW (child));
+
+          if (!GTD_IS_TASK_ROW (row_child))
             continue;
 
-          gtd_task_row_set_list_name_visible (l->data, show_list_name);
+          gtd_task_row_set_list_name_visible (GTD_TASK_ROW (row_child), show_list_name);
         }
 
-      g_list_free (children);
-
       g_object_notify (G_OBJECT (view), "show-list-name");
     }
 }
@@ -1404,8 +1402,7 @@ gtd_task_list_view_set_show_due_date (GtdTaskListView *self,
                                       gboolean         show_due_date)
 {
   GtdTaskListViewPrivate *priv;
-  GList *children;
-  GList *l;
+  GtkWidget *child;
 
   g_return_if_fail (GTD_IS_TASK_LIST_VIEW (self));
 
@@ -1416,18 +1413,18 @@ gtd_task_list_view_set_show_due_date (GtdTaskListView *self,
 
   priv->show_due_date = show_due_date;
 
-  children = gtk_container_get_children (GTK_CONTAINER (priv->listbox));
-
-  for (l = children; l != NULL; l = l->next)
+  for (child = gtk_widget_get_first_child (GTK_WIDGET (priv->listbox));
+       child;
+       child = gtk_widget_get_next_sibling (child))
     {
-      if (!GTD_IS_TASK_ROW (l->data))
+      GtkWidget *row_child = gtk_list_box_row_get_child (GTK_LIST_BOX_ROW (child));
+
+      if (!GTD_IS_TASK_ROW (row_child))
         continue;
 
-      gtd_task_row_set_due_date_visible (l->data, show_due_date);
+      gtd_task_row_set_due_date_visible (GTD_TASK_ROW (row_child), show_due_date);
     }
 
-  g_list_free (children);
-
   g_object_notify (G_OBJECT (self), "show-due-date");
 }
 
diff --git a/src/widgets/gtd-menu-button.c b/src/widgets/gtd-menu-button.c
index c9cbc47..7a4c759 100644
--- a/src/widgets/gtd-menu-button.c
+++ b/src/widgets/gtd-menu-button.c
@@ -434,7 +434,7 @@ gtd_menu_button_class_init (GtdMenuButtonClass *klass)
       g_param_spec_object ("align-widget",
                            "Align with",
                            "The parent widget which the menu should align with.",
-                           GTK_TYPE_CONTAINER,
+                           GTK_TYPE_WIDGET,
                            G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
 
   /**
@@ -809,8 +809,8 @@ gtd_menu_button_set_gicon (GtdMenuButton *self,
 
   image = gtk_image_new_from_icon_name ("pan-down-symbolic");
 
-  gtk_container_add (GTK_CONTAINER (box), icon_image);
-  gtk_container_add (GTK_CONTAINER (box), image);
+  gtk_box_append (GTK_BOX (box), icon_image);
+  gtk_box_append (GTK_BOX (box), image);
   gtk_button_set_child (GTK_BUTTON (priv->button), box);
 
   g_object_notify_by_pspec (G_OBJECT (self), menu_button_props[PROP_GICON]);
@@ -862,8 +862,8 @@ gtd_menu_button_set_label (GtdMenuButton *self,
                                gtk_button_get_use_underline (GTK_BUTTON (priv->button)));
   gtk_widget_set_hexpand (label_widget, TRUE);
   image = gtk_image_new_from_icon_name ("pan-down-symbolic");
-  gtk_container_add (GTK_CONTAINER (box), label_widget);
-  gtk_container_add (GTK_CONTAINER (box), image);
+  gtk_box_append (GTK_BOX (box), label_widget);
+  gtk_box_append (GTK_BOX (box), image);
   gtk_button_set_child (GTK_BUTTON (priv->button), box);
   priv->label_widget = label_widget;
 
diff --git a/tests/interactive/test-colorbutton.c b/tests/interactive/test-colorbutton.c
index b27a7f2..1387f10 100644
--- a/tests/interactive/test-colorbutton.c
+++ b/tests/interactive/test-colorbutton.c
@@ -74,7 +74,7 @@ main (gint   argc,
     }
 
   window = GTK_WINDOW (gtk_window_new ());
-  gtk_container_add (GTK_CONTAINER (window), grid);
+  gtk_window_set_child (window, grid);
   gtk_window_present (window);
 
   while (TRUE)
diff --git a/tests/interactive/test-filter-sort.c b/tests/interactive/test-filter-sort.c
index 15bc1c5..c79a093 100644
--- a/tests/interactive/test-filter-sort.c
+++ b/tests/interactive/test-filter-sort.c
@@ -130,10 +130,10 @@ create_task_cb (gpointer item,
 
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 16);
 
-  gtk_container_add (GTK_CONTAINER (box), create_label_for_string (gtd_task_get_title (task)));
+  gtk_box_append (GTK_BOX (box), create_label_for_string (gtd_task_get_title (task)));
 
   row = gtk_list_box_row_new ();
-  gtk_container_add (GTK_CONTAINER (row), box);
+  gtk_list_box_row_set_child (GTK_LIST_BOX_ROW (row), box);
 
   g_object_set_data (G_OBJECT (row), "task", task);
 
@@ -248,7 +248,7 @@ main (gint   argc,
                                  "max-content-height", 600,
                                  "hscrollbar-policy", GTK_POLICY_NEVER,
                                  NULL);
-  gtk_container_add (GTK_CONTAINER (scrolledwindow), listbox);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolledwindow), listbox);
 
   /* Search entry */
   search_entry = gtk_search_entry_new ();
@@ -268,19 +268,19 @@ main (gint   argc,
 
   /* Horizontal box */
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
-  gtk_container_add (GTK_CONTAINER (hbox), search_entry);
-  gtk_container_add (GTK_CONTAINER (hbox), check);
-  gtk_container_add (GTK_CONTAINER (hbox), button);
+  gtk_box_append (GTK_BOX (hbox), search_entry);
+  gtk_box_append (GTK_BOX (hbox), check);
+  gtk_box_append (GTK_BOX (hbox), button);
 
   /* Box */
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
-  gtk_container_add (GTK_CONTAINER (vbox), hbox);
-  gtk_container_add (GTK_CONTAINER (vbox), scrolledwindow);
+  gtk_box_append (GTK_BOX (vbox), hbox);
+  gtk_box_append (GTK_BOX (vbox), scrolledwindow);
 
   /* Window */
   window = GTK_WINDOW (gtk_window_new ());
   gtk_window_set_default_size (window, 800, 600);
-  gtk_container_add (GTK_CONTAINER (window), vbox);
+  gtk_window_set_child (GTK_WINDOW (window), vbox);
   gtk_window_present (window);
 
   while (TRUE)
diff --git a/tests/interactive/test-star-widget.c b/tests/interactive/test-star-widget.c
index f1fb515..57beb9a 100644
--- a/tests/interactive/test-star-widget.c
+++ b/tests/interactive/test-star-widget.c
@@ -43,7 +43,7 @@ main (gint   argc,
   /* Window */
   window = GTK_WINDOW (gtk_window_new ());
   gtk_window_set_default_size (window, 200, 150);
-  gtk_container_add (GTK_CONTAINER (window), start_widget);
+  gtk_window_set_child (window, start_widget);
   gtk_window_present (window);
 
   while (TRUE)
diff --git a/tests/interactive/test-task-model.c b/tests/interactive/test-task-model.c
index c10ace8..e67bdaf 100644
--- a/tests/interactive/test-task-model.c
+++ b/tests/interactive/test-task-model.c
@@ -98,10 +98,10 @@ create_task_cb (gpointer item,
 
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 16);
 
-  gtk_container_add (GTK_CONTAINER (box), create_label_for_string (gtd_task_get_title (task)));
+  gtk_box_append (GTK_BOX (box), create_label_for_string (gtd_task_get_title (task)));
 
   row = gtk_list_box_row_new ();
-  gtk_container_add (GTK_CONTAINER (row), box);
+  gtk_list_box_row_set_child (GTK_LIST_BOX_ROW (row), box);
 
   g_object_set_data (G_OBJECT (row), "task", task);
 
@@ -150,12 +150,12 @@ main (gint   argc,
                                  "max-content-height", 600,
                                  "hscrollbar-policy", GTK_POLICY_NEVER,
                                  NULL);
-  gtk_container_add (GTK_CONTAINER (scrolledwindow), listbox);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolledwindow), listbox);
 
   /* Window */
   window = GTK_WINDOW (gtk_window_new ());
   gtk_window_set_default_size (window, 800, 600);
-  gtk_container_add (GTK_CONTAINER (window), scrolledwindow);
+  gtk_window_set_child (GTK_WINDOW (window), scrolledwindow);
   gtk_window_present (window);
 
   /* Now, generate more tasks and lists after injecting to the manager */



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