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

Ticket#61 resolved - call_list_remove when no accounts

parent f19868b9
No related branches found
No related tags found
No related merge requests found
......@@ -590,9 +590,17 @@ sflphone_place_call ( call_t * c )
if(c->state == CALL_STATE_DIALING)
{
if( account_list_get_size() == 0 )
{
notify_no_accounts();
call_list_remove(current_calls , c->callID);
update_call_tree_remove(current_calls, c);
}
else if( account_list_get_by_state( ACCOUNT_STATE_REGISTERED ) == NULL )
{
notify_no_registered_accounts();
call_list_remove(current_calls , c->callID);
update_call_tree_remove(current_calls, c);
}
else
{
account_t * current = account_list_get_current();
......
......@@ -1360,6 +1360,7 @@ show_accounts_window( void )
gtk_container_add(GTK_CONTAINER(accountFrame) , tab);
gtk_dialog_run( dialog );
dialogOpen=FALSE;
gtk_widget_destroy(GTK_WIDGET(dialog));
}
......
......@@ -34,8 +34,6 @@ notify_incoming_call( call_t* c )
(gchar*)g_hash_table_lookup(account_list_get_by_id(c->accountID)->properties , ACCOUNT_ALIAS) ) ;
callerid = g_markup_printf_escaped(_("<i>From:</i> %s") , c->from);
//pixbuf = gdk_pixbuf_new_from_file(ICON_DIR "/sflphone.png", NULL);
pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/ring.svg", NULL);
notification = notify_notification_new( title,
......@@ -175,8 +173,9 @@ notify_no_accounts( )
void
setup_accounts_cb( NotifyNotification *notification, gpointer data )
{
//gtk_widget_set_parent( show_accounts_window() , GTK_WIDGET(get_main_window()));
show_accounts_window();
//g_object_unref( notification );
g_object_unref( notification );
}
void
......
......@@ -87,6 +87,6 @@
/** Desktop notifications - Time before to close the notification*/
#define __TIMEOUT_MODE "default"
/** Desktop notifications - Time before to close the notification*/
#define __TIMEOUT_TIME 30000 // 30 secondes
#define __TIMEOUT_TIME 18000 // 30 secondes
#endif
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment