From 6bb242d59694c657ab583fe62c3b7720a118e882 Mon Sep 17 00:00:00 2001
From: Elia Zammuto <theelixzammuto@gmail.com>
Date: Sun, 17 Sep 2023 19:55:03 +0000
Subject: [PATCH] Fix for legacy appindicator

---
 CMakeLists.txt               | 6 ++++++
 cmake/FindAPPINDICATOR.cmake | 7 ++++++-
 tray_linux.c                 | 4 ++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index abcf5ab0..2b0f118e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,6 +48,12 @@ else()
 				target_compile_options(tray PRIVATE ${APPINDICATOR_CFLAGS})
 				target_link_directories(tray PRIVATE ${APPINDICATOR_LIBRARY_DIRS})
 				target_compile_definitions(tray PRIVATE TRAY_APPINDICATOR=1)
+				if(APPINDICATOR_AYATANA)
+					target_compile_definitions(tray PRIVATE TRAY_AYATANA_APPINDICATOR=1)
+				endif()
+				if(APPINDICATOR_LEGACY)
+					target_compile_definitions(tray PRIVATE TRAY_LEGACY_APPINDICATOR=1)
+				endif()
 				target_link_libraries(tray PRIVATE ${APPINDICATOR_LIBRARIES})
 			endif()
         endif()
diff --git a/cmake/FindAPPINDICATOR.cmake b/cmake/FindAPPINDICATOR.cmake
index 5d9f718e..6bfeb662 100644
--- a/cmake/FindAPPINDICATOR.cmake
+++ b/cmake/FindAPPINDICATOR.cmake
@@ -23,7 +23,12 @@ include(FindPackageHandleStandardArgs)
 
 PKG_CHECK_MODULES(APPINDICATOR ayatana-appindicator3-0.1)
 IF( APPINDICATOR_FOUND )
-    SET(HAVE_AYATANAAPPINDICATOR 1)
+    SET(APPINDICATOR_AYATANA 1)
+ELSE()
+    PKG_CHECK_MODULES(APPINDICATOR appindicator3-0.1)
+    IF( APPINDICATOR_FOUND )
+        SET(APPINDICATOR_LEGACY 1)
+    ENDIF()
 ENDIF()
 
 mark_as_advanced(APPINDICATOR_INCLUDE_DIR APPINDICATOR_LIBRARY)
diff --git a/tray_linux.c b/tray_linux.c
index 1ed67169..d2e9454f 100644
--- a/tray_linux.c
+++ b/tray_linux.c
@@ -1,7 +1,11 @@
 #include "tray.h"
 #include <string.h>
 #include <stddef.h>
+#ifdef TRAY_AYATANA_APPINDICATOR
 #include <libayatana-appindicator/app-indicator.h>
+#elif TRAY_LEGACY_APPINDICATOR
+#include <appindicator/app-indicator.h>
+#endif
 
 #define TRAY_APPINDICATOR_ID "tray-id"