Commit 0f8f5c5d authored by Sébastien Blin's avatar Sébastien Blin

currentcallview: remove hold button

Change-Id: I141a1e962d1b8f068c00323c5040e83c6c4b7d99
parent 2349f529
......@@ -1004,6 +1004,9 @@ CppImpl::setup(WebKitChatContainer* chat_widget,
add_transfer_contact(c.participants.front());
gtk_widget_show_all(widgets->list_conversations);
gtk_widget_show(widgets->togglebutton_transfer);
gtk_widget_show(widgets->togglebutton_hold);
} else {
gtk_widget_hide(widgets->togglebutton_hold);
}
set_record_animation(widgets);
......@@ -1191,6 +1194,7 @@ CppImpl::setCallInfo()
if (!conversation->confId.empty())
callToRender = conversation->confId;
(*accountInfo)->callModel->setCurrentCall(callToRender);
currentCall_ = callToRender;
try {
// local renderer
......
......@@ -294,8 +294,10 @@ CppImpl::drawVideoDevices()
if (device == current) {
active = i;
}
auto name = avModel_->getDeviceSettings(device).name;
gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(widgets->combobox_device), nullptr, name.c_str());
try {
auto name = avModel_->getDeviceSettings(device).name;
gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(widgets->combobox_device), nullptr, name.c_str());
} catch (...) {}
i++;
}
gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->combobox_device), active);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment