From bc6c3e50842dd5945f08bbf7cb6a405a5b269144 Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Thu, 2 Aug 2001 20:08:48 +0000 Subject: Set the `set_folder_uri' to NULL when freeing it. * e-shell-view.c (switch_on_folder_tree_click): Set the `set_folder_uri' to NULL when freeing it. * e-task-bar.c (e_task_bar_remove_task): Just destroy the widget. No need to `gtk_container_remove()' it. svn path=/trunk/; revision=11597 --- shell/ChangeLog | 8 ++++++++ shell/e-shell-view.c | 2 ++ shell/e-task-bar.c | 3 +-- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/shell/ChangeLog b/shell/ChangeLog index 90b86cf29c..8f78ac8936 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,11 @@ +2001-08-01 Ettore Perazzoli + + * e-shell-view.c (switch_on_folder_tree_click): Set the + `set_folder_uri' to NULL when freeing it. + + * e-task-bar.c (e_task_bar_remove_task): Just destroy the widget. + No need to `gtk_container_remove()' it. + 2001-08-01 Jeffrey Stedfast * e-shell-view-menu.c (command_new_folder): Do a NULL-check on diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c index d2f8d74920..5e2c2cbf1b 100644 --- a/shell/e-shell-view.c +++ b/shell/e-shell-view.c @@ -455,7 +455,9 @@ switch_on_folder_tree_click (EShellView *shell_view, if (priv->set_folder_timeout != 0) gtk_timeout_remove (priv->set_folder_timeout); + g_free (priv->set_folder_uri); + priv->set_folder_uri = NULL; cleanup_delayed_selection (shell_view); diff --git a/shell/e-task-bar.c b/shell/e-task-bar.c index efc552f661..f732d59a69 100644 --- a/shell/e-task-bar.c +++ b/shell/e-task-bar.c @@ -132,8 +132,7 @@ e_task_bar_remove_task (ETaskBar *task_bar, g_return_if_fail (n >= 0); task_widget = e_task_bar_get_task_widget (task_bar, n); - - gtk_container_remove (GTK_CONTAINER (task_bar), GTK_WIDGET (task_widget)); + gtk_widget_destroy (GTK_WIDGET (task_widget)); } ETaskWidget * -- cgit