plugin related cleanups

1 files changed, 7 insertions, 20 deletions

diff --git a/init.go b/init.go
index 8eba6c6..0c649a5 100644
--- a/init.go
+++ b/init.go
@@ -16,19 +16,16 @@ import (
 
 	"github.com/awesome-gocui/gocui"
 	"go.wit.com/log"
-	"go.wit.com/toolkits/tree"
 )
 
 // sent via -ldflags
 var VERSION string
 var BUILDTIME string
 
-func queueToolkitClose() {
-	me.baseGui.Close()
-}
+var PLUGIN string = "gocui"
 
-func queueSetChecked(n *tree.Node, b bool) {
-	setChecked(n, b)
+func toolkitClose() {
+	me.baseGui.Close()
 }
 
 // sets defaults and establishes communication
@@ -62,8 +59,10 @@ func init() {
 	me.mouse.clicktime = time.Millisecond * 200
 	me.mouse.doubletime = time.Millisecond * 400
 
-	me.myTree = tree.New()
-	me.myTree.PluginName = "gocui"
+	me.myTree = initTree()
+
+	me.newWindowTrigger = make(chan *guiWidget, 1)
+	go newWindowTrigger()
 	go refreshGocui()
 
 	// read in defaults from config protobuf
@@ -86,18 +85,6 @@ func init() {
 		}
 	}
 
-	me.myTree.NodeAction = newaction
-	me.myTree.Add = newAdd
-	me.myTree.SetTitle = newSetTitle
-	me.myTree.SetLabel = newSetLabel
-	me.myTree.SetText = newSetText
-	me.myTree.AddText = newAddText
-	me.myTree.SetChecked = queueSetChecked
-	me.myTree.ToolkitClose = queueToolkitClose
-
-	me.newWindowTrigger = make(chan *guiWidget, 1)
-	go newWindowTrigger()
-
 	log.Log(NOW, "Init() start pluginChan")
 	// log.Sleep(.1) // probably not needed, but in here for now under development
 	go mainGogui()