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
279af0f7
Commit
279af0f7
authored
12 years ago
by
Alexandre Savard
Browse files
Options
Downloads
Patches
Plain Diff
#9911: Fix network manager crashes
parent
97e78194
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
daemon/src/dbus/networkmanager.cpp
+4
-4
4 additions, 4 deletions
daemon/src/dbus/networkmanager.cpp
daemon/src/dbus/networkmanager.h
+1
-1
1 addition, 1 deletion
daemon/src/dbus/networkmanager.h
with
5 additions
and
5 deletions
daemon/src/dbus/networkmanager.cpp
+
4
−
4
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
)
...
...
This diff is collapsed.
Click to expand it.
daemon/src/dbus/networkmanager.h
+
1
−
1
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
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