aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip Withnall <philip.withnall@collabora.co.uk>2010-08-05 00:20:30 +0800
committerPhilip Withnall <philip.withnall@collabora.co.uk>2010-08-05 17:47:32 +0800
commit493056ec895710376ee79e403e6c17ea93029e4a (patch)
tree4eb72831dc0af21a07075133b7d09b3c496d96a6
parentb51dda50b585f6c3cee76996bfb6f45da000447d (diff)
downloadgsoc2013-empathy-493056ec895710376ee79e403e6c17ea93029e4a.tar
gsoc2013-empathy-493056ec895710376ee79e403e6c17ea93029e4a.tar.gz
gsoc2013-empathy-493056ec895710376ee79e403e6c17ea93029e4a.tar.bz2
gsoc2013-empathy-493056ec895710376ee79e403e6c17ea93029e4a.tar.lz
gsoc2013-empathy-493056ec895710376ee79e403e6c17ea93029e4a.tar.xz
gsoc2013-empathy-493056ec895710376ee79e403e6c17ea93029e4a.tar.zst
gsoc2013-empathy-493056ec895710376ee79e403e6c17ea93029e4a.zip
Fix an assertion failure in the filtering code due to show-offline changes
individual_view_is_visible_individual() is now called even when the live search widget isn't in use, so has to fail gracefully in that case. Closes: bgo#626041
-rw-r--r--libempathy-gtk/empathy-individual-view.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/libempathy-gtk/empathy-individual-view.c b/libempathy-gtk/empathy-individual-view.c
index da6a6c799..7882123f7 100644
--- a/libempathy-gtk/empathy-individual-view.c
+++ b/libempathy-gtk/empathy-individual-view.c
@@ -148,7 +148,10 @@ individual_view_is_visible_individual (EmpathyIndividualView *self,
const gchar *str;
GList *personas, *l;
- g_assert (live != NULL);
+ /* We're only giving the visibility wrt filtering here, not things like
+ * presence. */
+ if (live == NULL || gtk_widget_get_visible (GTK_WIDGET (live)) == FALSE)
+ return TRUE;
/* check alias name */
str = folks_individual_get_alias (individual);
@@ -197,7 +200,6 @@ individual_view_filter_visible_func (GtkTreeModel *model,
!gtk_widget_get_visible (priv->search_widget))
is_searching = FALSE;
-
gtk_tree_model_get (model, iter,
EMPATHY_INDIVIDUAL_STORE_COL_IS_GROUP, &is_group,
EMPATHY_INDIVIDUAL_STORE_COL_IS_SEPARATOR, &is_separator,