From fa04a1e036a418258451466d99de34a9546a9965 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Sat, 30 Mar 2019 14:12:04 -0400
Subject: Add basic message viewer mockup

---
 commands/account/pipe.go   | 3 +--
 commands/term.go           | 5 ++---
 commands/terminal/close.go | 6 +++---
 3 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'commands')

diff --git a/commands/account/pipe.go b/commands/account/pipe.go
index ab2518b..60ac793 100644
--- a/commands/account/pipe.go
+++ b/commands/account/pipe.go
@@ -41,12 +41,11 @@ func Pipe(aerc *widgets.Aerc, args []string) error {
 				Color(tcell.ColorDefault, tcell.ColorRed)
 			return
 		}
-		host := widgets.NewTermHost(term, aerc.Config())
 		name := msg.Subject()
 		if len(name) > 12 {
 			name = name[:12]
 		}
-		aerc.NewTab(host, args[1] + " <" + name)
+		aerc.NewTab(term, args[1] + " <" + name)
 		term.OnClose = func(err error) {
 			if err != nil {
 				aerc.PushStatus(" "+err.Error(), 10*time.Second).
diff --git a/commands/term.go b/commands/term.go
index aea6382..91ffebd 100644
--- a/commands/term.go
+++ b/commands/term.go
@@ -26,8 +26,7 @@ func Term(aerc *widgets.Aerc, args []string) error {
 	if err != nil {
 		return err
 	}
-	host := widgets.NewTermHost(term, aerc.Config())
-	tab := aerc.NewTab(host, args[1])
+	tab := aerc.NewTab(term, args[1])
 	term.OnTitle = func(title string) {
 		if title == "" {
 			title = args[1]
@@ -36,7 +35,7 @@ func Term(aerc *widgets.Aerc, args []string) error {
 		tab.Content.Invalidate()
 	}
 	term.OnClose = func(err error) {
-		aerc.RemoveTab(host)
+		aerc.RemoveTab(term)
 		if err != nil {
 			aerc.PushStatus(" "+err.Error(), 10*time.Second).
 				Color(tcell.ColorDefault, tcell.ColorRed)
diff --git a/commands/terminal/close.go b/commands/terminal/close.go
index cb5702e..0a9d100 100644
--- a/commands/terminal/close.go
+++ b/commands/terminal/close.go
@@ -14,11 +14,11 @@ func CommandClose(aerc *widgets.Aerc, args []string) error {
 	if len(args) != 1 {
 		return errors.New("Usage: close")
 	}
-	thost, ok := aerc.SelectedTab().(*widgets.TermHost)
+	term, ok := aerc.SelectedTab().(*widgets.Terminal)
 	if !ok {
 		return errors.New("Error: not a terminal")
 	}
-	thost.Terminal().Close(nil)
-	aerc.RemoveTab(thost)
+	term.Close(nil)
+	aerc.RemoveTab(term)
 	return nil
 }
-- 
cgit v1.2.3