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

Merge branch 'master' into networkmanager

Browse Source 
Conflicts:
	sflphone-common/src/dbus/configurationmanager.cpp
	sflphone-common/src/managerimpl.cpp
	sflphone-common/src/sip/sipvoiplink.cpp
	sflphone-common/test/audiolayerTest.cpp
	sflphone-common/test/mainbufferTest.cpp
This commit is contained in:
Julien Bonjean
2009-11-20 10:33:50 -05:00
parent 8dea167859 9b057b9e36
commit d7fbde9211
31 changed files with 834 additions and 664 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sflphone-common/src/dbus/callmanager.cpp
View File

@ -258,7 +258,7 @@ CallManager::startTone (const int32_t& start , const int32_t& type)
else
Manager::instance().playToneWithMessage();
} else
Manager::instance().stopTone (true);
Manager::instance().stopTone ();
}
// TODO: this will have to be adapted