Skip to content

Commit

Permalink
removed some dead code, whitespaces
Browse files Browse the repository at this point in the history
svn path=/trunk/nfs-client/; revision=67465

Conflicts:

	src/Nfs.ycp

Conflicts:

	package/yast2-nfs-client.changes
  • Loading branch information
mchf authored and mvidner committed Nov 22, 2012
1 parent 34a9945 commit f7d8f42
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 16 deletions.
1 change: 1 addition & 0 deletions package/yast2-nfs-client.changes
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
Mon Oct 15 08:28:10 UTC 2012 - mfilka@suse.com

- ported several old fixes from master branch:
- removed some dead code, whitespaces
- autoinstallation fails to enable portmapper/rpcbind service - bnc#744357
- Base server hostname combobox on existing values - bnc#547983
- Fixed handling of return symbols (buggy patch for bnc#589541, now
Expand Down
9 changes: 2 additions & 7 deletions src/Nfs.ycp
Original file line number Diff line number Diff line change
Expand Up @@ -349,11 +349,6 @@ the NFS client configuration.\n"));
return false;
}

/* if (size (nfs_entries) == 0)
{
// Service::Adjust ("nfs", "disable"); // what if autofs needs it?
}*/

portmapper = FindPortmapper();
if (size (nfs_entries) != 0)
{
Expand Down Expand Up @@ -610,8 +605,8 @@ the NFS client configuration.\n"));
return true;
}

/**
* Return required packages for auto-installation
/**
* Return required packages for auto-installation
* @return map of packages to be installed and to be removed
*/
global define map AutoPackages() ``{
Expand Down
15 changes: 6 additions & 9 deletions src/ui.ycp
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@

/* Return convenient hostname (FaTE #302863) to be proposed
* i.e. nfs + current domain (nfs. + suse.cz)
* @return string proposed hostname
* @return string proposed hostname
*/
define string ProposeHostname() {
string ret = "";
Expand Down Expand Up @@ -586,24 +586,24 @@ rights.</p>") + fw_cwm_widget["help"]:"";
EnableDisableButtons();

}

void InitSettings( )
{
CWMFirewallInterfaces::OpenFirewallInit (fw_cwm_widget, "");
UI::ChangeWidget(`id(`enable_nfs4), `Value, Nfs::nfs4_enabled != false);
UI::ChangeWidget( `id(`nfs4_domain), `Enabled, Nfs::nfs4_enabled != false);
UI::ChangeWidget(`id(`nfs4_domain), `Value, Nfs::idmapd_domain);
}

void SaveFstabEntries( )
{
Nfs::nfs_entries = nfs_entries;
}

void SaveSettings( map event )
{
CWMFirewallInterfaces::OpenFirewallStore (fw_cwm_widget, "", event);
Nfs::nfs4_enabled = (boolean) UI::QueryWidget(`id(`enable_nfs4),`Value);
Nfs::nfs4_enabled = (boolean) UI::QueryWidget(`id(`enable_nfs4),`Value);
Nfs::idmapd_domain = (string) UI::QueryWidget(`id(`nfs4_domain),`Value);
}

Expand All @@ -613,9 +613,6 @@ rights.</p>") + fw_cwm_widget["help"]:"";
// handle the events, enable/disable the button, show the popup if button clicked
if ( UI::WidgetExists(`id("_cwm_firewall_details")) && UI::WidgetExists(`id("_cwm_open_firewall")) )
CWMFirewallInterfaces::OpenFirewallHandle (fw_cwm_widget, "", $[ "ID" : widget ]);
/*changed =
true || // TODO: fw changed, #44106
true; // TODO: nfs changed*/
if ( UI::WidgetExists(`id(`fstable)) )
entryno = (integer) UI::QueryWidget(`id(`fstable), `CurrentItem);

Expand Down Expand Up @@ -719,7 +716,7 @@ rights.</p>") + fw_cwm_widget["help"]:"";

do
{
event = UI::WaitForEvent ();
event = UI::WaitForEvent ();
ret = event["ID"]:nil;
if (ret == `ok)
{
Expand Down

0 comments on commit f7d8f42

Please sign in to comment.