Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
savoirfairelinux
jami-daemon
Commits
279af0f7
Commit
279af0f7
authored
Apr 22, 2012
by
Alexandre Savard
Browse files
#9911: Fix network manager crashes
parent
97e78194
Changes
2
Hide whitespace changes
Inline
Side-by-side
daemon/src/dbus/networkmanager.cpp
View file @
279af0f7
...
...
@@ -32,13 +32,13 @@
#include
"../manager.h"
#include
"logger.h"
const
std
::
string
NetworkManager
::
statesString
[
5
]
=
{
"unknown"
,
"asleep"
,
"connecting"
,
"connected"
,
"disconnected"
};
const
std
::
string
NetworkManager
::
statesString
[]
=
{
"unknown"
,
"asleep"
,
"connecting"
,
"connected"
,
"disconnected"
,
"unknown"
,
};
std
::
string
NetworkManager
::
stateAsString
(
const
uint32_t
&
state
)
{
return
statesString
[
state
];
return
statesString
[
state
<
6
?
state
:
5
];
}
void
NetworkManager
::
StateChanged
(
const
uint32_t
&
state
)
...
...
daemon/src/dbus/networkmanager.h
View file @
279af0f7
...
...
@@ -56,7 +56,7 @@ class NetworkManager : public org::freedesktop::NetworkManager_proxy,
NM_STATE_DISCONNECTED
};
static
const
std
::
string
statesString
[
5
];
static
const
std
::
string
statesString
[];
};
#endif
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment