Improve Linux CI setup and tray diagnostics

Added missing packages (xfce4-notifyd, indicator-application) to CI workflow for better tray support. Enhanced CI script to handle more watcher binaries, increased settle time, and improved diagnostics output. Minor code cleanup in tray_linux.c for header includes.

Author: ReenigneArcher

.github/workflows/ci.yml

@@ -70,6 +70,8 @@ jobs:
             xfce4 \
             xfce4-panel \
             xfce4-indicator-plugin \
+            xfce4-notifyd \
+            indicator-application \
             xfconf \
             xkb-data \
             imagemagick \

.github/workflows/ci_linux_desktop.sh

@@ -23,7 +23,7 @@ mkdir -p "${XDG_DATA_HOME}"
 chmod 700 "${XDG_DATA_HOME}"
 
 cleanup() {
-  # best effort cleanup
+  # Best-effort cleanup.
   kill "${WATCHER_PID:-}" "${PANEL_PID:-}" "${WM_PID:-}" >/dev/null 2>&1 || true
   chmod -R u+w "${XDG_DATA_HOME}" >/dev/null 2>&1 || true
 }
@@ -59,28 +59,43 @@ xfce4-panel >/dev/null 2>&1 &
 PANEL_PID=$!
 
 # Start an SNI/AppIndicator watcher so AppIndicators can appear.
-# Prefer Ayatana watcher if available.
+# Different distros provide different watcher/service binaries.
 if command -v ayatana-indicator-application-service >/dev/null 2>&1; then
   ayatana-indicator-application-service >/dev/null 2>&1 &
   WATCHER_PID=$!
 elif command -v indicator-application-service >/dev/null 2>&1; then
   indicator-application-service >/dev/null 2>&1 &
   WATCHER_PID=$!
+elif command -v indicator-application >/dev/null 2>&1; then
+  # Some packages install only `indicator-application`.
+  indicator-application >/dev/null 2>&1 &
+  WATCHER_PID=$!
 else
   WATCHER_PID=
 fi
 
 # Small settle time for panel + watcher.
-sleep 3
+sleep 5
 
 echo "::group::Linux tray diagnostics"
 echo "DISPLAY=${DISPLAY:-}"
 echo "XDG_RUNTIME_DIR=${XDG_RUNTIME_DIR}"
 echo "XDG_DATA_HOME=${XDG_DATA_HOME}"
+echo "Panel plugin ids:"
+xfconf-query -c xfce4-panel -p /panels/panel-1/plugin-ids || true
+echo "Plugin-1 type:"
+xfconf-query -c xfce4-panel -p /plugins/plugin-1 || true
 echo "Enabled XFCE panel plugins:"
 xfconf-query -c xfce4-panel -p /panels/panel-1/plugin-ids || true
 xfconf-query -c xfce4-panel -p /plugins/plugin-1 || true
 echo "Watcher process: ${WATCHER_PID:-none}"
+# If we found no watcher binary, show what's available.
+if [ -z "${WATCHER_PID:-}" ]; then
+  echo "Available watcher binaries:"
+  command -v ayatana-indicator-application-service || true
+  command -v indicator-application-service || true
+  command -v indicator-application || true
+fi
 dbus-send --session --dest=org.freedesktop.DBus --type=method_call --print-reply \
   /org/freedesktop/DBus org.freedesktop.DBus.ListNames \
   | sed -n 's/.*string "\(.*\)".*/\1/p' \

src/tray_linux.c

@@ -4,8 +4,10 @@
  */
 // standard includes
 #include <stdbool.h>
+#include <stdio.h>
 #include <stddef.h>
 #include <string.h>
+#include <unistd.h>
 
 // lib includes
 #ifdef TRAY_AYATANA_APPINDICATOR
@@ -18,9 +20,6 @@
 #endif
 #include <libnotify/notify.h>
 
-#include <stdio.h>
-#include <unistd.h>
-
 // Use a per-process AppIndicator id to avoid DBus collisions when tests create multiple
 // tray instances in the same desktop/session.
 static unsigned long tray_appindicator_seq = 0;