Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
Plasma applet for NetworkManager
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
5
Merge Requests
5
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Plasma
Plasma applet for NetworkManager
Commits
269e5b29
Commit
269e5b29
authored
Apr 01, 2019
by
Jan Grulich
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Do not remove manually configured "route-metric" property from IPv4 and IPv6 setting
BUG:406118
parent
371933b2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
0 deletions
+20
-0
libs/editor/settings/ipv4widget.cpp
libs/editor/settings/ipv4widget.cpp
+10
-0
libs/editor/settings/ipv6widget.cpp
libs/editor/settings/ipv6widget.cpp
+10
-0
No files found.
libs/editor/settings/ipv4widget.cpp
View file @
269e5b29
...
...
@@ -131,6 +131,11 @@ void IPv4Widget::loadConfig(const NetworkManager::Setting::Ptr &setting)
{
NetworkManager
::
Ipv4Setting
::
Ptr
ipv4Setting
=
setting
.
staticCast
<
NetworkManager
::
Ipv4Setting
>
();
// BUG:406118
// We don't have route-metric in the UI, maybe even won't have for now, but that doesn't mean we
// want to loose it when it's configured manually in a config file
m_tmpIpv4Setting
.
setRouteMetric
(
ipv4Setting
->
routeMetric
());
m_tmpIpv4Setting
.
setRoutes
(
ipv4Setting
->
routes
());
m_tmpIpv4Setting
.
setNeverDefault
(
ipv4Setting
->
neverDefault
());
m_tmpIpv4Setting
.
setIgnoreAutoRoutes
(
ipv4Setting
->
ignoreAutoRoutes
());
...
...
@@ -186,6 +191,11 @@ QVariantMap IPv4Widget::setting() const
{
NetworkManager
::
Ipv4Setting
ipv4Setting
;
// BUG:406118
// We don't have route-metric in the UI, maybe even won't have for now, but that doesn't mean we
// want to loose it when it's configured manually in a config file
ipv4Setting
.
setRouteMetric
(
m_tmpIpv4Setting
.
routeMetric
());
ipv4Setting
.
setRoutes
(
m_tmpIpv4Setting
.
routes
());
ipv4Setting
.
setNeverDefault
(
m_tmpIpv4Setting
.
neverDefault
());
ipv4Setting
.
setIgnoreAutoRoutes
(
m_tmpIpv4Setting
.
ignoreAutoRoutes
());
...
...
libs/editor/settings/ipv6widget.cpp
View file @
269e5b29
...
...
@@ -120,6 +120,11 @@ void IPv6Widget::loadConfig(const NetworkManager::Setting::Ptr &setting)
{
NetworkManager
::
Ipv6Setting
::
Ptr
ipv6Setting
=
setting
.
staticCast
<
NetworkManager
::
Ipv6Setting
>
();
// BUG:406118
// We don't have route-metric in the UI, maybe even won't have for now, but that doesn't mean we
// want to loose it when it's configured manually in a config file
m_tmpIpv6Setting
.
setRouteMetric
(
ipv6Setting
->
routeMetric
());
m_tmpIpv6Setting
.
setRoutes
(
ipv6Setting
->
routes
());
m_tmpIpv6Setting
.
setNeverDefault
(
ipv6Setting
->
neverDefault
());
m_tmpIpv6Setting
.
setIgnoreAutoRoutes
(
ipv6Setting
->
ignoreAutoRoutes
());
...
...
@@ -179,6 +184,11 @@ QVariantMap IPv6Widget::setting() const
{
NetworkManager
::
Ipv6Setting
ipv6Setting
;
// BUG:406118
// We don't have route-metric in the UI, maybe even won't have for now, but that doesn't mean we
// want to loose it when it's configured manually in a config file
ipv6Setting
.
setRouteMetric
(
m_tmpIpv6Setting
.
routeMetric
());
ipv6Setting
.
setRoutes
(
m_tmpIpv6Setting
.
routes
());
ipv6Setting
.
setNeverDefault
(
m_tmpIpv6Setting
.
neverDefault
());
ipv6Setting
.
setIgnoreAutoRoutes
(
m_tmpIpv6Setting
.
ignoreAutoRoutes
());
...
...
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