Skip to content
Snippets Groups Projects
Commit bbee2f54 authored by Emmanuel Milou's avatar Emmanuel Milou
Browse files

Merge commit 'origin/release' into release

Conflicts:

	sflphone-gtk/src/calltree.c
parents 0fdddaea 5447a13e
Branches
Tags
No related merge requests found
...@@ -378,7 +378,8 @@ sflphone_incoming_call (call_t * c) ...@@ -378,7 +378,8 @@ sflphone_incoming_call (call_t * c)
update_menus(); update_menus();
} }
void process_dialing(call_t * c, guint keyval, gchar * key) void
process_dialing(call_t * c, guint keyval, gchar * key)
{ {
// We stop the tone // We stop the tone
if(strlen(c->to) == 0 && c->state != CALL_STATE_TRANSFERT){ if(strlen(c->to) == 0 && c->state != CALL_STATE_TRANSFERT){
...@@ -445,7 +446,8 @@ void process_dialing(call_t * c, guint keyval, gchar * key) ...@@ -445,7 +446,8 @@ void process_dialing(call_t * c, guint keyval, gchar * key)
} }
call_t * sflphone_new_call() call_t *
sflphone_new_call()
{ {
// Play a tone when creating a new call // Play a tone when creating a new call
if( call_list_get_size(current_calls) == 0 ) if( call_list_get_size(current_calls) == 0 )
...@@ -470,7 +472,8 @@ call_t * sflphone_new_call() ...@@ -470,7 +472,8 @@ call_t * sflphone_new_call()
void void
sflphone_keypad( guint keyval, gchar * key){ sflphone_keypad( guint keyval, gchar * key)
{
call_t * c = call_get_selected(current_calls); call_t * c = call_get_selected(current_calls);
if(c) if(c)
......
...@@ -320,7 +320,8 @@ void row_activated(GtkTreeView *tree_view, ...@@ -320,7 +320,8 @@ void row_activated(GtkTreeView *tree_view,
GtkWidget * GtkWidget *
create_toolbar (){ create_toolbar ()
{
GtkWidget *ret; GtkWidget *ret;
GtkWidget *image; GtkWidget *image;
...@@ -402,7 +403,8 @@ create_toolbar (){ ...@@ -402,7 +403,8 @@ create_toolbar (){
} }
void void
create_call_tree (calltab_t* tab){ create_call_tree (calltab_t* tab)
{
GtkWidget *sw; GtkWidget *sw;
GtkCellRenderer *rend; GtkCellRenderer *rend;
GtkTreeViewColumn *col; GtkTreeViewColumn *col;
...@@ -606,7 +608,7 @@ update_call_tree_add (calltab_t* tab, call_t * c) ...@@ -606,7 +608,7 @@ update_call_tree_add (calltab_t* tab, call_t * c)
call_get_name(c), call_get_name(c),
call_get_number(c)); call_get_number(c));
gtk_list_store_append (tab->store, &iter); gtk_list_store_prepend (tab->store, &iter);
switch(c->state) switch(c->state)
{ {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment