[evolution] Bug 621759 - EShellSearchbar reference counting errors

[Matthew Barnes <mbarnes src gnome org>]

commit b1ec17309b2aafb9b8aa2e1e39be9748fbe89030
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sun Jun 20 16:34:45 2010 -0400

    Bug 621759 - EShellSearchbar reference counting errors

 shell/e-shell-content.c |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)
---
diff --git a/shell/e-shell-content.c b/shell/e-shell-content.c
index 965fab8..515dfa8 100644
--- a/shell/e-shell-content.c
+++ b/shell/e-shell-content.c
@@ -254,13 +254,10 @@ shell_content_forall (GtkContainer *container,
                       gpointer callback_data)
 {
 	EShellContentPrivate *priv;
-	GtkWidget *parent = NULL;
 
 	priv = E_SHELL_CONTENT_GET_PRIVATE (container);
-	if (priv->searchbar != NULL)
-		parent = gtk_widget_get_parent (priv->searchbar);
 
-	if (include_internals && parent == GTK_WIDGET (container))
+	if (priv->searchbar != NULL)
 		callback (priv->searchbar, callback_data);
 
 	/* Chain up to parent's forall() method. */
@@ -346,10 +343,8 @@ e_shell_content_set_searchbar (EShellContent *shell_content,
 {
 	g_return_if_fail (E_IS_SHELL_CONTENT (shell_content));
 
-	if (searchbar != NULL) {
+	if (searchbar != NULL)
 		g_return_if_fail (GTK_IS_WIDGET (searchbar));
-		g_object_ref_sink (searchbar);
-	}
 
 	if (shell_content->priv->searchbar != NULL)
 		gtk_container_remove (