aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2001-08-03 04:08:48 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2001-08-03 04:08:48 +0800
commitbc6c3e50842dd5945f08bbf7cb6a405a5b269144 (patch)
tree6937e5e48b459f183992b2bea0e9287389785ca2
parent9a96cbd58ed1f063c81af4bc2900ba6dce677ca3 (diff)
downloadgsoc2013-evolution-bc6c3e50842dd5945f08bbf7cb6a405a5b269144.tar
gsoc2013-evolution-bc6c3e50842dd5945f08bbf7cb6a405a5b269144.tar.gz
gsoc2013-evolution-bc6c3e50842dd5945f08bbf7cb6a405a5b269144.tar.bz2
gsoc2013-evolution-bc6c3e50842dd5945f08bbf7cb6a405a5b269144.tar.lz
gsoc2013-evolution-bc6c3e50842dd5945f08bbf7cb6a405a5b269144.tar.xz
gsoc2013-evolution-bc6c3e50842dd5945f08bbf7cb6a405a5b269144.tar.zst
gsoc2013-evolution-bc6c3e50842dd5945f08bbf7cb6a405a5b269144.zip
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
-rw-r--r--shell/ChangeLog8
-rw-r--r--shell/e-shell-view.c2
-rw-r--r--shell/e-task-bar.c3
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 <ettore@ximian.com>
+
+ * 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 <fejj@ximian.com>
* 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 *