Commit 1eb945ff authored by System User's avatar System User
Browse files

Merge commit 'origin/master'

parents b2e142c4 442e8d6f
......@@ -33,12 +33,18 @@ Git developer access
Run:
--------------------------------------------------------------
ssh-kengen -C sflphone_org@sflphone.org
ssh-keygen -C sflphone_org@sflphone.org
cat ~/.ssh/id_rsa.pub
--------------------------------------------------------------
and transmit us the content of the `id_rsa.pub` file, for shared-key
authentication. Then:
authentication. Then, if you already have a cloned repository, run:
--------------------------------------------------------------
git-config remote.origin.url git+ssh://sflphone_org@sflphone.org/git/sflphone.git
--------------------------------------------------------------
Otherwise, grab a new copy:
--------------------------------------------------------------
git clone git+ssh://sflphone_org@sflphone.org/git/sflphone.git
......@@ -46,3 +52,4 @@ cd sflphone
autoreconf --install
--------------------------------------------------------------
......@@ -156,7 +156,11 @@ SIPVoIPLink::terminate()
{
terminateSIPCall();
if (_initDone) {
eXosip_quit();
// TODO The next line makes the daemon crash on
// account delete if at least one account is registered.
// It should called only when the last account
// is deleted/unregistered.
//eXosip_quit();
_initDone = false;
}
}
......
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