diff options
| author | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-04-27 05:23:44 +0800 |
|---|---|---|
| committer | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-04-27 05:23:44 +0800 |
| commit | 3a811ff2ba47cbbbff04f6f9bc385e2c845d4c0a (patch) | |
| tree | 0e871b641c0c0b3d37233da136af724e057cc616 | |
| parent | 4105981fd4140b91fa23ddc424f5ab2389f635a8 (diff) | |
| download | gsoc2013-empathy-3a811ff2ba47cbbbff04f6f9bc385e2c845d4c0a.tar gsoc2013-empathy-3a811ff2ba47cbbbff04f6f9bc385e2c845d4c0a.tar.gz gsoc2013-empathy-3a811ff2ba47cbbbff04f6f9bc385e2c845d4c0a.tar.bz2 gsoc2013-empathy-3a811ff2ba47cbbbff04f6f9bc385e2c845d4c0a.tar.lz gsoc2013-empathy-3a811ff2ba47cbbbff04f6f9bc385e2c845d4c0a.tar.xz gsoc2013-empathy-3a811ff2ba47cbbbff04f6f9bc385e2c845d4c0a.tar.zst gsoc2013-empathy-3a811ff2ba47cbbbff04f6f9bc385e2c845d4c0a.zip | |
LogWindow: find the corrent parent for chat events
| -rw-r--r-- | libempathy-gtk/empathy-log-window.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c index db13328ef..8bbce70a0 100644 --- a/libempathy-gtk/empathy-log-window.c +++ b/libempathy-gtk/empathy-log-window.c @@ -581,6 +581,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, @@ -589,7 +593,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))) { |