[empathy: 37/80] LogWindow: find the corrent parent for chat events



commit 0b1805580294ff8bafb80d61bf2dde4ab03a213d
Author: Emilio Pozuelo Monfort <emilio pozuelo collabora co uk>
Date:   Tue Apr 26 22:23:44 2011 +0100

    LogWindow: find the corrent parent for chat events

 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 08d572e..b8319dd 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)))
     {



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]