mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-09-03 16:05:57 +00:00
Code Issues Releases Wiki Activity

Fix build with dummy notifications manager on Linux.

Browse Source
This commit is contained in:
John Preston
2021-04-29 11:21:38 +04:00
parent 9c9fc9e881
commit 404538c989
2 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Telegram/CMakeLists.txt
View File

@@ -830,6 +830,7 @@ PRIVATE
platform/linux/linux_gsd_media_keys.h platform/linux/linux_gsd_media_keys.h
platform/linux/linux_gtk_file_dialog.cpp platform/linux/linux_gtk_file_dialog.cpp
platform/linux/linux_gtk_file_dialog.h platform/linux/linux_gtk_file_dialog.h
platform/linux/linux_gtk_integration_dummy.cpp
platform/linux/linux_gtk_integration_p.h platform/linux/linux_gtk_integration_p.h
platform/linux/linux_gtk_integration.cpp platform/linux/linux_gtk_integration.cpp
platform/linux/linux_gtk_integration.h platform/linux/linux_gtk_integration.h
@@ -839,6 +840,7 @@ PRIVATE
platform/linux/linux_mpris_support.h platform/linux/linux_mpris_support.h
platform/linux/linux_notification_service_watcher.cpp platform/linux/linux_notification_service_watcher.cpp
platform/linux/linux_notification_service_watcher.h platform/linux/linux_notification_service_watcher.h
platform/linux/linux_wayland_integration_dummy.cpp
platform/linux/linux_wayland_integration.cpp platform/linux/linux_wayland_integration.cpp
platform/linux/linux_wayland_integration.h platform/linux/linux_wayland_integration.h
platform/linux/linux_xdp_file_dialog.cpp platform/linux/linux_xdp_file_dialog.cpp
@@ -851,6 +853,7 @@ PRIVATE
platform/linux/launcher_linux.h platform/linux/launcher_linux.h
platform/linux/main_window_linux.cpp platform/linux/main_window_linux.cpp
platform/linux/main_window_linux.h platform/linux/main_window_linux.h
platform/linux/notifications_manager_linux_dummy.cpp
platform/linux/notifications_manager_linux.cpp platform/linux/notifications_manager_linux.cpp
platform/linux/notifications_manager_linux.h platform/linux/notifications_manager_linux.h
platform/linux/specific_linux.cpp platform/linux/specific_linux.cpp
@@ -860,6 +863,7 @@ PRIVATE
platform/mac/file_utilities_mac.h platform/mac/file_utilities_mac.h
platform/mac/launcher_mac.mm platform/mac/launcher_mac.mm
platform/mac/launcher_mac.h platform/mac/launcher_mac.h
platform/mac/mac_iconv_helper.c
platform/mac/main_window_mac.mm platform/mac/main_window_mac.mm
platform/mac/main_window_mac.h platform/mac/main_window_mac.h
platform/mac/notifications_manager_mac.mm platform/mac/notifications_manager_mac.mm
@@ -1135,16 +1139,20 @@ if (DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
platform/linux/linux_xdp_open_with_dialog.h platform/linux/linux_xdp_open_with_dialog.h
platform/linux/notifications_manager_linux.cpp platform/linux/notifications_manager_linux.cpp
) )
else()
nice_target_sources(Telegram ${src_loc} remove_target_sources(Telegram ${src_loc}
PRIVATE
platform/linux/notifications_manager_linux_dummy.cpp platform/linux/notifications_manager_linux_dummy.cpp
) )
endif() endif()
if (DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION) if (DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
remove_target_sources(Telegram ${src_loc} platform/linux/linux_wayland_integration.cpp) remove_target_sources(Telegram ${src_loc}
nice_target_sources(Telegram ${src_loc} PRIVATE platform/linux/linux_wayland_integration_dummy.cpp) platform/linux/linux_wayland_integration.cpp
)
else()
remove_target_sources(Telegram ${src_loc}
platform/linux/linux_wayland_integration_dummy.cpp
)
endif() endif()
if (DESKTOP_APP_DISABLE_GTK_INTEGRATION) if (DESKTOP_APP_DISABLE_GTK_INTEGRATION)
@@ -1158,15 +1166,16 @@ if (DESKTOP_APP_DISABLE_GTK_INTEGRATION)
platform/linux/linux_gtk_open_with_dialog.cpp platform/linux/linux_gtk_open_with_dialog.cpp
platform/linux/linux_gtk_open_with_dialog.h platform/linux/linux_gtk_open_with_dialog.h
) )
else()
nice_target_sources(Telegram ${src_loc} remove_target_sources(Telegram ${src_loc}
PRIVATE
platform/linux/linux_gtk_integration_dummy.cpp platform/linux/linux_gtk_integration_dummy.cpp
) )
endif() endif()
if (NOT DESKTOP_APP_USE_PACKAGED) if (DESKTOP_APP_USE_PACKAGED)
nice_target_sources(Telegram ${src_loc} PRIVATE platform/mac/mac_iconv_helper.c) remove_target_sources(Telegram ${src_loc}
platform/mac/mac_iconv_helper.c
)
endif() endif()
nice_target_sources(Telegram ${res_loc} nice_target_sources(Telegram ${res_loc}

6
Telegram/SourceFiles/platform/linux/notifications_manager_linux_dummy.cpp
View File

@@ -13,15 +13,15 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
namespace Platform { namespace Platform {
namespace Notifications { namespace Notifications {
bool SkipAudio() { bool SkipAudioForCustom() {
return false; return false;
} }
bool SkipToast() { bool SkipToastForCustom() {
return false; return false;
} }
bool SkipFlashBounce() { bool SkipFlashBounceForCustom() {
return false; return false;
} }