Commit 59c5debd authored by Guillaume Roguez's avatar Guillaume Roguez Committed by Gerrit Code Review

daemon: remove sfl references in bin/

Refs #69286

Change-Id: I741131ea91513d22a09deb17350bfa50cb9e9176
parent 4bb2a506
......@@ -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);
......
......@@ -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_;
......
......@@ -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
......
......@@ -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
......
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