[gnome-todo] Replace gtk_widget_destroy



commit 8c7495de6c6b13ffeedd9de19ff6b69ca107c220
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Mon May 11 20:17:51 2020 -0300

    Replace gtk_widget_destroy

 src/gtd-application.c                          |  6 +++---
 src/gtd-omni-area.c                            |  2 +-
 src/gtd-window.c                               |  2 +-
 src/plugins/task-lists-workspace/gtd-sidebar.c | 10 +++++-----
 src/provider/gtd-provider-selector.c           |  4 ++--
 src/task-list-view/gtd-task-row.c              | 14 --------------
 src/task-list-view/gtd-task-row.h              |  2 --
 7 files changed, 12 insertions(+), 28 deletions(-)
---
diff --git a/src/gtd-application.c b/src/gtd-application.c
index a136e04..2a5233e 100644
--- a/src/gtd-application.c
+++ b/src/gtd-application.c
@@ -45,7 +45,7 @@ struct _GtdApplication
 
   GtdThemeManager       *theme_manager;
 
-  GtkWidget             *window;
+  GtkWindow             *window;
   GtkWidget             *plugin_dialog;
   GtkWidget             *initial_setup;
 };
@@ -160,7 +160,7 @@ gtd_application_quit (GSimpleAction *simple,
 {
   GtdApplication *self = GTD_APPLICATION (user_data);
 
-  gtk_widget_destroy (self->window);
+  gtk_window_destroy (self->window);
 }
 
 GtdApplication *
@@ -265,7 +265,7 @@ gtd_application_startup (GApplication *application)
 
   /* window */
   gtk_window_set_default_icon_name (APPLICATION_ID);
-  self->window = gtd_window_new (self);
+  self->window = GTK_WINDOW (gtd_window_new (self));
 
   /* plugin dialog */
   self->plugin_dialog = gtd_plugin_dialog_new ();
diff --git a/src/gtd-omni-area.c b/src/gtd-omni-area.c
index a4f05c7..f636bbd 100644
--- a/src/gtd-omni-area.c
+++ b/src/gtd-omni-area.c
@@ -244,7 +244,7 @@ gtd_omni_area_withdraw_message (GtdOmniArea *self,
 
   g_debug ("Removing message '%s' from Omni Area", id);
 
-  gtk_widget_destroy (widget);
+  gtk_container_remove (GTK_CONTAINER (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-window.c b/src/gtd-window.c
index f4fc6a3..5188ca4 100644
--- a/src/gtd-window.c
+++ b/src/gtd-window.c
@@ -156,7 +156,7 @@ error_message_notification_secondary_action (GtdNotification *notification,
 
   g_signal_connect (message_dialog,
                     "response",
-                    G_CALLBACK (gtk_widget_destroy),
+                    G_CALLBACK (gtk_window_destroy),
                     NULL);
 
   gtk_widget_show (message_dialog);
diff --git a/src/plugins/task-lists-workspace/gtd-sidebar.c b/src/plugins/task-lists-workspace/gtd-sidebar.c
index 6a5971c..ebfeba2 100644
--- a/src/plugins/task-lists-workspace/gtd-sidebar.c
+++ b/src/plugins/task-lists-workspace/gtd-sidebar.c
@@ -359,7 +359,7 @@ on_panel_removed_cb (GtdManager *manager,
   g_debug ("Removing panel '%s'", gtd_panel_get_panel_name (panel));
 
   if (row)
-    gtk_widget_destroy (GTK_WIDGET (row));
+    gtk_container_remove (GTK_CONTAINER (self->listbox), GTK_WIDGET (row));
 }
 
 static void
@@ -553,10 +553,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_widget_destroy (GTK_WIDGET (row));
+  gtk_container_remove (GTK_CONTAINER (self->listbox), GTK_WIDGET (row));
 
   row = get_row_for_provider (self, self->archive_listbox, provider);
-  gtk_widget_destroy (GTK_WIDGET (row));
+  gtk_container_remove (GTK_CONTAINER (self->archive_listbox), GTK_WIDGET (row));
 }
 
 
@@ -598,7 +598,7 @@ on_task_list_changed_cb (GtdManager  *manager,
         activate_appropriate_row (self, row);
 
       /* Destroy the old row */
-      gtk_widget_destroy (GTK_WIDGET (row));
+      gtk_container_remove (GTK_CONTAINER (listbox), GTK_WIDGET (row));
 
       /* Add a new row */
       add_task_list (self, list);
@@ -629,7 +629,7 @@ on_task_list_removed_cb (GtdManager  *manager,
   if (!row)
     return;
 
-  gtk_widget_destroy (GTK_WIDGET (row));
+  gtk_widget_unparent (GTK_WIDGET (row));
   gtk_list_box_invalidate_filter (listbox);
 }
 
diff --git a/src/provider/gtd-provider-selector.c b/src/provider/gtd-provider-selector.c
index 0ed0099..2659e0b 100644
--- a/src/provider/gtd-provider-selector.c
+++ b/src/provider/gtd-provider-selector.c
@@ -1,6 +1,6 @@
 /* gtd-provider-selector.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
@@ -245,7 +245,7 @@ remove_provider (GtdProviderSelector *selector,
 
       if (row_provider == provider)
         {
-          gtk_widget_destroy (l->data);
+          gtk_container_remove (GTK_CONTAINER (selector->listbox), l->data);
         }
       else
         {
diff --git a/src/task-list-view/gtd-task-row.c b/src/task-list-view/gtd-task-row.c
index e1b92a2..4c6db0f 100644
--- a/src/task-list-view/gtd-task-row.c
+++ b/src/task-list-view/gtd-task-row.c
@@ -801,20 +801,6 @@ gtd_task_row_set_due_date_visible (GtdTaskRow *row,
   gtk_widget_set_visible (GTK_WIDGET (row->task_date_label), show_due_date);
 }
 
-/**
- * gtd_task_row_destroy:
- * @self: a #GtdTaskRow
- *
- * Destroy @self after hiding it.
- */
-void
-gtd_task_row_destroy (GtdTaskRow *self)
-{
-  g_return_if_fail (GTD_IS_TASK_ROW (self));
-
-  gtk_widget_destroy (GTK_WIDGET (self));
-}
-
 gboolean
 gtd_task_row_get_handle_subtasks (GtdTaskRow *self)
 {
diff --git a/src/task-list-view/gtd-task-row.h b/src/task-list-view/gtd-task-row.h
index f283350..a527dfe 100644
--- a/src/task-list-view/gtd-task-row.h
+++ b/src/task-list-view/gtd-task-row.h
@@ -37,8 +37,6 @@ void                      gtd_task_row_set_list_name_visible    (GtdTaskRow
 void                      gtd_task_row_set_due_date_visible     (GtdTaskRow          *row,
                                                                  gboolean             show_due_date);
 
-void                      gtd_task_row_destroy                  (GtdTaskRow          *row);
-
 gboolean                  gtd_task_row_get_handle_subtasks      (GtdTaskRow          *self);
 
 void                      gtd_task_row_set_handle_subtasks      (GtdTaskRow          *self,


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