File code11_networkmanager_no_neverdefault.diff of Package NetworkManager-kde4

Overview Repositories Revisions Requests Users Attributes Meta

File code11_networkmanager_no_neverdefault.diff of Package NetworkManager-kde4

Index: libs/ui/ipv4widget.cpp
===================================================================
--- libs/ui/ipv4widget.cpp	(revision 1051776)
+++ libs/ui/ipv4widget.cpp	(working copy)
@@ -54,6 +54,8 @@
     Q_D(IpV4Widget);
     d->ui.setupUi(this);
 
+    // Not present in NM 0.7.1 as shipped with CODE11
+    d->ui.cbNeverDefault->hide();
     QString str_auto;
     QString str_auto_only;
     Knm::Connection::Type connType = connection->type();
Index: backends/NetworkManager/settings/ipv4dbus.cpp
===================================================================
--- backends/NetworkManager/settings/ipv4dbus.cpp	(revision 1051776)
+++ backends/NetworkManager/settings/ipv4dbus.cpp	(working copy)
@@ -35,9 +35,9 @@
   if (map.contains(QLatin1String(NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES))) {
     setting->setIgnoreautoroute(map.value(QLatin1String(NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES)).value<bool>());
   }
-  if (map.contains(QLatin1String(NM_SETTING_IP4_CONFIG_NEVER_DEFAULT))) {
-    setting->setNeverdefault(map.value(QLatin1String(NM_SETTING_IP4_CONFIG_NEVER_DEFAULT)).value<bool>());
-  }
+//X   if (map.contains(QLatin1String(NM_SETTING_IP4_CONFIG_NEVER_DEFAULT))) {
+//X     setting->setNeverdefault(map.value(QLatin1String(NM_SETTING_IP4_CONFIG_NEVER_DEFAULT)).value<bool>());
+//X   }
   if (map.contains(QLatin1String(NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID))) {
     setting->setDhcpclientid(map.value(QLatin1String(NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID)).value<QString>());
   }
@@ -104,7 +104,7 @@
 
   //map.insert(QLatin1String(NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS), setting->ignoredhcpdns());
   insertIfTrue(map, NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES, setting->ignoreautoroute());
-  insertIfTrue(map, NM_SETTING_IP4_CONFIG_NEVER_DEFAULT, setting->neverdefault());
+  //insertIfTrue(map, NM_SETTING_IP4_CONFIG_NEVER_DEFAULT, setting->neverdefault());
   insertIfNonEmpty(map, NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID, setting->dhcpclientid());
   insertIfNonEmpty(map, NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME, setting->dhcphostname());
   return map;

Places

File code11_networkmanager_no_neverdefault.diff of Package NetworkManager-kde4

Places