Mailinglist Archive: yast-commit (190 mails)

[mzugec@xxxxxxxxxxxxxxxx]

Author: mzugec
Date: Mon May 28 17:09:18 2007
New Revision: 38161

URL: http://svn.opensuse.org/viewcvs/yast?rev=38161&view=rev
Log:
disable routing dialog when NetworkManager used (#178538)

Modified:
    trunk/network/VERSION
    trunk/network/package/yast2-network.changes
    trunk/network/src/services/routing.ycp

Modified: trunk/network/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=38161&r1=38160&r2=38161&view=diff
==============================================================================
--- trunk/network/VERSION (original)
+++ trunk/network/VERSION Mon May 28 17:09:18 2007
@@ -1 +1 @@
-2.15.34
+2.15.35

Modified: trunk/network/package/yast2-network.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=38161&r1=38160&r2=38161&view=diff
==============================================================================
--- trunk/network/package/yast2-network.changes (original)
+++ trunk/network/package/yast2-network.changes Mon May 28 17:09:18 2007
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Mon May 28 17:07:40 CEST 2007 - mzugec@xxxxxxx
+
+- disable routing dialog when NetworkManager used (#178538)
+- 2.15.35 
+
+-------------------------------------------------------------------
 Mon May 28 10:20:08 CEST 2007 - mzugec@xxxxxxx
 
 - installation network changes:

Modified: trunk/network/src/services/routing.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/services/routing.ycp?rev=38161&r1=38160&r2=38161&view=diff
==============================================================================
--- trunk/network/src/services/routing.ycp (original)
+++ trunk/network/src/services/routing.ycp Mon May 28 17:09:18 2007
@@ -22,6 +22,7 @@
 import "Lan";
 import "CWM";
 import "CWMTab";
+import "NetworkService";
 
 include "network/lan/help.ycp";
 include "network/routines.ycp";
@@ -58,7 +59,7 @@
     ));
 
     if(entry[4]:"" != "")
-       UI::ChangeWidget(`id(`device), `Value, entry[4]:"");
+    UI::ChangeWidget(`id(`device), `Value, entry[4]:"");
     UI::ChangeWidget(`id(`destination), `ValidChars, IP::ValidChars + "default" + "/-");
     UI::ChangeWidget(`id(`gateway), `ValidChars, IP::ValidChars + "-");
     UI::ChangeWidget(`id(`netmask), `ValidChars, Netmask::ValidChars + "-");
@@ -165,6 +166,15 @@
     UI::ChangeWidget(`id(`add), `Enabled, false);
     UI::SetFocus(`id(`gw));
 
+    // #178538 - disable routing dialog when NetworkManager is used
+    boolean enabled = !(boolean)NetworkService::IsManaged();
+
+    UI::ChangeWidget(`id(`gw), `Enabled, enabled);
+    UI::ChangeWidget(`id(`table),  `Enabled, enabled);
+    UI::ChangeWidget(`id(`forward), `Enabled, enabled);
+    UI::ChangeWidget(`id(`add), `Enabled, enabled);
+    UI::ChangeWidget(`id(`expert), `Enabled, enabled);
+
     // fixed bug #73739 - if dhcp is used, dont set default gw statically
 //    if (Lan::bootproto == "dhcp")UI::ChangeWidget(`id(`gw),`Enabled, false);
 }

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx