aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-04-27 05:38:00 +0800
committerEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-04-27 05:38:00 +0800
commita6469216a75489e0919270045e7e970732f67007 (patch)
tree6658d429ff78c0e9c3d61e7a7db4ede8578f69e8
parent3a811ff2ba47cbbbff04f6f9bc385e2c845d4c0a (diff)
downloadgsoc2013-empathy-a6469216a75489e0919270045e7e970732f67007.tar
gsoc2013-empathy-a6469216a75489e0919270045e7e970732f67007.tar.gz
gsoc2013-empathy-a6469216a75489e0919270045e7e970732f67007.tar.bz2
gsoc2013-empathy-a6469216a75489e0919270045e7e970732f67007.tar.lz
gsoc2013-empathy-a6469216a75489e0919270045e7e970732f67007.tar.xz
gsoc2013-empathy-a6469216a75489e0919270045e7e970732f67007.tar.zst
gsoc2013-empathy-a6469216a75489e0919270045e7e970732f67007.zip
LogWindow: check the 30min gap with the last message
-rw-r--r--libempathy-gtk/empathy-log-window.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c
index 8bbce70a0..f4935ffd8 100644
--- a/libempathy-gtk/empathy-log-window.c
+++ b/libempathy-gtk/empathy-log-window.c
@@ -581,7 +581,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);
@@ -589,7 +589,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);
@@ -598,6 +597,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 */