Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
59c5debd
Commit
59c5debd
authored
10 years ago
by
Guillaume Roguez
Committed by
Gerrit Code Review
10 years ago
Browse files
Options
Downloads
Patches
Plain Diff
daemon: remove sfl references in bin/
Refs #69286 Change-Id: I741131ea91513d22a09deb17350bfa50cb9e9176
parent
4bb2a506
No related branches found
No related tags found
No related merge requests found
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
bin/dbus/dbusclient.cpp
+4
-4
4 additions, 4 deletions
bin/dbus/dbusclient.cpp
bin/dbus/dbusclient.h
+2
-2
2 additions, 2 deletions
bin/dbus/dbusclient.h
bin/main.cpp
+1
-1
1 addition, 1 deletion
bin/main.cpp
bin/osxmain.cpp
+1
-1
1 addition, 1 deletion
bin/osxmain.cpp
with
8 additions
and
8 deletions
bin/dbus/dbusclient.cpp
+
4
−
4
View file @
59c5debd
...
@@ -73,7 +73,7 @@ class EventCallback :
...
@@ -73,7 +73,7 @@ class EventCallback :
const
std
::
function
<
void
()
>
callback_
;
const
std
::
function
<
void
()
>
callback_
;
};
};
DBusClient
::
DBusClient
(
int
sflphF
lags
,
bool
persistent
)
DBusClient
::
DBusClient
(
int
f
lags
,
bool
persistent
)
:
dispatcher_
(
new
DBus
::
BusDispatcher
)
:
dispatcher_
(
new
DBus
::
BusDispatcher
)
{
{
try
{
try
{
...
@@ -106,7 +106,7 @@ DBusClient::DBusClient(int sflphFlags, bool persistent)
...
@@ -106,7 +106,7 @@ DBusClient::DBusClient(int sflphFlags, bool persistent)
throw
std
::
runtime_error
{
"cannot initialize DBus stuff"
};
throw
std
::
runtime_error
{
"cannot initialize DBus stuff"
};
}
}
if
(
initLibrary
(
sflphF
lags
)
<
0
)
if
(
initLibrary
(
f
lags
)
<
0
)
throw
std
::
runtime_error
{
"cannot initialize libring"
};
throw
std
::
runtime_error
{
"cannot initialize libring"
};
instanceManager_
->
started
();
instanceManager_
->
started
();
...
@@ -128,7 +128,7 @@ DBusClient::~DBusClient()
...
@@ -128,7 +128,7 @@ DBusClient::~DBusClient()
}
}
int
int
DBusClient
::
initLibrary
(
int
sflphF
lags
)
DBusClient
::
initLibrary
(
int
f
lags
)
{
{
using
namespace
std
::
placeholders
;
using
namespace
std
::
placeholders
;
...
@@ -203,7 +203,7 @@ DBusClient::initLibrary(int sflphFlags)
...
@@ -203,7 +203,7 @@ DBusClient::initLibrary(int sflphFlags)
};
};
#endif
#endif
if
(
!
DRing
::
init
(
static_cast
<
DRing
::
InitFlag
>
(
sflphF
lags
)))
if
(
!
DRing
::
init
(
static_cast
<
DRing
::
InitFlag
>
(
f
lags
)))
return
-
1
;
return
-
1
;
registerCallHandlers
(
callEvHandlers
);
registerCallHandlers
(
callEvHandlers
);
...
...
This diff is collapsed.
Click to expand it.
bin/dbus/dbusclient.h
+
2
−
2
View file @
59c5debd
...
@@ -55,14 +55,14 @@ namespace DBus {
...
@@ -55,14 +55,14 @@ namespace DBus {
class
DBusClient
{
class
DBusClient
{
public:
public:
DBusClient
(
int
sflphF
lags
,
bool
persistent
);
DBusClient
(
int
f
lags
,
bool
persistent
);
~
DBusClient
();
~
DBusClient
();
int
event_loop
()
noexcept
;
int
event_loop
()
noexcept
;
int
exit
()
noexcept
;
int
exit
()
noexcept
;
private:
private:
int
initLibrary
(
int
sflphF
lags
);
int
initLibrary
(
int
f
lags
);
void
finiLibrary
()
noexcept
;
void
finiLibrary
()
noexcept
;
std
::
unique_ptr
<
DBus
::
BusDispatcher
>
dispatcher_
;
std
::
unique_ptr
<
DBus
::
BusDispatcher
>
dispatcher_
;
...
...
This diff is collapsed.
Click to expand it.
bin/main.cpp
+
1
−
1
View file @
59c5debd
...
@@ -47,7 +47,7 @@ print_title()
...
@@ -47,7 +47,7 @@ print_title()
std
::
cout
std
::
cout
<<
"Ring Daemon "
<<
DRing
::
version
()
<<
"Ring Daemon "
<<
DRing
::
version
()
<<
", by Savoir-Faire Linux 2004-2015"
<<
std
::
endl
<<
", by Savoir-Faire Linux 2004-2015"
<<
std
::
endl
<<
"http://www.
sflphone.org
/"
<<
std
::
endl
;
<<
"http://www.
ring.cx
/"
<<
std
::
endl
;
}
}
static
void
static
void
...
...
This diff is collapsed.
Click to expand it.
bin/osxmain.cpp
+
1
−
1
View file @
59c5debd
...
@@ -52,7 +52,7 @@ print_title()
...
@@ -52,7 +52,7 @@ print_title()
{
{
std
::
cout
<<
"Ring Daemon "
<<
DRing
::
version
()
std
::
cout
<<
"Ring Daemon "
<<
DRing
::
version
()
<<
", by Savoir-Faire Linux 2004-2015"
<<
std
::
endl
<<
", by Savoir-Faire Linux 2004-2015"
<<
std
::
endl
<<
"http://www.
sflphone.org
/"
<<
std
::
endl
;
<<
"http://www.
ring.cx
/"
<<
std
::
endl
;
}
}
static
void
static
void
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment