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

Remove Platform:: where is not needed in linux platform files 

Fix lines length in notifications_manager_linux.cpp
This commit is contained in:
Ilya Fedin 2020-10-26 07:43:45 +04:00 committed by John Preston
parent 022fc9a779
commit 9ab221d4c9
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -115,7 +115,7 @@ bool setupGtkBase(QLibrary &lib_gtk) {
// Otherwise we get segfault in Ubuntu 17.04 in gtk_init_check() call. // Otherwise we get segfault in Ubuntu 17.04 in gtk_init_check() call.
// See https://github.com/telegramdesktop/tdesktop/issues/3176 // See https://github.com/telegramdesktop/tdesktop/issues/3176
// See https://github.com/telegramdesktop/tdesktop/issues/3162 // See https://github.com/telegramdesktop/tdesktop/issues/3162
if(Platform::IsWayland()) { if(IsWayland()) {
DEBUG_LOG(("Limit allowed GDK backends to wayland,x11")); DEBUG_LOG(("Limit allowed GDK backends to wayland,x11"));
gdk_set_allowed_backends("wayland,x11"); gdk_set_allowed_backends("wayland,x11");
} else { } else {
@ -176,7 +176,7 @@ void SetIconTheme() {
DEBUG_LOG(("New icon theme: %1").arg(QIcon::themeName())); DEBUG_LOG(("New icon theme: %1").arg(QIcon::themeName()));
DEBUG_LOG(("New fallback icon theme: %1").arg(QIcon::fallbackThemeName())); DEBUG_LOG(("New fallback icon theme: %1").arg(QIcon::fallbackThemeName()));
Platform::SetApplicationIcon(Window::CreateIcon()); SetApplicationIcon(Window::CreateIcon());
if (App::wnd()) { if (App::wnd()) {
App::wnd()->setWindowIcon(Window::CreateIcon()); App::wnd()->setWindowIcon(Window::CreateIcon());
} }
@ -188,13 +188,13 @@ void SetIconTheme() {
void DarkModeChanged() { void DarkModeChanged() {
Core::Sandbox::Instance().customEnterFromEventLoop([] { Core::Sandbox::Instance().customEnterFromEventLoop([] {
Core::App().settings().setSystemDarkMode(Platform::IsDarkMode()); Core::App().settings().setSystemDarkMode(IsDarkMode());
}); });
} }
void DecorationLayoutChanged() { void DecorationLayoutChanged() {
Core::Sandbox::Instance().customEnterFromEventLoop([] { Core::Sandbox::Instance().customEnterFromEventLoop([] {
Core::App().settings().setWindowControlsLayout(Platform::WindowControlsLayout()); Core::App().settings().setWindowControlsLayout(WindowControlsLayout());
}); });
} }
#endif // !TDESKTOP_DISABLE_GTK_INTEGRATION #endif // !TDESKTOP_DISABLE_GTK_INTEGRATION

17
Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
View File

@ -87,8 +87,7 @@ void GetSupported() {
} }
Checked = true; Checked = true;
if (Core::App().settings().nativeNotifications() if (Core::App().settings().nativeNotifications() && !IsWayland()) {
&& !Platform::IsWayland()) {
ComputeSupported(true); ComputeSupported(true);
} else { } else {
ComputeSupported(); ComputeSupported();
@ -402,15 +401,21 @@ NotificationData::NotificationData(
NotificationData::~NotificationData() { NotificationData::~NotificationData() {
if (_dbusConnection) { if (_dbusConnection) {
if (_actionInvokedSignalId != 0) { if (_actionInvokedSignalId != 0) {
g_dbus_connection_signal_unsubscribe(_dbusConnection, _actionInvokedSignalId); g_dbus_connection_signal_unsubscribe(
_dbusConnection,
_actionInvokedSignalId);
} }
if (_notificationRepliedSignalId != 0) { if (_notificationRepliedSignalId != 0) {
g_dbus_connection_signal_unsubscribe(_dbusConnection, _notificationRepliedSignalId); g_dbus_connection_signal_unsubscribe(
_dbusConnection,
_notificationRepliedSignalId);
} }
if (_notificationClosedSignalId != 0) { if (_notificationClosedSignalId != 0) {
g_dbus_connection_signal_unsubscribe(_dbusConnection, _notificationClosedSignalId); g_dbus_connection_signal_unsubscribe(
_dbusConnection,
_notificationClosedSignalId);
} }
g_object_unref(_dbusConnection); g_object_unref(_dbusConnection);
@ -647,7 +652,7 @@ std::unique_ptr<Window::Notifications::Manager> Create(
#endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION #endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
if ((Core::App().settings().nativeNotifications() && Supported()) if ((Core::App().settings().nativeNotifications() && Supported())
|| Platform::IsWayland()) { || IsWayland()) {
return std::make_unique<Manager>(system); return std::make_unique<Manager>(system);
} }