Skip to content

Commit

Permalink
Removed dead code.
Browse files Browse the repository at this point in the history
  • Loading branch information
mvidner committed Jun 11, 2015
1 parent 40afdb5 commit 832eaf6
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 40 deletions.
4 changes: 0 additions & 4 deletions src/include/proxy/dialogs.rb
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,6 @@ def ProxyMainDialog(standalone)
HSpacing(5)
)

# if(standalone == true)
Wizard.SetContentsButtons(
caption,
contents,
Expand All @@ -547,9 +546,6 @@ def ProxyMainDialog(standalone)
Wizard.SetNextButton(:next, Label.OKButton)
Wizard.SetAbortButton(:abort, Label.CancelButton)
Wizard.HideBackButton
# else
# Wizard::SetContentsButtons(caption, contents, help,
# Label::BackButton(), Label::OKButton());

# #103841, relaxed. now avoiding only quotes
# #337048 allow using space as well
Expand Down
39 changes: 3 additions & 36 deletions src/modules/Proxy.rb
Original file line number Diff line number Diff line change
@@ -1,17 +1,10 @@
# encoding: utf-8

# File: modules/Proxy.ycp
# Package: Network configuration
# Summary: Proxy data
# Authors: Michal Svec <msvec@suse.cz>
#
# $Id$
#
# Configures FTP and HTTP proxies via sysconfig & SuSEconfig
# and /root/.curlrc (for YOU)
require "yast"

module Yast
# Configures FTP and HTTP proxies via sysconfig
# and /root/.curlrc (for YOU)
class ProxyClass < Module
def main
textdomain "proxy"
Expand Down Expand Up @@ -107,13 +100,6 @@ def Read
end
end

# Read /root/.wgetrc
# YOU uses curl(1)
# user = SCR::Read(.root.wgetrc.proxy_user);
# if(user == nil) user = "";
# pass = SCR::Read(.root.wgetrc.proxy_passwd);
# if(pass == nil) pass = "";

true
end

Expand Down Expand Up @@ -207,12 +193,6 @@ def Write
#user can't relogin in installation and update, do not show the msg then (bnc#486037, bnc#543469)
ProxyFinishPopup(true) if Mode.normal

# Update /root/.wgetrc
# YOU uses curl(1)
# SCR::Write(.root.wgetrc.proxy_user, user);
# SCR::Write(.root.wgetrc.proxy_passwd, pass);
# SCR::Write(.root.wgetrc, nil);

@modified = false

true
Expand Down Expand Up @@ -470,20 +450,7 @@ def Summary
""
)
)
]

# Summary text * /
# Summary::Device(sformat(_("No Proxy Domains: %1"), no) + "\n<br>" +
# "<p>" + ( user == "" ?
# /* Summary text * /
# _("Proxy user name is not set.") :
# /* Summary text * /
# sformat(_("Proxy User Name: %1"), user)) +
# "<br>" + ( pass == "" ?
# /* Summary text * /
# _("Proxy password is not set.") :
# /* Summary text * /
# _("Proxy password is set.")) ];
]
end

Summary.DevicesList(ret)
Expand Down

0 comments on commit 832eaf6

Please sign in to comment.