Skip to content

Fix for legacy appindicator #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ReenigneArcher merged 2 commits into from
Sep 18, 2023
+19 −3
Merged

Fix for legacy appindicator #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6bb242d
Fix for legacy appindicator
TheElixZammuto Sep 17, 2023
f42c655
Merge branch 'origin-fix-legacy-appindicator' into fix-legacy-appindi…
ReenigneArcher Sep 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,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_compile_definitions(tray PRIVATE TRAY_LIBNOTIFY=1)
target_link_libraries(tray PRIVATE ${APPINDICATOR_LIBRARIES} ${LIBNOTIFY_LIBRARIES})
endif()
Expand Down
7 changes: 6 additions & 1 deletion cmake/FindAPPINDICATOR.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
9 changes: 7 additions & 2 deletions tray_linux.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
#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

#include <libnotify/notify.h>
#include <stddef.h>
#include <string.h>
#define TRAY_APPINDICATOR_ID "tray-id"

static AppIndicator *indicator = NULL;
Expand Down