Skip to content

Commit d6fdf16

Browse files
authored
Merge pull request #618 from SergioChan/fix/issue-617-systray-upstream
ui: migrate tray backend to energye/systray
2 parents 3d8d8a2 + 308ecc7 commit d6fdf16

File tree

6 files changed

+27
-116
lines changed

6 files changed

+27
-116
lines changed

.golangci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ linters:
3030
- github.com/Unpackerr/unpackerr
3131
- github.com/lestrrat-go/apache-logformat
3232
- github.com/ncruces/zenity
33-
- github.com/getlantern/systray
33+
- github.com/energye/systray
3434
- github.com/hako/durafmt
3535
- github.com/mitchellh/go-homedir
3636
- github.com/fsnotify/fsnotify

go.mod

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ go 1.26.0
55
require (
66
code.cloudfoundry.org/bytefmt v0.65.0
77
github.com/BurntSushi/toml v1.6.0
8+
github.com/energye/systray v1.0.3
89
github.com/fsnotify/fsnotify v1.9.0
9-
github.com/getlantern/systray v1.2.2
1010
github.com/hako/durafmt v0.0.0-20210608085754-5c1018a4e16b
1111
github.com/julienschmidt/httprouter v1.3.0
1212
github.com/lestrrat-go/apache-logformat/v2 v2.0.6
@@ -38,26 +38,18 @@ require (
3838
github.com/cavaliergopher/rpm v1.3.0 // indirect
3939
github.com/cespare/xxhash/v2 v2.3.0 // indirect
4040
github.com/dchest/jsmin v0.0.0-20220218165748-59f39799265f // indirect
41-
github.com/getlantern/context v0.0.0-20220418194847-3d5e7a086201 // indirect
42-
github.com/getlantern/errors v1.0.4 // indirect
43-
github.com/getlantern/golog v0.0.0-20230503153817-8e72de7e0a65 // indirect
44-
github.com/getlantern/hex v0.0.0-20220104173244-ad7e4b9194dc // indirect
45-
github.com/getlantern/hidden v0.0.0-20220104173330-f221c5a24770 // indirect
46-
github.com/getlantern/ops v0.0.0-20231025133620-f368ab734534 // indirect
47-
github.com/go-logr/logr v1.4.3 // indirect
48-
github.com/go-logr/stdr v1.2.2 // indirect
49-
github.com/go-stack/stack v1.8.1 // indirect
41+
github.com/godbus/dbus/v5 v5.1.0 // indirect
5042
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
5143
github.com/icza/bitio v1.1.0 // indirect
5244
github.com/josephspurrier/goversioninfo v1.4.1 // indirect
5345
github.com/klauspost/compress v1.18.4 // indirect
46+
github.com/kr/text v0.2.0 // indirect
5447
github.com/lestrrat-go/strftime v1.1.1 // indirect
5548
github.com/mewkiz/flac v1.0.13 // indirect
5649
github.com/mewkiz/pkg v0.0.0-20250417130911-3f050ff8c56d // indirect
5750
github.com/mewpkg/term v0.0.0-20241026122259-37a80af23985 // indirect
5851
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
5952
github.com/nwaples/rardecode/v2 v2.2.2 // indirect
60-
github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c // indirect
6153
github.com/peterebden/ar v0.0.0-20241106141004-20dc11b778e8 // indirect
6254
github.com/pierrec/lz4/v4 v4.1.26 // indirect
6355
github.com/pkg/errors v0.9.1 // indirect
@@ -70,12 +62,6 @@ require (
7062
github.com/sshaman1101/dcompress v0.0.0-20200109162717-50436a6332de // indirect
7163
github.com/therootcompany/xz v1.0.1 // indirect
7264
github.com/ulikunitz/xz v0.5.15 // indirect
73-
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
74-
go.opentelemetry.io/otel v1.42.0 // indirect
75-
go.opentelemetry.io/otel/metric v1.42.0 // indirect
76-
go.opentelemetry.io/otel/trace v1.42.0 // indirect
77-
go.uber.org/multierr v1.11.0 // indirect
78-
go.uber.org/zap v1.27.1 // indirect
7965
go.yaml.in/yaml/v2 v2.4.4 // indirect
8066
go4.org v0.0.0-20260112195520-a5071408f32f // indirect
8167
golang.org/x/crypto v0.48.0 // indirect

0 commit comments

Comments
 (0)