Attachment #207951 for bug #240929

View | Details | Raw Unified | Return to bug 240929
Collapse All | Expand All

Lines 2-8 Link Here

(-)./Makefile (-1 / +1 lines)
2		2
3	PORTNAME= telegram-desktop	3	PORTNAME= telegram-desktop
4	DISTVERSIONPREFIX= v	4	DISTVERSIONPREFIX= v
5	DISTVERSION= 1.8.4	5	DISTVERSION= 1.8.9
6	CATEGORIES= net-im	6	CATEGORIES= net-im
7		7
8	MAINTAINER= henry.hu.sh@gmail.com	8	MAINTAINER= henry.hu.sh@gmail.com

Lines 1-6 Link Here

(-)./distinfo (-3 / +3 lines)
1	TIMESTAMP = 1567889674	1	TIMESTAMP = 1569722754
2	SHA256 (telegramdesktop-tdesktop-v1.8.4_GH0.tar.gz) = 97f034d78447c99002b8742c75a3a436e709cdf2f5dff79f7ca04a8c76298627	2	SHA256 (telegramdesktop-tdesktop-v1.8.9_GH0.tar.gz) = 2df035cc4a582660b612656c22ff10d37eb34dbece958f9c99f6a0bd4e2fb61b
3	SIZE (telegramdesktop-tdesktop-v1.8.4_GH0.tar.gz) = 14367314	3	SIZE (telegramdesktop-tdesktop-v1.8.9_GH0.tar.gz) = 14407939
4	SHA256 (catchorg-Catch2-5ca44b68_GH0.tar.gz) = 8cdf2a345897bda1aaabffd4496dffe263768cef3e4254e74ae63545c8e12cc2	4	SHA256 (catchorg-Catch2-5ca44b68_GH0.tar.gz) = 8cdf2a345897bda1aaabffd4496dffe263768cef3e4254e74ae63545c8e12cc2
5	SIZE (catchorg-Catch2-5ca44b68_GH0.tar.gz) = 375264	5	SIZE (catchorg-Catch2-5ca44b68_GH0.tar.gz) = 375264
6	SHA256 (mapbox-variant-550ac2f_GH0.tar.gz) = 7ab3aa7c9fa672027f13721584df5f7ec09c0ecca499d374c6ac76e147ef7354	6	SHA256 (mapbox-variant-550ac2f_GH0.tar.gz) = 7ab3aa7c9fa672027f13721584df5f7ec09c0ecca499d374c6ac76e147ef7354

Lines 1-6 Link Here

(-)./files/patch-Telegram_SourceFiles_chat__helpers_stickers__emoji__pack.cpp (-2 / +2 lines)
1	--- Telegram/SourceFiles/chat_helpers/stickers_emoji_pack.cpp.orig 2019-09-06 13:41:43 UTC	1	--- Telegram/SourceFiles/chat_helpers/stickers_emoji_pack.cpp.orig 2019-09-27 17:04:25 UTC
2	+++ Telegram/SourceFiles/chat_helpers/stickers_emoji_pack.cpp	2	+++ Telegram/SourceFiles/chat_helpers/stickers_emoji_pack.cpp
3	@@ -103,7 +103,7 @@ constexpr auto kClearSourceTimeout = 10 * crl::time(10	3	@@ -105,7 +105,7 @@ constexpr auto kClearSourceTimeout = 10 * crl::time(10
4	},	4	},
5	5,	5	5,
6	};	6	};

Lines 1-6 Link Here

(-)./files/patch-Telegram_SourceFiles_core_update__checker.cpp (-3 / +3 lines)
1	--- Telegram/SourceFiles/core/update_checker.cpp.orig 2019-09-06 13:41:43 UTC	1	--- Telegram/SourceFiles/core/update_checker.cpp.orig 2019-09-27 17:04:25 UTC
2	+++ Telegram/SourceFiles/core/update_checker.cpp	2	+++ Telegram/SourceFiles/core/update_checker.cpp
3	@@ -1463,6 +1463,9 @@ int UpdateChecker::size() const {	3	@@ -1458,6 +1458,9 @@ int UpdateChecker::size() const {
4	//}	4	//}
5		5
6	bool checkReadyUpdate() {	6	bool checkReadyUpdate() {
Lines 10-16 Link Here
10	QString readyFilePath = cWorkingDir() + qsl("tupdates/temp/ready"), readyPath = cWorkingDir() + qsl("tupdates/temp");	10	QString readyFilePath = cWorkingDir() + qsl("tupdates/temp/ready"), readyPath = cWorkingDir() + qsl("tupdates/temp");
11	if (!QFile(readyFilePath).exists() \|\| cExeName().isEmpty()) {	11	if (!QFile(readyFilePath).exists() \|\| cExeName().isEmpty()) {
12	if (QDir(cWorkingDir() + qsl("tupdates/ready")).exists() \|\| QDir(cWorkingDir() + qsl("tupdates/temp")).exists()) {	12	if (QDir(cWorkingDir() + qsl("tupdates/ready")).exists() \|\| QDir(cWorkingDir() + qsl("tupdates/temp")).exists()) {
13	@@ -1515,6 +1518,9 @@ bool checkReadyUpdate() {	13	@@ -1510,6 +1513,9 @@ bool checkReadyUpdate() {
14	#elif defined Q_OS_LINUX // Q_OS_MAC	14	#elif defined Q_OS_LINUX // Q_OS_MAC
15	QString curUpdater = (cExeDir() + qsl("Updater"));	15	QString curUpdater = (cExeDir() + qsl("Updater"));
16	QFileInfo updater(cWorkingDir() + qsl("tupdates/temp/Updater"));	16	QFileInfo updater(cWorkingDir() + qsl("tupdates/temp/Updater"));

Lines 1-6 Link Here

(-)./files/patch-Telegram_SourceFiles_history_admin__log_history__admin__log__inner.cpp (-2 / +2 lines)
1	--- Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp.orig 2019-09-06 13:41:43 UTC	1	--- Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp.orig 2019-09-27 17:04:25 UTC
2	+++ Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp	2	+++ Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
3	@@ -1425,13 +1425,13 @@ void InnerWidget::mouseActionFinish(const QPoint &scre	3	@@ -1428,13 +1428,13 @@ void InnerWidget::mouseActionFinish(const QPoint &scre
4	_mouseSelectType = TextSelectType::Letters;	4	_mouseSelectType = TextSelectType::Letters;
5	//_widget->noSelectingScroll(); // TODO	5	//_widget->noSelectingScroll(); // TODO
6		6

Lines 1-6 Link Here

(-)./files/patch-Telegram_SourceFiles_history_history__inner__widget.cpp (-3 / +3 lines)
1	--- Telegram/SourceFiles/history/history_inner_widget.cpp.orig 2019-09-06 13:41:43 UTC	1	--- Telegram/SourceFiles/history/history_inner_widget.cpp.orig 2019-09-27 17:04:25 UTC
2	+++ Telegram/SourceFiles/history/history_inner_widget.cpp	2	+++ Telegram/SourceFiles/history/history_inner_widget.cpp
3	@@ -1390,7 +1390,7 @@ void HistoryInner::mouseActionFinish(	3	@@ -1394,7 +1394,7 @@ void HistoryInner::mouseActionFinish(
4	_widget->noSelectingScroll();	4	_widget->noSelectingScroll();
5	_widget->updateTopBarSelection();	5	_widget->updateTopBarSelection();
6		6
Lines 9-15 Link Here
9	if (!_selected.empty() && _selected.cbegin()->second != FullSelection) {	9	if (!_selected.empty() && _selected.cbegin()->second != FullSelection) {
10	const auto [item, selection] = *_selected.cbegin();	10	const auto [item, selection] = *_selected.cbegin();
11	if (const auto view = item->mainView()) {	11	if (const auto view = item->mainView()) {
12	@@ -1399,7 +1399,7 @@ void HistoryInner::mouseActionFinish(	12	@@ -1403,7 +1403,7 @@ void HistoryInner::mouseActionFinish(
13	QClipboard::Selection);	13	QClipboard::Selection);
14	}	14	}
15	}	15	}

Lines 1-6 Link Here

(-)./files/patch-Telegram_SourceFiles_history_view_history__view__list__widget.cpp (-3 / +3 lines)
1	--- Telegram/SourceFiles/history/view/history_view_list_widget.cpp.orig 2019-09-06 13:41:43 UTC	1	--- Telegram/SourceFiles/history/view/history_view_list_widget.cpp.orig 2019-09-27 17:04:25 UTC
2	+++ Telegram/SourceFiles/history/view/history_view_list_widget.cpp	2	+++ Telegram/SourceFiles/history/view/history_view_list_widget.cpp
3	@@ -2050,7 +2050,7 @@ void ListWidget::mouseActionFinish(	3	@@ -2053,7 +2053,7 @@ void ListWidget::mouseActionFinish(
4	_mouseSelectType = TextSelectType::Letters;	4	_mouseSelectType = TextSelectType::Letters;
5	//_widget->noSelectingScroll(); // #TODO select scroll	5	//_widget->noSelectingScroll(); // #TODO select scroll
6		6
Lines 9-15 Link Here
9	if (_selectedTextItem	9	if (_selectedTextItem
10	&& _selectedTextRange.from != _selectedTextRange.to) {	10	&& _selectedTextRange.from != _selectedTextRange.to) {
11	if (const auto view = viewForItem(_selectedTextItem)) {	11	if (const auto view = viewForItem(_selectedTextItem)) {
12	@@ -2059,7 +2059,7 @@ void ListWidget::mouseActionFinish(	12	@@ -2062,7 +2062,7 @@ void ListWidget::mouseActionFinish(
13	QClipboard::Selection);	13	QClipboard::Selection);
14	}	14	}
15	}	15	}

Lines 1-6 Link Here

(-)./files/patch-Telegram_SourceFiles_platform_freebsd_info__freebsd.cpp (-4 / +18 lines)
1	--- Telegram/SourceFiles/platform/freebsd/info_freebsd.cpp.orig 2019-07-28 03:19:18 UTC	1	--- Telegram/SourceFiles/platform/freebsd/info_freebsd.cpp.orig 2019-09-29 04:23:33 UTC
2	+++ Telegram/SourceFiles/platform/freebsd/info_freebsd.cpp	2	+++ Telegram/SourceFiles/platform/freebsd/info_freebsd.cpp
3	@@ -0,0 +1,35 @@	3	@@ -0,0 +1,49 @@
4	+/*	4	+/*
5	+This file is part of Telegram Desktop,	5	+This file is part of Telegram Desktop,
6	+the official desktop application for the Telegram messaging service.	6	+the official desktop application for the Telegram messaging service.
Lines 24-38 Link Here
24	+}	24	+}
25	+	25	+
26	+QString SystemCountry() {	26	+QString SystemCountry() {
27	+ return QString();	27	+ return QLocale::system().name().split('_').last();
28	+}	28	+}
29	+	29	+
30	+QString SystemLanguage() {	30	+QString SystemLanguage() {
31	+ return QString();	31	+ const auto system = QLocale::system();
		32	+ const auto languages = system.uiLanguages();
		33	+ return languages.isEmpty()
		34	+ ? system.name().split('_').first()
		35	+ : languages.front();
32	+}	36	+}
33	+	37	+
34	+QDate WhenSystemBecomesOutdated() {	38	+QDate WhenSystemBecomesOutdated() {
35	+ return QDate();	39	+ return QDate();
36	+}	40	+}
		41	+
		42	+int AutoUpdateVersion() {
		43	+ return 2;
		44	+}
		45	+
		46	+QString AutoUpdateKey() {
		47	+ return "freebsd";
		48	+}
		49	+
		50	+
37	+	51	+
38	+} // namespace Platform	52	+} // namespace Platform




--- Telegram/SourceFiles/platform/linux/linux_libs.cpp.orig	2019-09-27 17:04:25 UTC
+++ Telegram/SourceFiles/platform/linux/linux_libs.cpp
@@ -128,6 +128,7 @@ bool setupGtkBase(QLibrary &lib_gtk) {
 	return true;
 }
 

 bool setupAppIndicator(QLibrary &lib_indicator) {
 	if (!load(lib_indicator, "app_indicator_new", app_indicator_new)) return false;
 	if (!load(lib_indicator, "app_indicator_set_status", app_indicator_set_status)) return false;
@@ -137,6 +138,7 @@ bool setupAppIndicator(QLibrary &lib_indicator) {
 	DEBUG_LOG(("Library appindicator functions loaded!"));
 	return true;
 }

 #endif // !TDESKTOP_DISABLE_GTK_INTEGRATION
 
 } // namespace
@@ -198,10 +200,12 @@ f_g_type_check_instance_cast g_type_check_instance_cas
 f_g_type_check_instance_is_a g_type_check_instance_is_a = nullptr;
 f_g_signal_connect_data g_signal_connect_data = nullptr;
 f_g_signal_handler_disconnect g_signal_handler_disconnect = nullptr;

 f_gdk_init_check gdk_init_check = nullptr;
 f_gdk_pixbuf_new_from_data gdk_pixbuf_new_from_data = nullptr;
 f_gdk_pixbuf_new_from_file gdk_pixbuf_new_from_file = nullptr;
@@ -237,6 +241,7 @@ void start() {
 	bool gtkLoaded = false;
 	bool indicatorLoaded = false;
 	bool isWayland = QGuiApplication::platformName().startsWith(qsl("wayland"), Qt::CaseInsensitive);
 	QLibrary lib_gtk, lib_indicator;
+#ifdef HAVE_APPINDICATOR
 	if (loadLibrary(lib_indicator, "ayatana-appindicator3", 1) || loadLibrary(lib_indicator, "appindicator3", 1)) {
 		if (loadLibrary(lib_gtk, "gtk-3", 0)) {
 			gtkLoaded = setupGtkBase(lib_gtk);
@@ -252,6 +257,7 @@ void start() {
 			}
 		}
 	}




--- Telegram/SourceFiles/platform/linux/linux_libs.h.orig	2019-09-27 17:04:25 UTC
+++ Telegram/SourceFiles/platform/linux/linux_libs.h
@@ -13,11 +13,13 @@ https://github.com/telegramdesktop/tdesktop/blob/maste
 
 extern "C" {
 #undef signals
+#ifdef HAVE_APPINDICATOR

 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
 #define signals public
@@ -278,6 +280,7 @@ inline gulong g_signal_connect_swapped_helper(gpointer
 typedef void (*f_g_signal_handler_disconnect)(gpointer instance, gulong handler_id);
 extern f_g_signal_handler_disconnect g_signal_handler_disconnect;
 

 typedef AppIndicator* (*f_app_indicator_new)(const gchar *id, const gchar *icon_name, AppIndicatorCategory category);
 extern f_app_indicator_new app_indicator_new;
 
@@ -289,6 +292,7 @@ extern f_app_indicator_set_menu app_indicator_set_menu
 
 typedef void (*f_app_indicator_set_icon_full)(AppIndicator *self, const gchar *icon_name, const gchar *icon_desc);
 extern f_app_indicator_set_icon_full app_indicator_set_icon_full;




--- Telegram/SourceFiles/platform/linux/main_window_linux.cpp.orig	2019-09-27 17:04:25 UTC
+++ Telegram/SourceFiles/platform/linux/main_window_linux.cpp
@@ -28,7 +28,9 @@ bool noQtTrayIcon = false, tryAppIndicator = false;
 bool useGtkBase = false, useAppIndicator = false, useStatusIcon = false, trayIconChecked = false, useUnityCount = false;
 
 #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION

 GtkStatusIcon *_trayIcon = 0;
 GtkWidget *_trayMenu = 0;
 GdkPixbuf *_trayPixbuf = 0;
@@ -294,7 +296,9 @@ void MainWindow::workmodeUpdated(DBIWorkMode mode) {
 		if (noQtTrayIcon) {
 #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION
 			if (useAppIndicator) {

 			} else if (useStatusIcon) {
 				Libs::gtk_status_icon_set_visible(_trayIcon, false);
 			}
@@ -310,7 +314,9 @@ void MainWindow::workmodeUpdated(DBIWorkMode mode) {
 		if (noQtTrayIcon) {
 #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION
 			if (useAppIndicator) {

 			} else if (useStatusIcon) {
 				Libs::gtk_status_icon_set_visible(_trayIcon, true);
 			}
@@ -329,7 +335,9 @@ void MainWindow::psUpdateIndicator() {
 	if (iconFile.exists()) {
 		QByteArray path = QFile::encodeName(iconFile.absoluteFilePath()), name = QFile::encodeName(iconFile.fileName());
 		name = name.mid(0, name.size() - 4);

 	} else {
 		useAppIndicator = false;
 	}
@@ -426,11 +434,15 @@ void MainWindow::LibsLoaded() {
 			&& (Libs::g_object_ref_sink != nullptr)
 			&& (Libs::g_object_unref != nullptr);
 

 
 	if (tryAppIndicator && useGtkBase && useAppIndicator) {
 		noQtTrayIcon = true;
@@ -466,6 +478,7 @@ void MainWindow::psCreateTrayIcon() {
 	}
 
 #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION

 	if (useAppIndicator) {
 		DEBUG_LOG(("Trying to create AppIndicator"));
 		_trayMenu = Libs::gtk_menu_new();
@@ -496,6 +509,7 @@ void MainWindow::psCreateTrayIcon() {
 			useAppIndicator = false;
 		}
 	}

 	if (useStatusIcon) {
 		if (Libs::gdk_init_check(0, 0)) {
 			if (!_trayMenu) _trayMenu = Libs::gtk_menu_new();
@@ -630,10 +644,12 @@ MainWindow::~MainWindow() {
 		Libs::g_object_unref(_trayMenu);
 		_trayMenu = nullptr;
 	}

Lines 1-6 Link Here

(-)./files/patch-Telegram_SourceFiles_platform_platform__info.h (-2 / +2 lines)
1	--- Telegram/SourceFiles/platform/platform_info.h.orig 2019-07-07 13:34:35 UTC	1	--- Telegram/SourceFiles/platform/platform_info.h.orig 2019-09-27 17:04:25 UTC
2	+++ Telegram/SourceFiles/platform/platform_info.h	2	+++ Telegram/SourceFiles/platform/platform_info.h
3	@@ -49,4 +49,6 @@ namespace Platform {	3	@@ -51,4 +51,6 @@ namespace Platform {
4	#include "platform/linux/info_linux.h"	4	#include "platform/linux/info_linux.h"
5	#elif defined Q_OS_WIN // Q_OS_MAC \|\| Q_OS_LINUX	5	#elif defined Q_OS_WIN // Q_OS_MAC \|\| Q_OS_LINUX
6	#include "platform/win/info_win.h"	6	#include "platform/win/info_win.h"

Lines 1-6 Link Here

(-)./files/patch-Telegram_SourceFiles_ui_twidget.cpp (-2 / +2 lines)
1	--- Telegram/SourceFiles/ui/twidget.cpp.orig 2019-07-07 13:34:35 UTC	1	--- Telegram/SourceFiles/ui/twidget.cpp.orig 2019-09-27 17:04:25 UTC
2	+++ Telegram/SourceFiles/ui/twidget.cpp	2	+++ Telegram/SourceFiles/ui/twidget.cpp
3	@@ -270,9 +270,9 @@ void sendSynteticMouseEvent(QWidget *widget, QEvent::T	3	@@ -274,9 +274,9 @@ void sendSynteticMouseEvent(QWidget *widget, QEvent::T
4	, button	4	, button
5	, QGuiApplication::mouseButtons() \| button	5	, QGuiApplication::mouseButtons() \| button
6	, QGuiApplication::keyboardModifiers()	6	, QGuiApplication::keyboardModifiers()

Lines 1-6 Link Here

(-)./files/patch-Telegram_SourceFiles_ui_widgets_labels.cpp (-2 / +2 lines)
1	--- Telegram/SourceFiles/ui/widgets/labels.cpp.orig 2019-07-07 13:34:35 UTC	1	--- Telegram/SourceFiles/ui/widgets/labels.cpp.orig 2019-09-27 17:04:25 UTC
2	+++ Telegram/SourceFiles/ui/widgets/labels.cpp	2	+++ Telegram/SourceFiles/ui/widgets/labels.cpp
3	@@ -391,11 +391,11 @@ Ui::Text::StateResult FlatLabel::dragActionFinish(cons	3	@@ -396,11 +396,11 @@ Ui::Text::StateResult FlatLabel::dragActionFinish(cons
4	}	4	}
5	}	5	}
6		6

Lines 1-6 Link Here

(-)./files/patch-Telegram_SourceFiles_window_main__window.cpp (-3 / +3 lines)
1	--- Telegram/SourceFiles/window/main_window.cpp.orig 2019-09-06 13:41:43 UTC	1	--- Telegram/SourceFiles/window/main_window.cpp.orig 2019-09-27 17:04:25 UTC
2	+++ Telegram/SourceFiles/window/main_window.cpp	2	+++ Telegram/SourceFiles/window/main_window.cpp
3	@@ -564,7 +564,7 @@ bool MainWindow::minimizeToTray() {	3	@@ -571,7 +571,7 @@ bool MainWindow::minimizeToTray() {
4	}	4	}
5		5
6	void MainWindow::reActivateWindow() {	6	void MainWindow::reActivateWindow() {
Lines 9-15 Link Here
9	const auto reActivate = [=] {	9	const auto reActivate = [=] {
10	if (const auto w = App::wnd()) {	10	if (const auto w = App::wnd()) {
11	if (auto f = QApplication::focusWidget()) {	11	if (auto f = QApplication::focusWidget()) {
12	@@ -579,7 +579,7 @@ void MainWindow::reActivateWindow() {	12	@@ -586,7 +586,7 @@ void MainWindow::reActivateWindow() {
13	};	13	};
14	crl::on_main(this, reActivate);	14	crl::on_main(this, reActivate);
15	App::CallDelayed(200, this, reActivate);	15	App::CallDelayed(200, this, reActivate);

Lines 1-6 Link Here

(-)./files/patch-Telegram_gyp_telegram__sources.txt (-3 / +3 lines)
1	--- Telegram/gyp/telegram_sources.txt.orig 2019-09-06 13:41:43 UTC	1	--- Telegram/gyp/telegram_sources.txt.orig 2019-09-27 17:04:25 UTC
2	+++ Telegram/gyp/telegram_sources.txt	2	+++ Telegram/gyp/telegram_sources.txt
3	@@ -605,8 +605,8 @@	3	@@ -607,8 +607,8 @@
4	<(src_loc)/platform/linux/linux_libs.h	4	<(src_loc)/platform/linux/linux_libs.h
5	<(src_loc)/platform/linux/file_utilities_linux.cpp	5	<(src_loc)/platform/linux/file_utilities_linux.cpp
6	<(src_loc)/platform/linux/file_utilities_linux.h	6	<(src_loc)/platform/linux/file_utilities_linux.h
Lines 11-17 Link Here
11	<(src_loc)/platform/linux/launcher_linux.cpp	11	<(src_loc)/platform/linux/launcher_linux.cpp
12	<(src_loc)/platform/linux/launcher_linux.h	12	<(src_loc)/platform/linux/launcher_linux.h
13	<(src_loc)/platform/linux/main_window_linux.cpp	13	<(src_loc)/platform/linux/main_window_linux.cpp
14	@@ -923,14 +923,7 @@	14	@@ -931,14 +931,7 @@
15	<(emoji_suggestions_loc)/emoji_suggestions.cpp	15	<(emoji_suggestions_loc)/emoji_suggestions.cpp
16	<(emoji_suggestions_loc)/emoji_suggestions.h	16	<(emoji_suggestions_loc)/emoji_suggestions.h
17		17

Return to bug 240929

Lines 1-6 Link Here

(-)./files/patch-Telegram_SourceFiles_platform_linux_linux__libs.cpp (-7 / +7 lines)
1	--- Telegram/SourceFiles/platform/linux/linux_libs.cpp.orig 2019-02-01 12:51:46 UTC	1	--- Telegram/SourceFiles/platform/linux/linux_libs.cpp.orig 2019-09-27 17:04:25 UTC
2	+++ Telegram/SourceFiles/platform/linux/linux_libs.cpp	2	+++ Telegram/SourceFiles/platform/linux/linux_libs.cpp
3	@@ -121,6 +121,7 @@ bool setupGtkBase(QLibrary &lib_gtk) {	3	@@ -128,6 +128,7 @@ bool setupGtkBase(QLibrary &lib_gtk) {
4	return true;	4	return true;
5	}	5	}
6		6
Lines 8-14 Link Here
8	bool setupAppIndicator(QLibrary &lib_indicator) {	8	bool setupAppIndicator(QLibrary &lib_indicator) {
9	if (!load(lib_indicator, "app_indicator_new", app_indicator_new)) return false;	9	if (!load(lib_indicator, "app_indicator_new", app_indicator_new)) return false;
10	if (!load(lib_indicator, "app_indicator_set_status", app_indicator_set_status)) return false;	10	if (!load(lib_indicator, "app_indicator_set_status", app_indicator_set_status)) return false;
11	@@ -130,6 +131,7 @@ bool setupAppIndicator(QLibrary &lib_indicator) {	11	@@ -137,6 +138,7 @@ bool setupAppIndicator(QLibrary &lib_indicator) {
12	DEBUG_LOG(("Library appindicator functions loaded!"));	12	DEBUG_LOG(("Library appindicator functions loaded!"));
13	return true;	13	return true;
14	}	14	}
Lines 16-22 Link Here
16	#endif // !TDESKTOP_DISABLE_GTK_INTEGRATION	16	#endif // !TDESKTOP_DISABLE_GTK_INTEGRATION
17		17
18	} // namespace	18	} // namespace
19	@@ -191,10 +193,12 @@ f_g_type_check_instance_cast g_type_check_instance_cas	19	@@ -198,10 +200,12 @@ f_g_type_check_instance_cast g_type_check_instance_cas
20	f_g_type_check_instance_is_a g_type_check_instance_is_a = nullptr;	20	f_g_type_check_instance_is_a g_type_check_instance_is_a = nullptr;
21	f_g_signal_connect_data g_signal_connect_data = nullptr;	21	f_g_signal_connect_data g_signal_connect_data = nullptr;
22	f_g_signal_handler_disconnect g_signal_handler_disconnect = nullptr;	22	f_g_signal_handler_disconnect g_signal_handler_disconnect = nullptr;
Lines 29-43 Link Here
29	f_gdk_init_check gdk_init_check = nullptr;	29	f_gdk_init_check gdk_init_check = nullptr;
30	f_gdk_pixbuf_new_from_data gdk_pixbuf_new_from_data = nullptr;	30	f_gdk_pixbuf_new_from_data gdk_pixbuf_new_from_data = nullptr;
31	f_gdk_pixbuf_new_from_file gdk_pixbuf_new_from_file = nullptr;	31	f_gdk_pixbuf_new_from_file gdk_pixbuf_new_from_file = nullptr;
32	@@ -229,6 +233,7 @@ void start() {	32	@@ -237,6 +241,7 @@ void start() {
33	bool gtkLoaded = false;
34	bool indicatorLoaded = false;	33	bool indicatorLoaded = false;
		34	bool isWayland = QGuiApplication::platformName().startsWith(qsl("wayland"), Qt::CaseInsensitive);
35	QLibrary lib_gtk, lib_indicator;	35	QLibrary lib_gtk, lib_indicator;
36	+#ifdef HAVE_APPINDICATOR	36	+#ifdef HAVE_APPINDICATOR
37	if (loadLibrary(lib_indicator, "ayatana-appindicator3", 1) \|\| loadLibrary(lib_indicator, "appindicator3", 1)) {	37	if (loadLibrary(lib_indicator, "ayatana-appindicator3", 1) \|\| loadLibrary(lib_indicator, "appindicator3", 1)) {
38	if (loadLibrary(lib_gtk, "gtk-3", 0)) {	38	if (loadLibrary(lib_gtk, "gtk-3", 0)) {
39	gtkLoaded = setupGtkBase(lib_gtk);	39	gtkLoaded = setupGtkBase(lib_gtk);
40	@@ -244,6 +249,7 @@ void start() {	40	@@ -252,6 +257,7 @@ void start() {
41	}	41	}
42	}	42	}
43	}	43	}