RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use crl::on_main in MainWindow::sniSignalEmitted

This commit is contained in:
Ilya Fedin 2020-10-27 13:29:50 +04:00 committed by John Preston
parent d73d3cd43d
commit af6b07b780
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Telegram/SourceFiles/platform/linux/main_window_linux.cpp
View File

@ -509,7 +509,7 @@ void MainWindow::initHook() {
_sniDBusProxy, _sniDBusProxy,
"g-signal", "g-signal",
G_CALLBACK(sniSignalEmitted), G_CALLBACK(sniSignalEmitted),
this); nullptr);
auto sniWatcher = new QDBusServiceWatcher( auto sniWatcher = new QDBusServiceWatcher(
kSNIWatcherService.utf16(), kSNIWatcherService.utf16(),
@ -655,9 +655,13 @@ void MainWindow::sniSignalEmitted(
gchar *sender_name, gchar *sender_name,
gchar *signal_name, gchar *signal_name,
GVariant *parameters, GVariant *parameters,
MainWindow *window) { gpointer user_data) {
if(signal_name == qstr("StatusNotifierHostRegistered")) { if(signal_name == qstr("StatusNotifierHostRegistered")) {
window->handleSNIHostRegistered(); crl::on_main([] {
if (const auto window = App::wnd()) {
window->handleSNIHostRegistered();
}
});
} }
} }

3
Telegram/SourceFiles/platform/linux/main_window_linux.h
View File

@ -17,6 +17,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include <QtDBus/QDBusObjectPath> #include <QtDBus/QDBusObjectPath>
#include <dbusmenuexporter.h> #include <dbusmenuexporter.h>
typedef void* gpointer;
typedef char gchar; typedef char gchar;
typedef struct _GVariant GVariant; typedef struct _GVariant GVariant;
typedef struct _GDBusProxy GDBusProxy; typedef struct _GDBusProxy GDBusProxy;
@ -145,7 +146,7 @@ private:
gchar *sender_name, gchar *sender_name,
gchar *signal_name, gchar *signal_name,
GVariant *parameters, GVariant *parameters,
MainWindow *window); gpointer user_data);
#endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION #endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
}; };