diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-06-21 04:34:45 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-06-21 04:34:45 +0800 |
| commit | b1ec17309b2aafb9b8aa2e1e39be9748fbe89030 (patch) | |
| tree | cff8daa7c2a365493266c8872d147dbf870a24ee /shell | |
| parent | 62f9c59af9400350069ddfcd2327760e81e5ab70 (diff) | |
| download | gsoc2013-evolution-b1ec17309b2aafb9b8aa2e1e39be9748fbe89030.tar gsoc2013-evolution-b1ec17309b2aafb9b8aa2e1e39be9748fbe89030.tar.gz gsoc2013-evolution-b1ec17309b2aafb9b8aa2e1e39be9748fbe89030.tar.bz2 gsoc2013-evolution-b1ec17309b2aafb9b8aa2e1e39be9748fbe89030.tar.lz gsoc2013-evolution-b1ec17309b2aafb9b8aa2e1e39be9748fbe89030.tar.xz gsoc2013-evolution-b1ec17309b2aafb9b8aa2e1e39be9748fbe89030.tar.zst gsoc2013-evolution-b1ec17309b2aafb9b8aa2e1e39be9748fbe89030.zip | |
Bug 621759 - EShellSearchbar reference counting errors
Diffstat (limited to 'shell')
| -rw-r--r-- | 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 965fab8672..515dfa83bf 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 ( |