Merge commit 'origin/master'

.gitignore

@@ -53,6 +53,14 @@ sflphone-gtk/doc/html/*
 /libs/dbus/tools/dbusxx-*
 /libs/dbus/dbus-c++-1.pc
 /libs/dbus/doc
+/libs/dbus/INSTALL
+/libs/dbus/config.guess
+/libs/dbus/config.sub
+/libs/dbus/depcomp
+/libs/dbus/install-sh
+/libs/dbus/ltmain.sh
+/libs/dbus/missing
+
 
 # Ignore sflphone-gtk stuff
 /sflphone-gtk/config.*
@@ -71,7 +79,6 @@ sflphone-gtk/doc/html/*
 # Ignore temp libs stuff
 tools/portaudio
 
-
 # Ignore sub-modules stuff
 ## libiax2
 /libs/libiax2/doc/html

sflphone-gtk/src/calltree.c

@@ -35,268 +35,288 @@ GtkToolItem * transfertButton;
 GtkToolItem * unholdButton;
 guint transfertButtonConnId; //The button toggled signal connection ID
 
+// list of the accounts to be displayed when the arrow beside the call button is pressed
+// should be used to set a default account to make output calls
+GtkWidget *accounts_list;
+
 /**
  * Make a call
  */
-static void 
+	static void 
 call_button( GtkWidget *widget, gpointer   data )
 {
-  sflphone_new_call();
+	sflphone_new_call();
 }
 
 /**
  * Pick up
  */
-static void 
+	static void 
 pick_up( GtkWidget *widget, gpointer   data )
 {
-  sflphone_pick_up();
+	sflphone_pick_up();
 }
 
 /**
  * Hang up the line
  */
-static void 
+	static void 
 hang_up( GtkWidget *widget, gpointer   data )
 {
-  sflphone_hang_up();
+	sflphone_hang_up();
 }
 
 /**
  * Hold the line
  */
-static void 
+	static void 
 hold( GtkWidget *widget, gpointer   data )
 {
-  sflphone_on_hold();
+	sflphone_on_hold();
 }
 
 /**
  * Transfert the line
  */
-static void 
+	static void 
 transfert  (GtkToggleToolButton *toggle_tool_button,
-            gpointer             user_data)
+		gpointer             user_data)
 {
-  gboolean up = gtk_toggle_tool_button_get_active(toggle_tool_button);
-  if(up)
-  {
-    sflphone_set_transfert();
-  }
-  else
-  {
-    sflphone_unset_transfert();
-  }
+	gboolean up = gtk_toggle_tool_button_get_active(toggle_tool_button);
+	if(up)
+	{
+		sflphone_set_transfert();
+	}
+	else
+	{
+		sflphone_unset_transfert();
+	}
 }
 
 /**
  * Unhold call
  */
-static void 
+	static void 
 unhold( GtkWidget *widget, gpointer   data )
 {
-  sflphone_off_hold();
+	sflphone_off_hold();
 }
 
-void 
+	void 
 toolbar_update_buttons ()
 {
-  gtk_widget_set_sensitive( GTK_WIDGET(callButton),       FALSE);
-  gtk_widget_set_sensitive( GTK_WIDGET(pickupButton),     FALSE);
-  gtk_widget_set_sensitive( GTK_WIDGET(hangupButton),     FALSE);
-  gtk_widget_set_sensitive( GTK_WIDGET(holdButton),       FALSE);
-  gtk_widget_set_sensitive( GTK_WIDGET(transfertButton),  FALSE);
-  gtk_widget_set_sensitive( GTK_WIDGET(unholdButton),     FALSE);
-  g_object_ref(holdButton);
-  g_object_ref(unholdButton);
-  gtk_container_remove(GTK_CONTAINER(toolbar), GTK_WIDGET(holdButton));
-  gtk_container_remove(GTK_CONTAINER(toolbar), GTK_WIDGET(unholdButton));
-  gtk_toolbar_insert(GTK_TOOLBAR(toolbar), holdButton, 3);
-	
+	gtk_widget_set_sensitive( GTK_WIDGET(callButton),       FALSE);
+	gtk_widget_set_sensitive( GTK_WIDGET(pickupButton),     FALSE);
+	gtk_widget_set_sensitive( GTK_WIDGET(hangupButton),     FALSE);
+	gtk_widget_set_sensitive( GTK_WIDGET(holdButton),       FALSE);
+	gtk_widget_set_sensitive( GTK_WIDGET(transfertButton),  FALSE);
+	gtk_widget_set_sensitive( GTK_WIDGET(unholdButton),     FALSE);
+	g_object_ref(holdButton);
+	g_object_ref(unholdButton);
+	gtk_container_remove(GTK_CONTAINER(toolbar), GTK_WIDGET(holdButton));
+	gtk_container_remove(GTK_CONTAINER(toolbar), GTK_WIDGET(unholdButton));
+	gtk_toolbar_insert(GTK_TOOLBAR(toolbar), holdButton, 3);
+
 	gtk_signal_handler_block(GTK_OBJECT(transfertButton),transfertButtonConnId);
-  gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(transfertButton), FALSE);
-  gtk_signal_handler_unblock(transfertButton, transfertButtonConnId);
-	
+	gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(transfertButton), FALSE);
+	gtk_signal_handler_unblock(transfertButton, transfertButtonConnId);
+
 	call_t * selectedCall = call_get_selected();
 	if (selectedCall)
 	{
-    switch(selectedCall->state) 
-  	{
-  	  case CALL_STATE_INCOMING:
-        gtk_widget_set_sensitive( GTK_WIDGET(pickupButton),     TRUE);
-        gtk_widget_set_sensitive( GTK_WIDGET(hangupButton),     TRUE);
-        break;
-      case CALL_STATE_HOLD:
-    	  gtk_widget_set_sensitive( GTK_WIDGET(hangupButton),     TRUE);
-        gtk_widget_set_sensitive( GTK_WIDGET(unholdButton),     TRUE);
-        gtk_widget_set_sensitive( GTK_WIDGET(callButton),       TRUE);
-        g_object_ref(holdButton);
-        gtk_container_remove(GTK_CONTAINER(toolbar), GTK_WIDGET(holdButton));
-        gtk_toolbar_insert(GTK_TOOLBAR(toolbar), unholdButton, 3);
-        break;
-      case CALL_STATE_RINGING:
-    	  gtk_widget_set_sensitive( GTK_WIDGET(hangupButton),     TRUE);
-        break;
-      case CALL_STATE_DIALING:
-        gtk_widget_set_sensitive( GTK_WIDGET(pickupButton),     TRUE);
-        gtk_widget_set_sensitive( GTK_WIDGET(hangupButton),     TRUE);
-        gtk_widget_set_sensitive( GTK_WIDGET(callButton),       TRUE);
-        break;
-      case CALL_STATE_CURRENT:
-        gtk_widget_set_sensitive( GTK_WIDGET(hangupButton),     TRUE);
-        gtk_widget_set_sensitive( GTK_WIDGET(holdButton),       TRUE);
-        gtk_widget_set_sensitive( GTK_WIDGET(transfertButton),  TRUE);
-        gtk_widget_set_sensitive( GTK_WIDGET(callButton),       TRUE);
-        break;
-      case CALL_STATE_BUSY:
-      case CALL_STATE_FAILURE:
-        gtk_widget_set_sensitive( GTK_WIDGET(hangupButton),     TRUE);
-        break; 
-      case CALL_STATE_TRANSFERT:
-        gtk_signal_handler_block(GTK_OBJECT(transfertButton),transfertButtonConnId);
-        gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(transfertButton), TRUE);
-        gtk_signal_handler_unblock(transfertButton, transfertButtonConnId);
-        gtk_widget_set_sensitive( GTK_WIDGET(callButton),       TRUE);
-        gtk_widget_set_sensitive( GTK_WIDGET(pickupButton),     TRUE);
-        gtk_widget_set_sensitive( GTK_WIDGET(hangupButton),     TRUE);
-        gtk_widget_set_sensitive( GTK_WIDGET(holdButton),       TRUE);
-        gtk_widget_set_sensitive( GTK_WIDGET(transfertButton),  TRUE);
-        break;
-  	  default:
-  	    g_warning("Should not happen!");
-  	    break;
-  	}
-  }
-  else 
-  {
-    if( account_list_get_size() > 0 )
-    {
-      gtk_widget_set_sensitive( GTK_WIDGET(callButton), TRUE);
-    }
-    else
-    {
-      gtk_widget_set_sensitive( GTK_WIDGET(callButton), FALSE);
-    }
-  }
+		switch(selectedCall->state) 
+		{
+			case CALL_STATE_INCOMING:
+				gtk_widget_set_sensitive( GTK_WIDGET(pickupButton),     TRUE);
+				gtk_widget_set_sensitive( GTK_WIDGET(hangupButton),     TRUE);
+				break;
+			case CALL_STATE_HOLD:
+				gtk_widget_set_sensitive( GTK_WIDGET(hangupButton),     TRUE);
+				gtk_widget_set_sensitive( GTK_WIDGET(unholdButton),     TRUE);
+				gtk_widget_set_sensitive( GTK_WIDGET(callButton),       TRUE);
+				g_object_ref(holdButton);
+				gtk_container_remove(GTK_CONTAINER(toolbar), GTK_WIDGET(holdButton));
+				gtk_toolbar_insert(GTK_TOOLBAR(toolbar), unholdButton, 3);
+				break;
+			case CALL_STATE_RINGING:
+				gtk_widget_set_sensitive( GTK_WIDGET(hangupButton),     TRUE);
+				break;
+			case CALL_STATE_DIALING:
+				gtk_widget_set_sensitive( GTK_WIDGET(pickupButton),     TRUE);
+				gtk_widget_set_sensitive( GTK_WIDGET(hangupButton),     TRUE);
+				gtk_widget_set_sensitive( GTK_WIDGET(callButton),       TRUE);
+				break;
+			case CALL_STATE_CURRENT:
+				gtk_widget_set_sensitive( GTK_WIDGET(hangupButton),     TRUE);
+				gtk_widget_set_sensitive( GTK_WIDGET(holdButton),       TRUE);
+				gtk_widget_set_sensitive( GTK_WIDGET(transfertButton),  TRUE);
+				gtk_widget_set_sensitive( GTK_WIDGET(callButton),       TRUE);
+				break;
+			case CALL_STATE_BUSY:
+			case CALL_STATE_FAILURE:
+				gtk_widget_set_sensitive( GTK_WIDGET(hangupButton),     TRUE);
+				break; 
+			case CALL_STATE_TRANSFERT:
+				gtk_signal_handler_block(GTK_OBJECT(transfertButton),transfertButtonConnId);
+				gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(transfertButton), TRUE);
+				gtk_signal_handler_unblock(transfertButton, transfertButtonConnId);
+				gtk_widget_set_sensitive( GTK_WIDGET(callButton),       TRUE);
+				gtk_widget_set_sensitive( GTK_WIDGET(pickupButton),     TRUE);
+				gtk_widget_set_sensitive( GTK_WIDGET(hangupButton),     TRUE);
+				gtk_widget_set_sensitive( GTK_WIDGET(holdButton),       TRUE);
+				gtk_widget_set_sensitive( GTK_WIDGET(transfertButton),  TRUE);
+				break;
+			default:
+				g_warning("Should not happen!");
+				break;
+		}
+	}
+	else 
+	{
+		if( account_list_get_size() > 0 )
+		{
+			gtk_widget_set_sensitive( GTK_WIDGET(callButton), TRUE);
+		}
+		else
+		{
+			gtk_widget_set_sensitive( GTK_WIDGET(callButton), FALSE);
+		}
+	}
 }
 /* Call back when the user click on a call in the list */
-static void 
+	static void 
 selected(GtkTreeSelection *sel, GtkTreeModel *model) 
 {
 	GtkTreeIter  iter;
 	GValue val;
-	
+
 	if (! gtk_tree_selection_get_selected (sel, &model, &iter))
 		return;
-  
+
 	val.g_type = 0;
 	gtk_tree_model_get_value (model, &iter, 2, &val);
-	
+
 	call_select((call_t*) g_value_get_pointer(&val));
-  g_value_unset(&val);
-  
-  toolbar_update_buttons();
+	g_value_unset(&val);
+
+	toolbar_update_buttons();
 }
 
 /* A row is activated when it is double clicked */
 void  row_activated(GtkTreeView       *tree_view,
-                    GtkTreePath       *path,
-                    GtkTreeViewColumn *column,
-                    void * foo) 
+		GtkTreePath       *path,
+		GtkTreeViewColumn *column,
+		void * foo) 
 {
-  call_t * selectedCall = call_get_selected();
+	call_t * selectedCall = call_get_selected();
 	if (selectedCall)
 	{
-    switch(selectedCall->state)  
-  	{
-  	  case CALL_STATE_INCOMING:
-        dbus_accept(selectedCall);
-        break;
-      case CALL_STATE_HOLD:
-        dbus_unhold(selectedCall);
-        break;
-      case CALL_STATE_RINGING:
-      case CALL_STATE_CURRENT:
-      case CALL_STATE_BUSY:
-      case CALL_STATE_FAILURE:
-        break;
-      case CALL_STATE_DIALING:
-        sflphone_place_call (selectedCall);
-        break;
-  	  default:
-  	    g_warning("Should not happen!");
-  	    break;
-  	}
-  }
+		switch(selectedCall->state)  
+		{
+			case CALL_STATE_INCOMING:
+				dbus_accept(selectedCall);
+				break;
+			case CALL_STATE_HOLD:
+				dbus_unhold(selectedCall);
+				break;
+			case CALL_STATE_RINGING:
+			case CALL_STATE_CURRENT:
+			case CALL_STATE_BUSY:
+			case CALL_STATE_FAILURE:
+				break;
+			case CALL_STATE_DIALING:
+				sflphone_place_call (selectedCall);
+				break;
+			default:
+				g_warning("Should not happen!");
+				break;
+		}
+	}
 }                  
 
 
 GtkWidget * 
 create_toolbar (){
-  GtkWidget *ret;
-  GtkWidget *image;
-
-  ret = gtk_toolbar_new();
-  
-  toolbar = ret;
-
-  image = gtk_image_new_from_file( ICONS_DIR "/call.svg");
-  callButton = gtk_tool_button_new (image, "Place a Call");
-  g_signal_connect (G_OBJECT (callButton), "clicked",
-                    G_CALLBACK (call_button), NULL);
-  gtk_toolbar_insert(GTK_TOOLBAR(ret), GTK_TOOL_ITEM(callButton), -1);  
-
-  image = gtk_image_new_from_file( ICONS_DIR "/accept.svg");
-  pickupButton = gtk_tool_button_new (image, "Pick Up");
-  gtk_widget_set_state( GTK_WIDGET(pickupButton), GTK_STATE_INSENSITIVE);
-  g_signal_connect (G_OBJECT (pickupButton), "clicked",
-                    G_CALLBACK (pick_up), NULL);
-  gtk_toolbar_insert(GTK_TOOLBAR(ret), GTK_TOOL_ITEM(pickupButton), -1);  
-
-  image = gtk_image_new_from_file( ICONS_DIR "/hang_up.svg");
-  hangupButton = gtk_tool_button_new (image, "Hang up");
-  //gtk_widget_hide( hangupButton );
-  gtk_widget_set_state( GTK_WIDGET(hangupButton), GTK_STATE_INSENSITIVE);
-  g_signal_connect (G_OBJECT (hangupButton), "clicked",
-                    G_CALLBACK (hang_up), NULL);
-  gtk_toolbar_insert(GTK_TOOLBAR(ret), GTK_TOOL_ITEM(hangupButton), -1);  
-                    
-  image = gtk_image_new_from_file( ICONS_DIR "/unhold.svg");
-  unholdButton = gtk_tool_button_new (image, "Off Hold");
-  gtk_widget_set_state( GTK_WIDGET(unholdButton), GTK_STATE_INSENSITIVE);
-  g_signal_connect (G_OBJECT (unholdButton), "clicked",
-                    G_CALLBACK (unhold), NULL);
-  gtk_widget_show_all(GTK_WIDGET(unholdButton));
-         
-  image = gtk_image_new_from_file( ICONS_DIR "/hold.svg");
-  holdButton =  gtk_tool_button_new (image, "On Hold");
-  gtk_widget_set_state( GTK_WIDGET(holdButton), GTK_STATE_INSENSITIVE);
-  g_signal_connect (G_OBJECT (holdButton), "clicked",
-                    G_CALLBACK (hold), NULL);
-  gtk_toolbar_insert(GTK_TOOLBAR(ret), GTK_TOOL_ITEM(holdButton), -1);  
-  
-  image = gtk_image_new_from_file( ICONS_DIR "/transfert.svg");
-  transfertButton = gtk_toggle_tool_button_new ();
-  gtk_tool_button_set_icon_widget(GTK_TOOL_BUTTON(transfertButton), image);
-  gtk_tool_button_set_label(GTK_TOOL_BUTTON(transfertButton), "Transfert");
-  gtk_widget_set_state( GTK_WIDGET(transfertButton), GTK_STATE_INSENSITIVE);
-  transfertButtonConnId = g_signal_connect (G_OBJECT (transfertButton), "toggled",
-                    G_CALLBACK (transfert), NULL);
-  gtk_toolbar_insert(GTK_TOOLBAR(ret), GTK_TOOL_ITEM(transfertButton), -1);  
-  
-
-  return ret;
+	GtkWidget *ret;
+	GtkWidget *image;
+
+	GtkWidget *item1;
+	GtkWidget *item2;
+	GtkWidget *item3;
+
+	ret = gtk_toolbar_new();
+
+	toolbar = ret;
+
+	accounts_list = gtk_menu_new();
+	item1 = gtk_menu_item_new_with_label("Compte A");
+	gtk_container_add(GTK_CONTAINER(accounts_list), item1);
+	gtk_widget_show(item1);
+	item2 = gtk_menu_item_new();
+        gtk_container_add(GTK_CONTAINER(accounts_list), item2);
+	item3 = gtk_menu_item_new();
+        gtk_container_add(GTK_CONTAINER(accounts_list), item3);
+
+
+	image = gtk_image_new_from_file( ICONS_DIR "/call.svg");
+	callButton = gtk_menu_tool_button_new (image, "Place a Call");
+	gtk_menu_tool_button_set_menu(GTK_MENU_TOOL_BUTTON(callButton), GTK_MENU(accounts_list));
+	g_signal_connect (G_OBJECT (callButton), "clicked",
+			G_CALLBACK (call_button), NULL);
+	gtk_toolbar_insert(GTK_TOOLBAR(ret), GTK_TOOL_ITEM(callButton), -1);  
+
+
+	image = gtk_image_new_from_file( ICONS_DIR "/accept.svg");
+	pickupButton = gtk_tool_button_new (image, "Pick Up");
+	gtk_widget_set_state( GTK_WIDGET(pickupButton), GTK_STATE_INSENSITIVE);
+	g_signal_connect (G_OBJECT (pickupButton), "clicked",
+			G_CALLBACK (pick_up), NULL);
+	gtk_toolbar_insert(GTK_TOOLBAR(ret), GTK_TOOL_ITEM(pickupButton), -1);  
+
+	image = gtk_image_new_from_file( ICONS_DIR "/hang_up.svg");
+	hangupButton = gtk_tool_button_new (image, "Hang up");
+	//gtk_widget_hide( hangupButton );
+	gtk_widget_set_state( GTK_WIDGET(hangupButton), GTK_STATE_INSENSITIVE);
+	g_signal_connect (G_OBJECT (hangupButton), "clicked",
+			G_CALLBACK (hang_up), NULL);
+	gtk_toolbar_insert(GTK_TOOLBAR(ret), GTK_TOOL_ITEM(hangupButton), -1);  
+
+	image = gtk_image_new_from_file( ICONS_DIR "/unhold.svg");
+	unholdButton = gtk_tool_button_new (image, "Off Hold");
+	gtk_widget_set_state( GTK_WIDGET(unholdButton), GTK_STATE_INSENSITIVE);
+	g_signal_connect (G_OBJECT (unholdButton), "clicked",
+			G_CALLBACK (unhold), NULL);
+	gtk_widget_show_all(GTK_WIDGET(unholdButton));
+
+	image = gtk_image_new_from_file( ICONS_DIR "/hold.svg");
+	holdButton =  gtk_tool_button_new (image, "On Hold");
+	gtk_widget_set_state( GTK_WIDGET(holdButton), GTK_STATE_INSENSITIVE);
+	g_signal_connect (G_OBJECT (holdButton), "clicked",
+			G_CALLBACK (hold), NULL);
+	gtk_toolbar_insert(GTK_TOOLBAR(ret), GTK_TOOL_ITEM(holdButton), -1);  
+
+	image = gtk_image_new_from_file( ICONS_DIR "/transfert.svg");
+	transfertButton = gtk_toggle_tool_button_new ();
+	gtk_tool_button_set_icon_widget(GTK_TOOL_BUTTON(transfertButton), image);
+	gtk_tool_button_set_label(GTK_TOOL_BUTTON(transfertButton), "Transfert");
+	gtk_widget_set_state( GTK_WIDGET(transfertButton), GTK_STATE_INSENSITIVE);
+	transfertButtonConnId = g_signal_connect (G_OBJECT (transfertButton), "toggled",
+			G_CALLBACK (transfert), NULL);
+	gtk_toolbar_insert(GTK_TOOLBAR(ret), GTK_TOOL_ITEM(transfertButton), -1);  
+
+
+	return ret;
 
 }  
 
 GtkWidget * 
 create_call_tree (){
-  GtkWidget *ret;
+	GtkWidget *ret;
 	GtkWidget *sw;
 	GtkCellRenderer *rend;
 	GtkTreeViewColumn *col;
 	GtkTreeSelection *sel;
-	
+
 	ret = gtk_vbox_new(FALSE, 10); 
 	gtk_container_set_border_width (GTK_CONTAINER (ret), 0);
 
@@ -305,222 +325,222 @@ create_call_tree (){
 	gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw), GTK_SHADOW_IN);
 
 	store = gtk_list_store_new (3, 
-	  GDK_TYPE_PIXBUF,// Icon 
-	  G_TYPE_STRING,  // Description
-	  G_TYPE_POINTER  // Pointer to the Object
-	  );
+			GDK_TYPE_PIXBUF,// Icon 
+			G_TYPE_STRING,  // Description
+			G_TYPE_POINTER  // Pointer to the Object
+			);
 
 
 	view = gtk_tree_view_new_with_model (GTK_TREE_MODEL(store));
-  gtk_tree_view_set_headers_visible (GTK_TREE_VIEW(view), FALSE);
-  g_signal_connect (G_OBJECT (view), "row-activated",
-			  G_CALLBACK (row_activated),
-			  NULL);
-	
-  rend = gtk_cell_renderer_pixbuf_new();
-  col = gtk_tree_view_column_new_with_attributes ("Icon",
-							rend,
-							"pixbuf", 0,
-							NULL);
+	gtk_tree_view_set_headers_visible (GTK_TREE_VIEW(view), FALSE);
+	g_signal_connect (G_OBJECT (view), "row-activated",
+			G_CALLBACK (row_activated),
+			NULL);
+
+	rend = gtk_cell_renderer_pixbuf_new();
+	col = gtk_tree_view_column_new_with_attributes ("Icon",
+			rend,
+			"pixbuf", 0,
+			NULL);
 	gtk_tree_view_append_column (GTK_TREE_VIEW(view), col);
 
 	rend = gtk_cell_renderer_text_new();
 	col = gtk_tree_view_column_new_with_attributes ("Description",
-							rend,
-							"markup", 1,
-							NULL);
+			rend,
+			"markup", 1,
+			NULL);
 	gtk_tree_view_append_column (GTK_TREE_VIEW(view), col);
 	g_object_unref(G_OBJECT(store));
 	gtk_container_add(GTK_CONTAINER(sw), view);
 
-  sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (view));
-  g_signal_connect (G_OBJECT (sel), "changed",
-			  G_CALLBACK (selected),
-			  store);
-  
-  gtk_box_pack_start(GTK_BOX(ret), sw, TRUE, TRUE, 0);
-	
+	sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (view));
+	g_signal_connect (G_OBJECT (sel), "changed",
+			G_CALLBACK (selected),
+			store);
+
+	gtk_box_pack_start(GTK_BOX(ret), sw, TRUE, TRUE, 0);
+
 	gtk_widget_show(ret); 
-	
+
 	toolbar_update_buttons();
-	
+
 	return ret;
-	
+
 }
-void 
+	void 
 update_call_tree_remove (call_t * c)
 {
 	GtkTreeIter iter;
 	GValue val;
 	call_t * iterCall;
- 
+
 	int nbChild = gtk_tree_model_iter_n_children(GTK_TREE_MODEL(store), NULL);
-  int i;
+	int i;
 	for( i = 0; i < nbChild; i++)
 	{
-	  if(gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &iter, NULL, i))
-	  {
-	    val.g_type = 0;
-    	gtk_tree_model_get_value (GTK_TREE_MODEL(store), &iter, 2, &val);
-    	
-    	iterCall = (call_t*) g_value_get_pointer(&val);
-      g_value_unset(&val);
-      
-      if(iterCall == c)
-      {
-        gtk_list_store_remove(store, &iter);
-      }
-	  }
+		if(gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &iter, NULL, i))
+		{
+			val.g_type = 0;
+			gtk_tree_model_get_value (GTK_TREE_MODEL(store), &iter, 2, &val);
+
+			iterCall = (call_t*) g_value_get_pointer(&val);
+			g_value_unset(&val);
+
+			if(iterCall == c)
+			{
+				gtk_list_store_remove(store, &iter);
+			}
+		}
 	}