]> git.0d.be Git - empathy.git/commitdiff
LogWindow: check the 30min gap with the last message
authorEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Tue, 26 Apr 2011 21:38:00 +0000 (22:38 +0100)
committerEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Thu, 9 Jun 2011 11:34:55 +0000 (12:34 +0100)
libempathy-gtk/empathy-log-window.c

index b8319dd1ffc6c53d77a4cb83ec322018d603b56a..e786f164d5b563e4871450bd86b077ff507522ca 100644 (file)
@@ -582,7 +582,7 @@ model_is_parent (GtkTreeModel *model,
   TpAccount *account;
   gint64 timestamp;
   gboolean found = FALSE;
-  GtkTreeIter parent;
+  GtkTreeIter parent, child;
   gboolean is_toplevel;
 
   is_toplevel = !gtk_tree_model_iter_parent (model, &parent, iter);
@@ -590,7 +590,6 @@ model_is_parent (GtkTreeModel *model,
   gtk_tree_model_get (model, iter,
       COL_EVENTS_ACCOUNT, &account,
       COL_EVENTS_TARGET, &target,
-      COL_EVENTS_TS, &timestamp,
       COL_EVENTS_EVENT, &stored_event,
       -1);
 
@@ -599,6 +598,13 @@ model_is_parent (GtkTreeModel *model,
       account_equal (account, tpl_event_get_account (event)) &&
       entity_equal (target, event_get_target (event)))
     {
+      gtk_tree_model_iter_nth_child (model, &child, iter,
+          gtk_tree_model_iter_n_children (model, iter) - 1);
+
+      gtk_tree_model_get (model, &child,
+          COL_EVENTS_TS, &timestamp,
+          -1);
+
       if (ABS (tpl_event_get_timestamp (event) - timestamp) < 1800)
         {
           /* The gap is smaller than 30 min */