Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
savoirfairelinux
jami-daemon
Commits
a0081598
Commit
a0081598
authored
Jul 17, 2013
by
Tristan Matthews
Browse files
* #27352: daemon: android client has no need for dbus
parent
475c2183
Changes
7
Hide whitespace changes
Inline
Side-by-side
daemon/src/client/android/client.cpp
View file @
a0081598
...
...
@@ -32,57 +32,21 @@
#include "config.h"
#endif
#include <cstdlib>
#include "client/client.h"
#include "global.h"
#include "manager.h"
#include "logger.h"
#include "instance-glue.h"
#include "client/callmanager.h"
#include "client/configurationmanager.h"
#if HAVE_DBUS
#include "client/networkmanager.h"
#endif
#ifdef SFL_VIDEO
#include "video_controls.h"
#endif
Client
::
Client
()
:
callManager_
(
0
)
,
configurationManager_
(
0
)
Client
::
Client
()
:
callManager_
(
new
CallManager
)
,
configurationManager_
(
new
ConfigurationManager
)
,
instanceManager_
(
0
)
,
dispatcher_
(
0
)
#ifdef SFL_VIDEO
,
videoControls_
(
0
)
#endif
#ifdef USE_NETWORKMANAGER
,
networkManager_
(
0
)
#endif
{
try
{
callManager_
=
new
CallManager
();
configurationManager_
=
new
ConfigurationManager
();
#ifdef SFL_VIDEO
videoControls_
=
new
VideoControls
(
sessionConnection
);
#endif
#ifdef USE_NETWORKMANAGER
DEBUG
(
"DBUS system connection to system bus"
);
DBus
::
Connection
systemConnection
(
DBus
::
Connection
::
SystemBus
());
DEBUG
(
"DBUS create the network manager from the system bus"
);
networkManager_
=
new
NetworkManager
(
systemConnection
,
"/org/freedesktop/NetworkManager"
,
""
);
#endif
}
catch
(
const
DBus
::
Error
&
err
)
{
ERROR
(
"%s: %s, exiting
\n
"
,
err
.
name
(),
err
.
what
());
::
exit
(
EXIT_FAILURE
);
}
}
{}
Client
::~
Client
()
{
...
...
@@ -92,34 +56,14 @@ Client::~Client()
#ifdef SFL_VIDEO
delete
videoControls_
;
#endif
delete
dispatcher_
;
delete
instanceManager_
;
delete
configurationManager_
;
delete
callManager_
;
delete
dispatcher_
;
}
void
Client
::
event_loop
()
{
try
{
dispatcher_
->
enter
();
}
catch
(
const
DBus
::
Error
&
err
)
{
ERROR
(
"%s: %s, quitting
\n
"
,
err
.
name
(),
err
.
what
());
return
;
}
catch
(
const
std
::
exception
&
err
)
{
ERROR
(
"%s: quitting
\n
"
,
err
.
what
());
return
;
}
}
{}
void
Client
::
exit
()
{
try
{
dispatcher_
->
leave
();
}
catch
(
const
DBus
::
Error
&
err
)
{
ERROR
(
"%s: %s, quitting
\n
"
,
err
.
name
(),
err
.
what
());
return
;
}
catch
(
const
std
::
exception
&
err
)
{
ERROR
(
"%s: quitting
\n
"
,
err
.
what
());
return
;
}
}
{}
daemon/src/client/dbus/Makefile.am
View file @
a0081598
...
...
@@ -9,20 +9,20 @@ BUILT_SOURCES= \
if
SFL_VIDEO
BUILT_SOURCES
+=
video_controls-glue.h
video_controls-glue.h
:
../
video_controls-introspec.xml Makefile.am
video_controls-glue.h
:
video_controls-introspec.xml Makefile.am
dbusxx-xml2cpp
$<
--adaptor
=
$@
endif
# Rule to generate the binding headers
callmanager-glue.h
:
../
callmanager-introspec.xml Makefile.am
callmanager-glue.h
:
callmanager-introspec.xml Makefile.am
dbusxx-xml2cpp
$<
--adaptor
=
$@
# Rule to generate the binding headers
configurationmanager-glue.h
:
../
configurationmanager-introspec.xml Makefile.am
configurationmanager-glue.h
:
configurationmanager-introspec.xml Makefile.am
dbusxx-xml2cpp
$<
--adaptor
=
$@
# Rule to generate the binding headers
instance-glue.h
:
../
instance-introspec.xml Makefile.am
instance-glue.h
:
instance-introspec.xml Makefile.am
dbusxx-xml2cpp
$<
--adaptor
=
$@
libclient_la_SOURCES
=
\
...
...
@@ -72,13 +72,13 @@ $(service_DATA): $(service_in_files) Makefile
sed
-e
"s|libexec|
$(libdir)
/sflphone|"
$<
>
$@
EXTRA_DIST
=
README
$(service_in_files)
\
../
callmanager-introspec.xml
\
../
configurationmanager-introspec.xml
\
../
instance-introspec.xml
\
../
org.freedesktop.NetworkManager.xml
callmanager-introspec.xml
\
configurationmanager-introspec.xml
\
instance-introspec.xml
\
org.freedesktop.NetworkManager.xml
if
SFL_VIDEO
EXTRA_DIST
+=
../
video_controls-introspec.xml
EXTRA_DIST
+=
video_controls-introspec.xml
endif
CLEANFILES
=
\
...
...
daemon/src/client/callmanager-introspec.xml
→
daemon/src/client/
dbus/
callmanager-introspec.xml
View file @
a0081598
File moved
daemon/src/client/configurationmanager-introspec.xml
→
daemon/src/client/
dbus/
configurationmanager-introspec.xml
View file @
a0081598
File moved
daemon/src/client/instance-introspec.xml
→
daemon/src/client/
dbus/
instance-introspec.xml
View file @
a0081598
File moved
daemon/src/client/org.freedesktop.NetworkManager.xml
→
daemon/src/client/
dbus/
org.freedesktop.NetworkManager.xml
View file @
a0081598
File moved
daemon/src/client/video_controls-introspec.xml
→
daemon/src/client/
dbus/
video_controls-introspec.xml
View file @
a0081598
File moved
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment