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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
f3700d73
Commit
f3700d73
authored
13 years ago
by
Rafaël Carré
Browse files
Options
Downloads
Patches
Plain Diff
Fix tests, hudson doesn't have a dbus daemon running
parent
fdc5ceb6
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
daemon/src/dbus/dbusmanager.cpp
+22
-10
22 additions, 10 deletions
daemon/src/dbus/dbusmanager.cpp
daemon/src/dbus/dbusmanager.h
+5
-0
5 additions, 0 deletions
daemon/src/dbus/dbusmanager.h
daemon/src/managerimpl.cpp
+6
-8
6 additions, 8 deletions
daemon/src/managerimpl.cpp
with
33 additions
and
18 deletions
daemon/src/dbus/dbusmanager.cpp
+
22
−
10
View file @
f3700d73
...
...
@@ -37,9 +37,15 @@
#include
"networkmanager.h"
DBusManager
::
DBusManager
()
:
_connected
(
false
)
,
_callManager
(
NULL
)
,
_configurationManager
(
NULL
)
,
_instanceManager
(
NULL
)
#ifdef USE_NETWORKMANAGER
,
_networkManager
(
NULL
)
#endif
{
DBus
::
default_dispatcher
=
&
_dispatcher
;
try
{
DBus
::
Connection
sessionConnection
=
DBus
::
Connection
::
SessionBus
();
sessionConnection
.
request_name
(
"org.sflphone.SFLphone"
);
...
...
@@ -51,6 +57,12 @@ DBusManager::DBusManager()
DBus
::
Connection
systemConnection
=
DBus
::
Connection
::
SystemBus
();
_networkManager
=
new
NetworkManager
(
systemConnection
,
"/org/freedesktop/NetworkManager"
,
""
);
#endif
DBus
::
default_dispatcher
=
&
_dispatcher
;
_connected
=
true
;
}
catch
(
const
DBus
::
Error
&
err
)
{
_error
(
"%s: %s
\n
"
,
err
.
name
(),
err
.
what
());
}
}
DBusManager
::~
DBusManager
()
...
...
This diff is collapsed.
Click to expand it.
daemon/src/dbus/dbusmanager.h
+
5
−
0
View file @
f3700d73
...
...
@@ -50,11 +50,16 @@ class DBusManager
return
_configurationManager
;
};
bool
isConnected
()
const
{
return
_connected
;
}
void
exec
();
void
exit
();
static
const
char
*
SERVER_NAME
;
private
:
bool
_connected
;
CallManager
*
_callManager
;
ConfigurationManager
*
_configurationManager
;
Instance
*
_instanceManager
;
...
...
This diff is collapsed.
Click to expand it.
daemon/src/managerimpl.cpp
+
6
−
8
View file @
f3700d73
...
...
@@ -2147,9 +2147,7 @@ void ManagerImpl::startVoiceMessageNotification (const std::string& accountId,
void
ManagerImpl
::
connectionStatusNotification
()
{
_debug
(
"Manager: connectionStatusNotification"
);
if
(
_dbus
.
isConnected
())
_dbus
.
getConfigurationManager
()
->
accountsChanged
();
}
...
...
@@ -3752,6 +3750,7 @@ std::string ManagerImpl::addAccount (
saveConfig
();
if
(
_dbus
.
isConnected
())
_dbus
.
getConfigurationManager
()
->
accountsChanged
();
return
accountID
.
str
();
...
...
@@ -3776,6 +3775,7 @@ void ManagerImpl::removeAccount (const std::string& accountID)
_debug
(
"REMOVE ACCOUNT"
);
if
(
_dbus
.
isConnected
())
_dbus
.
getConfigurationManager
()
->
accountsChanged
();
}
...
...
@@ -4367,5 +4367,3 @@ std::vector<std::string> ManagerImpl::getParticipantList (
return
v
;
}
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