Remove Platform:: where is not needed in linux platform files
Fix lines length in notifications_manager_linux.cpp
This commit is contained in:
parent
022fc9a779
commit
9ab221d4c9
|
@ -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
|
||||||
|
|
|
@ -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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue