From e493f911269a2dabab7b05ec28726cdaeffb660e Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Mon, 20 May 2019 14:18:01 +0200
Subject: service: split into tunnel and manager

---
 ui/managewindow.go | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'ui/managewindow.go')

diff --git a/ui/managewindow.go b/ui/managewindow.go
index b1a22ac3..7c643aba 100644
--- a/ui/managewindow.go
+++ b/ui/managewindow.go
@@ -12,7 +12,7 @@ import (
 	"github.com/lxn/win"
 	"golang.org/x/sys/windows"
 
-	"golang.zx2c4.com/wireguard/windows/service"
+	"golang.zx2c4.com/wireguard/windows/manager"
 )
 
 type ManageTunnelsWindow struct {
@@ -23,7 +23,7 @@ type ManageTunnelsWindow struct {
 	logPage     *LogPage
 	updatePage  *UpdatePage
 
-	tunnelChangedCB *service.TunnelChangeCallback
+	tunnelChangedCB *manager.TunnelChangeCallback
 }
 
 const (
@@ -98,9 +98,9 @@ func NewManageTunnelsWindow() (*ManageTunnelsWindow, error) {
 	}
 	mtw.tabs.Pages().Add(mtw.logPage.TabPage)
 
-	mtw.tunnelChangedCB = service.IPCClientRegisterTunnelChange(mtw.onTunnelChange)
-	globalState, _ := service.IPCClientGlobalState()
-	mtw.onTunnelChange(nil, service.TunnelUnknown, globalState, nil)
+	mtw.tunnelChangedCB = manager.IPCClientRegisterTunnelChange(mtw.onTunnelChange)
+	globalState, _ := manager.IPCClientGlobalState()
+	mtw.onTunnelChange(nil, manager.TunnelUnknown, globalState, nil)
 
 	systemMenu := win.GetSystemMenu(mtw.Handle(), false)
 	if systemMenu != 0 {
@@ -129,26 +129,26 @@ func (mtw *ManageTunnelsWindow) Dispose() {
 	mtw.FormBase.Dispose()
 }
 
-func (mtw *ManageTunnelsWindow) updateProgressIndicator(globalState service.TunnelState) {
+func (mtw *ManageTunnelsWindow) updateProgressIndicator(globalState manager.TunnelState) {
 	pi := mtw.ProgressIndicator()
 	if pi == nil {
 		return
 	}
 	switch globalState {
-	case service.TunnelStopping, service.TunnelStarting:
+	case manager.TunnelStopping, manager.TunnelStarting:
 		pi.SetState(walk.PIIndeterminate)
 	default:
 		pi.SetState(walk.PINoProgress)
 	}
 	if icon, err := iconForState(globalState, 16); err == nil {
-		if globalState == service.TunnelStopped {
+		if globalState == manager.TunnelStopped {
 			icon = nil
 		}
 		pi.SetOverlayIcon(icon, textForState(globalState, false))
 	}
 }
 
-func (mtw *ManageTunnelsWindow) onTunnelChange(tunnel *service.Tunnel, state service.TunnelState, globalState service.TunnelState, err error) {
+func (mtw *ManageTunnelsWindow) onTunnelChange(tunnel *manager.Tunnel, state manager.TunnelState, globalState manager.TunnelState, err error) {
 	mtw.Synchronize(func() {
 		mtw.updateProgressIndicator(globalState)
 
@@ -204,7 +204,7 @@ func (mtw *ManageTunnelsWindow) WndProc(hwnd win.HWND, msg uint32, wParam, lPara
 	case taskbarButtonCreatedMsg:
 		ret := mtw.FormBase.WndProc(hwnd, msg, wParam, lParam)
 		go func() {
-			globalState, err := service.IPCClientGlobalState()
+			globalState, err := manager.IPCClientGlobalState()
 			if err == nil {
 				mtw.Synchronize(func() {
 					mtw.updateProgressIndicator(globalState)
-- 
cgit v1.2.3-59-g8ed1b