~sircmpwn/aerc

f1b365dfc30b7253f3baea270ebcc8d1fb754db9 — Drew DeVault 7 months ago d3379dd
Revert "Show spinner when fetching contents"

This reverts commit 1339faf7881f33762c6e0a4915404e362fc51de1.
2 files changed, 3 insertions(+), 9 deletions(-)

M lib/msgstore.go
M widgets/msglist.go
M lib/msgstore.go => lib/msgstore.go +3 -6
@@ 11,10 11,9 @@ import (

// Accesses to fields must be guarded by MessageStore.Lock/Unlock
type MessageStore struct {
	Deleted          map[uint32]interface{}
	DirInfo          models.DirectoryInfo
	Messages         map[uint32]*models.MessageInfo
	FetchingContents bool
	Deleted  map[uint32]interface{}
	DirInfo  models.DirectoryInfo
	Messages map[uint32]*models.MessageInfo
	// Ordered list of known UIDs
	uids []uint32



@@ 161,7 160,6 @@ func (store *MessageStore) Update(msg types.WorkerMessage) {
		store.worker.PostAction(&types.FetchDirectoryContents{
			SortCriteria: store.defaultSortCriteria,
		}, nil)
		store.FetchingContents = true
		update = true
	case *types.DirectoryContents:
		newMap := make(map[uint32]*models.MessageInfo)


@@ 175,7 173,6 @@ func (store *MessageStore) Update(msg types.WorkerMessage) {
		}
		store.Messages = newMap
		store.uids = msg.Uids
		store.FetchingContents = false
		update = true
	case *types.MessageInfo:
		if existing, ok := store.Messages[msg.Info.Uid]; ok && existing != nil {

M widgets/msglist.go => widgets/msglist.go +0 -3
@@ 61,9 61,6 @@ func (ml *MessageList) Draw(ctx *ui.Context) {
			ml.drawEmptyMessage(ctx)
			return
		}
	} else if store.FetchingContents {
		ml.spinner.Draw(ctx)
		return
	}

	var (