Commit 59514edd authored by aviau's avatar aviau Committed by Sébastien Blin

prefer Ayatana AppIndicator

Prefer Ayatana AppIndicator over Ubuntu's AppIndicator.

Atayana AppIndicator are more gnostic on desktop environments other than
Unity.

As suggested by Mike Gabriel <sunweaver@debian.org>:
 - https://bugs.debian.org/894651

Change-Id: Ide7a3313d6f18ca991d17fe163c74730c9fc3f2c
Reviewed-by: Sébastien Blin's avatarSebastien Blin <sebastien.blin@savoirfairelinux.com>
parent 09478e4b
......@@ -96,7 +96,23 @@ ENDIF()
FIND_PACKAGE(Gettext) #optional for translations
PKG_CHECK_MODULES(LIBQRENCODE libqrencode>=3.4)
PKG_CHECK_MODULES(LIBNM libnm>=1.0) #optional to detect changes in the network
PKG_CHECK_MODULES(APPINDICATOR appindicator3-0.1) #optional, ideal for use with Unity
# Both appindicators are optional. ayatana-appindicator is better
# maintained and it works best across all desktop environments.
PKG_CHECK_MODULES(APPINDICATOR ayatana-appindicator3-0.1)
IF( APPINDICATOR_FOUND )
SET(HAVE_AYATANAAPPINDICATOR 1)
SET(HAVE_APPINDICATOR 1)
ELSE()
PKG_CHECK_MODULES(APPINDICATOR appindicator3-0.1)
IF( APPINDICATOR_FOUND )
SET(HAVE_AYATANAAPPINDICATOR 0)
SET(HAVE_APPINDICATOR 1)
ELSE()
SET(HAVE_AYATANAAPPINDICATOR 0)
SET(HAVE_APPINDICATOR 0)
ENDIF()
ENDIF()
PKG_CHECK_MODULES(WEBKIT webkit2gtk-4.0)
IF(NOT WEBKIT_FOUND)
......@@ -420,13 +436,6 @@ ELSE()
SET(USE_LIBNM 0)
ENDIF()
# configure appindicator variable for config.h file
IF( APPINDICATOR_FOUND )
SET(HAVE_APPINDICATOR 1)
ELSE()
SET(HAVE_APPINDICATOR 0)
ENDIF()
# configure libcanberra variable for config.h file
IF( CANBERRA_FOUND )
SET(USE_CANBERRA 1)
......
......@@ -6,6 +6,7 @@
#define USE_LIBNOTIFY @USE_LIBNOTIFY@
#define HAVE_APPINDICATOR @HAVE_APPINDICATOR@
#define HAVE_AYATANAAPPINDICATOR @HAVE_AYATANAAPPINDICATOR@
#define USE_LIBNM @USE_LIBNM@
#define USE_CANBERRA @USE_CANBERRA@
......
......@@ -68,7 +68,9 @@
#include "utils/accounts.h"
#include "utils/calling.h"
#if HAVE_APPINDICATOR
#if HAVE_AYATANAAPPINDICATOR
#include <libayatana-appindicator/app-indicator.h>
#elif HAVE_APPINDICATOR
#include <libappindicator/app-indicator.h>
#endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment