Commit 9a290fc9 authored by Alexandre Savard's avatar Alexandre Savard

[#2447] Bind hangup action to button for conference

parent eb91c704
......@@ -330,6 +330,8 @@ void sflphone_get_ip2ip_properties (GHashTable **properties)
sflphone_hang_up()
{
callable_obj_t * selectedCall = calltab_get_selected_call(current_calls);
conference_obj_t * selectedConf = calltab_get_selected_conf(active_calltree);
if(selectedCall)
{
switch(selectedCall->_state)
......@@ -373,6 +375,10 @@ sflphone_hang_up()
break;
}
}
else if(selectedConf) {
dbus_hang_up_conference(selectedConf);
}
calltree_update_call(history, selectedCall, NULL);
}
......
......@@ -3143,6 +3143,8 @@ void ManagerImpl::switchAudioManager (void)
framesize = getConfigInt (AUDIO , ALSA_FRAME_SIZE);
_debug("samplerate: %i, framesize %i\n", samplerate, framesize);
alsaPlugin = getConfigString (AUDIO , ALSA_PLUGIN);
numCardIn = getConfigInt (AUDIO , ALSA_CARD_ID_IN);
......@@ -3985,7 +3987,7 @@ void ManagerImpl::setAccountDetails (const std::string& accountID, const std::ma
acc->loadConfig();
if (acc->isEnabled()) {
acc->unregisterVoIPLink();
// acc->unregisterVoIPLink(); // do not need to send an unregister
acc->registerVoIPLink();
} else {
acc->unregisterVoIPLink();
......
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