summaryrefslogtreecommitdiffstats
path: root/pkg
diff options
context:
space:
mode:
authormjarkk <mkopenga@gmail.com>2018-11-10 09:09:18 +0100
committermjarkk <mkopenga@gmail.com>2018-11-10 09:09:18 +0100
commit32ecc6d7452d831e18caf4da481a34b6f6c130a8 (patch)
tree7f19cea5522afd4451983dbd481a5787e29ae6ca /pkg
parent834e42897d5c2190a7f108d9be5c910138c1199e (diff)
Removed getPushPassUnameView function
Diffstat (limited to 'pkg')
-rw-r--r--pkg/gui/commit_message_panel.go2
-rw-r--r--pkg/gui/gui.go2
-rw-r--r--pkg/gui/view_helpers.go5
3 files changed, 2 insertions, 7 deletions
diff --git a/pkg/gui/commit_message_panel.go b/pkg/gui/commit_message_panel.go
index 3f2225a7b..d2b1de0fb 100644
--- a/pkg/gui/commit_message_panel.go
+++ b/pkg/gui/commit_message_panel.go
@@ -61,7 +61,7 @@ func (gui *Gui) waitForPassUname(g *gocui.Gui, currentView *gocui.View, passOrUn
waitForGroupActie = true
waitForGroup.Add(1)
- pushPassUnameView := gui.getPushPassUnameView(g)
+ pushPassUnameView, _ := g.View("pushPassUname")
if passOrUname == "username" {
pushPassUnameView.Title = gui.Tr.SLocalize("PushUsername")
pushPassUnameView.Mask = 0
diff --git a/pkg/gui/gui.go b/pkg/gui/gui.go
index 9725426ba..b67ed7b34 100644
--- a/pkg/gui/gui.go
+++ b/pkg/gui/gui.go
@@ -269,7 +269,7 @@ func (gui *Gui) layout(g *gocui.Gui) error {
}
}
- if gui.getPushPassUnameView(g) == nil {
+ if check, _ := g.View("pushPassUname"); check == nil {
// doesn't matter where this view starts because it will be hidden
if pushPassUnameView, err := g.SetView("pushPassUname", 0, 0, width/2, height/2, 0); err != nil {
if err != gocui.ErrUnknownView {
diff --git a/pkg/gui/view_helpers.go b/pkg/gui/view_helpers.go
index a5414448f..8eca29b44 100644
--- a/pkg/gui/view_helpers.go
+++ b/pkg/gui/view_helpers.go
@@ -290,11 +290,6 @@ func (gui *Gui) getCommitMessageView(g *gocui.Gui) *gocui.View {
return v
}
-func (gui *Gui) getPushPassUnameView(g *gocui.Gui) *gocui.View {
- v, _ := g.View("pushPassUname")
- return v
-}
-
func (gui *Gui) getBranchesView(g *gocui.Gui) *gocui.View {
v, _ := g.View("branches")
return v