From 7da4268f1a4659fd5299cb93bf089be7dfbd1d5b Mon Sep 17 00:00:00 2001
From: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
Date: Thu, 24 Apr 2008 11:24:56 -0400
Subject: [PATCH] History - pop head and push tail if full
---
sflphone-gtk/src/actions.c | 4 ++--
sflphone-gtk/src/calllist.c | 11 +++++++++++
sflphone-gtk/src/calltree.c | 3 ++-
3 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/sflphone-gtk/src/actions.c b/sflphone-gtk/src/actions.c
index bfc57bc72b..5f1e7d12c3 100644
--- a/sflphone-gtk/src/actions.c
+++ b/sflphone-gtk/src/actions.c
@@ -377,7 +377,7 @@ sflphone_incoming_call (call_t * c)
call_list_add ( current_calls, c );
call_list_add( history, c );
update_call_tree_add( current_calls , c );
- update_call_tree_add( history , c );
+ //update_call_tree_add( history , c );
update_menus();
}
@@ -649,7 +649,7 @@ sflphone_place_call ( call_t * c )
// Update history
c->history_state = OUTGOING;
call_list_add(history, c);
- update_call_tree_add(history, c);
+ //update_call_tree_add(history, c);
}
}
diff --git a/sflphone-gtk/src/calllist.c b/sflphone-gtk/src/calllist.c
index 628fda7e31..874bca0f67 100644
--- a/sflphone-gtk/src/calllist.c
+++ b/sflphone-gtk/src/calllist.c
@@ -81,9 +81,20 @@ call_list_add (calltab_t* tab, call_t * c)
{
if( tab == history )
{
+ g_print("ADD THE FUCKING CALL call list size = %i - max calls = %i\n", call_list_get_size(tab) , dbus_get_max_calls());
+ // First case: can still add calls to the list
if( call_list_get_size(tab) < dbus_get_max_calls() )
{
+ g_print("ADD THE FUCKING CALL\n");
g_queue_push_tail (tab->callQueue, (gpointer *) c);
+ update_call_tree_add( history , c );
+ }
+ // List full -> Remove the last call from history and preprend the new call to the list
+ else
+ {
+ update_call_tree_remove( history , (call_t*)g_queue_pop_head( tab -> callQueue ) );
+ g_queue_push_tail (tab->callQueue, (gpointer *) c);
+ update_call_tree_add( history , c );
}
}
else
diff --git a/sflphone-gtk/src/calltree.c b/sflphone-gtk/src/calltree.c
index 2ef2a24b0a..b60dd81f61 100644
--- a/sflphone-gtk/src/calltree.c
+++ b/sflphone-gtk/src/calltree.c
@@ -619,7 +619,8 @@ update_call_tree (calltab_t* tab, call_t * c)
void
update_call_tree_add (calltab_t* tab, call_t * c)
{
- if( tab == history && ( call_list_get_size( tab ) >= dbus_get_max_calls() ) )
+ g_print("ADD THE FUCKING CALL call list size = %i - max calls = %i\n", call_list_get_size(tab) , dbus_get_max_calls());
+ if( tab == history && ( call_list_get_size( tab ) > dbus_get_max_calls() ) )
return;
GdkPixbuf *pixbuf;
--
GitLab