From 59c5debdf227beb8703b4474b9b7486ba3abcf95 Mon Sep 17 00:00:00 2001
From: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
Date: Wed, 25 Mar 2015 16:23:11 -0400
Subject: [PATCH] daemon: remove sfl references in bin/
Refs #69286
Change-Id: I741131ea91513d22a09deb17350bfa50cb9e9176
---
bin/dbus/dbusclient.cpp | 8 ++++----
bin/dbus/dbusclient.h | 4 ++--
bin/main.cpp | 2 +-
bin/osxmain.cpp | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/bin/dbus/dbusclient.cpp b/bin/dbus/dbusclient.cpp
index 6a5c393aa4..7f0fcaa480 100644
--- a/bin/dbus/dbusclient.cpp
+++ b/bin/dbus/dbusclient.cpp
@@ -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);
diff --git a/bin/dbus/dbusclient.h b/bin/dbus/dbusclient.h
index 93b19aca0e..52bb865e3a 100644
--- a/bin/dbus/dbusclient.h
+++ b/bin/dbus/dbusclient.h
@@ -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_;
diff --git a/bin/main.cpp b/bin/main.cpp
index 145f8e0f1f..8451ad9080 100644
--- a/bin/main.cpp
+++ b/bin/main.cpp
@@ -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
diff --git a/bin/osxmain.cpp b/bin/osxmain.cpp
index a2cab51ae1..57f8b5ee81 100644
--- a/bin/osxmain.cpp
+++ b/bin/osxmain.cpp
@@ -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
--
GitLab