diff options
author | Dmitry Porunov | 2019-11-11 04:39:37 +0400 |
---|---|---|
committer | Dmitry Porunov | 2019-11-11 04:39:37 +0400 |
commit | a93d8b49fc77c1086164cd349fede66e08003f9d (patch) | |
tree | 9fb49f97fdf1fc2a2b7222fd42e1ab1fe4577454 /no-gtk2.patch | |
parent | 9abda47ab98590c8e869e52abb24d19ab1d1df36 (diff) | |
download | aur-a93d8b49fc77c1086164cd349fede66e08003f9d.tar.gz |
Release k1.1
Diffstat (limited to 'no-gtk2.patch')
-rw-r--r-- | no-gtk2.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/no-gtk2.patch b/no-gtk2.patch new file mode 100644 index 000000000000..e60038d0e828 --- /dev/null +++ b/no-gtk2.patch @@ -0,0 +1,32 @@ +diff --git a/Telegram/SourceFiles/platform/linux/linux_libs.cpp b/Telegram/SourceFiles/platform/linux/linux_libs.cpp +index 5071d63d1..671d0e661 100644 +--- a/Telegram/SourceFiles/platform/linux/linux_libs.cpp ++++ b/Telegram/SourceFiles/platform/linux/linux_libs.cpp +@@ -243,24 +243,12 @@ void start() { + indicatorLoaded = setupAppIndicator(lib_indicator); + } + } +- if ((!gtkLoaded || !indicatorLoaded) && !isWayland) { +- 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); +- indicatorLoaded = setupAppIndicator(lib_indicator); +- } +- } +- } + + // If no appindicator, try at least load gtk. + if (!gtkLoaded && !indicatorLoaded) { + if (loadLibrary(lib_gtk, "gtk-3", 0)) { + gtkLoaded = setupGtkBase(lib_gtk); + } +- if (!gtkLoaded && !isWayland && loadLibrary(lib_gtk, "gtk-x11-2.0", 0)) { +- gtkLoaded = setupGtkBase(lib_gtk); +- } + } + + if (gtkLoaded) { +-- +2.23.0 + |