aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2010-05-28 23:28:24 +0800
committerMatthew Barnes <mbarnes@redhat.com>2010-05-28 23:28:24 +0800
commit09b0180c00c494e40e449de9de17c5c12c8b3ccd (patch)
tree880890c538c54a915f173d45e96a36310dbf384f
parent492f7668e553b13ce98d16f5badc8032e7c148fd (diff)
downloadgsoc2013-evolution-09b0180c00c494e40e449de9de17c5c12c8b3ccd.tar.gz
gsoc2013-evolution-09b0180c00c494e40e449de9de17c5c12c8b3ccd.tar.zst
gsoc2013-evolution-09b0180c00c494e40e449de9de17c5c12c8b3ccd.zip
Fix another runtime warning.
-rw-r--r--shell/e-shell-content.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/shell/e-shell-content.c b/shell/e-shell-content.c
index fba96d7477..965fab8672 100644
--- a/shell/e-shell-content.c
+++ b/shell/e-shell-content.c
@@ -254,13 +254,13 @@ shell_content_forall (GtkContainer *container,
gpointer callback_data)
{
EShellContentPrivate *priv;
- GtkWidget *parent;
+ GtkWidget *parent = NULL;
priv = E_SHELL_CONTENT_GET_PRIVATE (container);
- parent = gtk_widget_get_parent (priv->searchbar);
+ if (priv->searchbar != NULL)
+ parent = gtk_widget_get_parent (priv->searchbar);
- if (include_internals && priv->searchbar != NULL &&
- container == GTK_CONTAINER (parent))
+ if (include_internals && parent == GTK_WIDGET (container))
callback (priv->searchbar, callback_data);
/* Chain up to parent's forall() method. */