jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-12 22:09:25 +08:00
Code Issues Projects Releases Wiki Activity

* #14568: gnome: implement auto answer for IP2IP

Browse Source
This commit is contained in:
Tristan Matthews
2012-08-14 12:04:21 -04:00
parent 33da18206e
commit c0b2953711
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gnome/src/actions.c
View File

@ -514,7 +514,9 @@ sflphone_incoming_call(callable_obj_t * c)
g_free(msg);
}
account_t *account = account_list_get_by_id(c->_accountID);
if (account && account_has_autoanswer_on(account)) {
if (!account) {
ERROR("Account is NULL");
} else if (account_has_autoanswer_on(account)) {
calltab_set_selected_call(active_calltree_tab, c);
sflphone_pick_up();
}

18
gnome/src/config/accountconfigdialog.c
View File

@ -210,6 +210,15 @@ static void update_credential_cb(GtkWidget *widget, gpointer data UNUSED)
}
}
static GtkWidget*
create_auto_answer_checkbox(account_t *account)
{
GtkWidget *auto_answer_checkbox = gtk_check_button_new_with_mnemonic(_("_Auto-answer calls"));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(auto_answer_checkbox), account_has_autoanswer_on(account));
g_signal_connect(auto_answer_checkbox, "toggled", G_CALLBACK(auto_answer_cb), account);
return auto_answer_checkbox;
}
static GtkWidget*
create_basic_tab(account_t *account)
{
@ -378,9 +387,7 @@ create_basic_tab(account_t *account)
gtk_table_attach(GTK_TABLE(table), entry_user_agent, 1, 2, row, row+1, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
row++;
GtkWidget *auto_answer_checkbox = gtk_check_button_new_with_mnemonic(_("_Auto-answer calls"));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(auto_answer_checkbox), account_has_autoanswer_on(account));
g_signal_connect(auto_answer_checkbox, "toggled", G_CALLBACK(auto_answer_cb), account);
GtkWidget *auto_answer_checkbox = create_auto_answer_checkbox(account);
gtk_table_attach(GTK_TABLE(table), auto_answer_checkbox, 0, 1, row, row+1, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
gtk_widget_show_all(table);
@ -1156,7 +1163,7 @@ create_videocodecs_configuration(const account_t *a)
}
#endif
static GtkWidget* create_direct_ip_calls_tab(const account_t *account)
static GtkWidget* create_direct_ip_calls_tab(account_t *account)
{
GtkWidget *vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 10);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 10);
@ -1177,6 +1184,9 @@ static GtkWidget* create_direct_ip_calls_tab(const account_t *account)
GtkWidget *frame = create_network(account);
gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
GtkWidget *auto_answer_checkbox = create_auto_answer_checkbox(account);
gtk_box_pack_start(GTK_BOX(vbox), auto_answer_checkbox, FALSE, FALSE, 0);
gtk_widget_show_all(vbox);
return vbox;
}