[empathy] Don't try to expand groups if the EmpathyIndividualView's store is unset
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy] Don't try to expand groups if the EmpathyIndividualView's store is unset
- Date: Fri, 20 Aug 2010 10:13:58 +0000 (UTC)
commit 23566ca74cbdca4b237f9fd0758493bee26e95a9
Author: Philip Withnall <philip withnall collabora co uk>
Date: Fri Aug 20 11:04:40 2010 +0100
Don't try to expand groups if the EmpathyIndividualView's store is unset
libempathy-gtk/empathy-individual-view.c | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/libempathy-gtk/empathy-individual-view.c b/libempathy-gtk/empathy-individual-view.c
index d2562fc..9a7e521 100644
--- a/libempathy-gtk/empathy-individual-view.c
+++ b/libempathy-gtk/empathy-individual-view.c
@@ -1356,8 +1356,12 @@ individual_view_expand_idle_cb (EmpathyIndividualView *self)
g_signal_handlers_block_by_func (self,
individual_view_row_expand_or_collapse_cb, GINT_TO_POINTER (FALSE));
- gtk_tree_model_foreach (GTK_TREE_MODEL (priv->filter),
- (GtkTreeModelForeachFunc) expand_idle_foreach_cb, self);
+ /* The store/filter could've been removed while we were in the idle queue */
+ if (priv->filter != NULL)
+ {
+ gtk_tree_model_foreach (GTK_TREE_MODEL (priv->filter),
+ (GtkTreeModelForeachFunc) expand_idle_foreach_cb, self);
+ }
g_signal_handlers_unblock_by_func (self,
individual_view_row_expand_or_collapse_cb, GINT_TO_POINTER (FALSE));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]