From b6432e7d134304866af3c77dedb109cd13b59822 Mon Sep 17 00:00:00 2001
From: Nicholas Guriev <guriev-ns@ya.ru>
Date: Mon, 11 Jun 2018 11:51:39 +0300
Subject: [PATCH] Switch to Ayatana Indicators

---
 Telegram/SourceFiles/platform/linux/linux_libs.cpp |  4 ++--
 Telegram/SourceFiles/platform/linux/linux_libs.h   |  4 ++++
 Telegram/gyp/telegram_linux.gypi                   | 11 ++++++++++-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/linux_libs.cpp b/Telegram/SourceFiles/platform/linux/linux_libs.cpp
index b2d12a838c..f8d74fee10 100644
--- a/Telegram/SourceFiles/platform/linux/linux_libs.cpp
+++ b/Telegram/SourceFiles/platform/linux/linux_libs.cpp
@@ -234,14 +234,14 @@ void start() {
 	bool gtkLoaded = false;
 	bool indicatorLoaded = false;
 	QLibrary lib_gtk, lib_indicator;
-	if (loadLibrary(lib_indicator, "appindicator3", 1)) {
+	if (loadLibrary(lib_indicator, "ayatana-appindicator3", 1) || loadLibrary(lib_indicator, "appindicator3", 1)) {
 		if (loadLibrary(lib_gtk, "gtk-3", 0)) {
 			gtkLoaded = setupGtkBase(lib_gtk);
 			indicatorLoaded = setupAppIndicator(lib_indicator);
 		}
 	}
 	if (!gtkLoaded || !indicatorLoaded) {
-		if (loadLibrary(lib_indicator, "appindicator", 1)) {
+		if (loadLibrary(lib_indicator, "ayatana-appindicator", 1) || loadLibrary(lib_indicator, "appindicator", 1)) {
 			if (loadLibrary(lib_gtk, "gtk-x11-2.0", 0)) {
 				gtkLoaded = indicatorLoaded = false;
 				gtkLoaded = setupGtkBase(lib_gtk);
diff --git a/Telegram/SourceFiles/platform/linux/linux_libs.h b/Telegram/SourceFiles/platform/linux/linux_libs.h
index 6f93d69cdc..4834fee11f 100644
--- a/Telegram/SourceFiles/platform/linux/linux_libs.h
+++ b/Telegram/SourceFiles/platform/linux/linux_libs.h
@@ -10,7 +10,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION
 extern "C" {
 #undef signals
+#ifdef TDESKTOP_USE_AYATANA_INDICATORS
+#include <libayatana-appindicator/app-indicator.h>
+#else
 #include <libappindicator/app-indicator.h>
+#endif
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
 #define signals public
diff --git a/Telegram/gyp/telegram_linux.gypi b/Telegram/gyp/telegram_linux.gypi
index 80259c687d..dc0f4b90d1 100644
--- a/Telegram/gyp/telegram_linux.gypi
+++ b/Telegram/gyp/telegram_linux.gypi
@@ -96,11 +96,20 @@
         ],
       }], ['not_need_gtk!="True"', {
         'cflags_cc': [
-          '<!(pkg-config 2> /dev/null --cflags appindicator-0.1)',
           '<!(pkg-config 2> /dev/null --cflags gtk+-2.0)',
           '<!(pkg-config 2> /dev/null --cflags glib-2.0)',
           '<!(pkg-config 2> /dev/null --cflags dee-1.0)',
         ],
+      }], ['<!(pkg-config ayatana-appindicator3-0.1; echo $?) == 0', {
+        'cflags_cc': [ '<!(pkg-config --cflags ayatana-appindicator3-0.1)' ],
+        'defines': [ 'TDESKTOP_USE_AYATANA_INDICATORS' ],
+      }], ['<!(pkg-config ayatana-appindicator-0.1; echo $?) == 0', {
+        'cflags_cc': [ '<!(pkg-config --cflags ayatana-appindicator-0.1)' ],
+        'defines': [ 'TDESKTOP_USE_AYATANA_INDICATORS' ],
+      }], ['<!(pkg-config appindicator3-0.1; echo $?) == 0', {
+        'cflags_cc': [ '<!(pkg-config --cflags appindicator3-0.1)' ],
+      }], ['<!(pkg-config appindicator-0.1; echo $?) == 0', {
+        'cflags_cc': [ '<!(pkg-config --cflags appindicator-0.1)' ],
       }]
     ],
   }]],