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

daemon: remove sfl references in bin/

Browse Source 
Refs #69286

Change-Id: I741131ea91513d22a09deb17350bfa50cb9e9176
This commit is contained in:
Guillaume Roguez
2015-03-25 16:23:11 -04:00
committed by Gerrit Code Review
parent 4bb2a50629
commit 59c5debdf2
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bin/dbus/dbusclient.cpp
View File

@ -73,7 +73,7 @@ class EventCallback :
const std::function<void()> callback_;
};
DBusClient::DBusClient(int sflphFlags, bool persistent)
DBusClient::DBusClient(int flags, bool persistent)
: dispatcher_(new DBus::BusDispatcher)
{
try {
@ -106,7 +106,7 @@ DBusClient::DBusClient(int sflphFlags, bool persistent)
throw std::runtime_error {"cannot initialize DBus stuff"};
}
if (initLibrary(sflphFlags) < 0)
if (initLibrary(flags) < 0)
throw std::runtime_error {"cannot initialize libring"};
instanceManager_->started();
@ -128,7 +128,7 @@ DBusClient::~DBusClient()
}
int
DBusClient::initLibrary(int sflphFlags)
DBusClient::initLibrary(int flags)
{
using namespace std::placeholders;
@ -203,7 +203,7 @@ DBusClient::initLibrary(int sflphFlags)
};
#endif
if (!DRing::init(static_cast<DRing::InitFlag>(sflphFlags)))
if (!DRing::init(static_cast<DRing::InitFlag>(flags)))
return -1;
registerCallHandlers(callEvHandlers);

4
bin/dbus/dbusclient.h
View File

@ -55,14 +55,14 @@ namespace DBus {
class DBusClient {
public:
DBusClient(int sflphFlags, bool persistent);
DBusClient(int flags, bool persistent);
~DBusClient();
int event_loop() noexcept;
int exit() noexcept;
private:
int initLibrary(int sflphFlags);
int initLibrary(int flags);
void finiLibrary() noexcept;
std::unique_ptr<DBus::BusDispatcher> dispatcher_;

2
bin/main.cpp
View File

@ -47,7 +47,7 @@ print_title()
std::cout
<< "Ring Daemon " << DRing::version()
<< ", by Savoir-Faire Linux 2004-2015" << std::endl
<< "http://www.sflphone.org/" << std::endl;
<< "http://www.ring.cx/" << std::endl;
}
static void

2
bin/osxmain.cpp
View File

@ -52,7 +52,7 @@ print_title()
{
std::cout << "Ring Daemon " << DRing::version()
<< ", by Savoir-Faire Linux 2004-2015" << std::endl
<< "http://www.sflphone.org/" << std::endl;
<< "http://www.ring.cx/" << std::endl;
}
static void