aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk/empathy-log-window.c
diff options
context:
space:
mode:
authorEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-04-27 05:23:44 +0800
committerEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-06-09 19:34:55 +0800
commit0b1805580294ff8bafb80d61bf2dde4ab03a213d (patch)
tree2dd539e5c51a2164bffb39e63937368bc62dd27d /libempathy-gtk/empathy-log-window.c
parent5ba374369d6d95bc48b46c2d39205512bf663358 (diff)
downloadgsoc2013-empathy-0b1805580294ff8bafb80d61bf2dde4ab03a213d.tar
gsoc2013-empathy-0b1805580294ff8bafb80d61bf2dde4ab03a213d.tar.gz
gsoc2013-empathy-0b1805580294ff8bafb80d61bf2dde4ab03a213d.tar.bz2
gsoc2013-empathy-0b1805580294ff8bafb80d61bf2dde4ab03a213d.tar.lz
gsoc2013-empathy-0b1805580294ff8bafb80d61bf2dde4ab03a213d.tar.xz
gsoc2013-empathy-0b1805580294ff8bafb80d61bf2dde4ab03a213d.tar.zst
gsoc2013-empathy-0b1805580294ff8bafb80d61bf2dde4ab03a213d.zip
LogWindow: find the corrent parent for chat events
Diffstat (limited to 'libempathy-gtk/empathy-log-window.c')
-rw-r--r--libempathy-gtk/empathy-log-window.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c
index 08d572ec8..b8319dd1f 100644
--- a/libempathy-gtk/empathy-log-window.c
+++ b/libempathy-gtk/empathy-log-window.c
@@ -582,6 +582,10 @@ model_is_parent (GtkTreeModel *model,
TpAccount *account;
gint64 timestamp;
gboolean found = FALSE;
+ GtkTreeIter parent;
+ gboolean is_toplevel;
+
+ is_toplevel = !gtk_tree_model_iter_parent (model, &parent, iter);
gtk_tree_model_get (model, iter,
COL_EVENTS_ACCOUNT, &account,
@@ -590,7 +594,8 @@ model_is_parent (GtkTreeModel *model,
COL_EVENTS_EVENT, &stored_event,
-1);
- if (G_OBJECT_TYPE (event) == G_OBJECT_TYPE (stored_event) &&
+ if (is_toplevel &&
+ G_OBJECT_TYPE (event) == G_OBJECT_TYPE (stored_event) &&
account_equal (account, tpl_event_get_account (event)) &&
entity_equal (target, event_get_target (event)))
{