From 4c07e4a9d49eff0e1ead1f1c8206da3b551b28b1 Mon Sep 17 00:00:00 2001 From: Manuel de Brito Fontes Date: Sat, 7 Nov 2026 02:55:34 -0300 Subject: [PATCH] gnome-shell-extension-appindicator: one icon for an item found twice Trayscale, started at login, showed two tray icons: it registers by a standard SNI name, the startup scan finds the same object by its unique name, and the watcher keyed the two differently. The fork now carries upstream PR #679 (#665), which keys every item by its owner's unique name and its path. task test:usb's top bar shows one icon again. Co-Authored-By: Claude Opus 5.5 --- image/apko.lock.yaml | 4 ++-- recipes/gnome-shell-extension-appindicator.yaml | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/image/apko.lock.yaml b/image/apko.lock.yaml index 76ccbbe..da858a1 100644 --- a/image/apko.lock.yaml +++ b/image/apko.lock.yaml @@ -114,8 +114,8 @@ contents: - gnome-session-lang=51.0-r0 - gnome-settings-daemon=51.1-r0 - gnome-shell=51.1-r1 - - gnome-shell-extension-appindicator=66-r5 - - gnome-shell-extension-appindicator-lang=66-r5 + - gnome-shell-extension-appindicator=66-r6 + - gnome-shell-extension-appindicator-lang=66-r6 - gnome-shell-extension-caffeine=61-r0 - gnome-shell-extension-caffeine-lang=61-r0 - gnome-shell-extension-clipboard-indicator=72-r0 diff --git a/recipes/gnome-shell-extension-appindicator.yaml b/recipes/gnome-shell-extension-appindicator.yaml index 3282498..456f0c8 100644 --- a/recipes/gnome-shell-extension-appindicator.yaml +++ b/recipes/gnome-shell-extension-appindicator.yaml @@ -1,7 +1,7 @@ package: name: gnome-shell-extension-appindicator version: "66" - epoch: 5 + epoch: 6 description: GNOME Shell extension for AppIndicator, KStatusNotifierItem and legacy tray icons copyright: - license: GPL-2.0-or-later @@ -25,13 +25,15 @@ pipeline: # v66 and upstream master to fbc758a (Logger.warn, the Custom Icons entries) plus, on the fork's # gnome-51 branch: a leaked handler per D-Bus operation (upstream #647), # exceptions on detached menu items (#656), a stack trace a second for apps' own Get errors - # (#581, #551), tray-pos handlers doubling (#641), duplicate icons (#665), and the bus scan's - # subprocess killed when cancelled (#310). + # (#581, #551), tray-pos handlers doubling (#641), the bus scan's subprocess killed when + # cancelled (#310), and upstream PR #679 for duplicate icons (#665): every item keyed by its + # owner's unique name and its path, so one that registers by a standard SNI name and the + # startup scan that finds it by its unique name make one icon, not two (Trayscale at login). - uses: git-checkout with: repository: https://github.com/Construct-Linux/gnome-shell-extension-appindicator branch: gnome-51 - expected-commit: 01f75e26229e1b70e4fbe1745d3923f6e2545a77 + expected-commit: b32d8c7f4ef51270ac045f809eaed1461b7fc890 # The fork installs system-wide only and leaves the schemas to the image, which compiles them # all at build.