blob: f2384e322dc01c996ee7a719a8a5e39f922cc38c (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
|
diff -Naur tdesktop-1.2.6.orig/Telegram/SourceFiles/platform/linux/linux_libs.cpp tdesktop-1.2.6/Telegram/SourceFiles/platform/linux/linux_libs.cpp
--- tdesktop-1.2.6.orig/Telegram/SourceFiles/platform/linux/linux_libs.cpp 2017-12-30 11:13:48.000000000 +0100
+++ tdesktop-1.2.6/Telegram/SourceFiles/platform/linux/linux_libs.cpp 2018-01-17 11:41:49.593275952 +0100
@@ -253,24 +253,12 @@
indicatorLoaded = setupAppIndicator(lib_indicator);
}
}
- if (!gtkLoaded || !indicatorLoaded) {
- if (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 && loadLibrary(lib_gtk, "gtk-x11-2.0", 0)) {
- gtkLoaded = setupGtkBase(lib_gtk);
- }
}
if (gtkLoaded) {
|