procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Switch to Ayatana Indicators

This commit is contained in:
Nicholas Guriev 2018-06-11 11:51:39 +03:00 committed by John Preston
parent 35a3cb35d5
commit b6432e7d13
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Telegram/SourceFiles/platform/linux/linux_libs.cpp
View File

@ -234,14 +234,14 @@ void start() {
bool gtkLoaded = false; bool gtkLoaded = false;
bool indicatorLoaded = false; bool indicatorLoaded = false;
QLibrary lib_gtk, lib_indicator; 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)) { if (loadLibrary(lib_gtk, "gtk-3", 0)) {
gtkLoaded = setupGtkBase(lib_gtk); gtkLoaded = setupGtkBase(lib_gtk);
indicatorLoaded = setupAppIndicator(lib_indicator); indicatorLoaded = setupAppIndicator(lib_indicator);
} }
} }
if (!gtkLoaded || !indicatorLoaded) { 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)) { if (loadLibrary(lib_gtk, "gtk-x11-2.0", 0)) {
gtkLoaded = indicatorLoaded = false; gtkLoaded = indicatorLoaded = false;
gtkLoaded = setupGtkBase(lib_gtk); gtkLoaded = setupGtkBase(lib_gtk);

4
Telegram/SourceFiles/platform/linux/linux_libs.h
View File

@ -10,7 +10,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#ifndef TDESKTOP_DISABLE_GTK_INTEGRATION #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION
extern "C" { extern "C" {
#undef signals #undef signals
#ifdef TDESKTOP_USE_AYATANA_INDICATORS
#include <libayatana-appindicator/app-indicator.h>
#else
#include <libappindicator/app-indicator.h> #include <libappindicator/app-indicator.h>
#endif
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <gdk/gdk.h> #include <gdk/gdk.h>
#define signals public #define signals public

11
Telegram/gyp/telegram_linux.gypi
View File

@ -96,11 +96,20 @@
], ],
}], ['not_need_gtk!="True"', { }], ['not_need_gtk!="True"', {
'cflags_cc': [ '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 gtk+-2.0)',
'<!(pkg-config 2> /dev/null --cflags glib-2.0)', '<!(pkg-config 2> /dev/null --cflags glib-2.0)',
'<!(pkg-config 2> /dev/null --cflags dee-1.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)' ],
}] }]
], ],
}]], }]],