fanhuadesenlinnn/tdesktop
1
0
Fork 0
mirror of https://hubproxy.babadafafafafa.cn/https://github.com/telegramdesktop/tdesktop synced 2026-09-20 16:13:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Move icon name getter to cross-platform header"

Browse Source 
This reverts commit d9318c9935.
This commit is contained in:
Ilya Fedin
2025-03-11 05:24:55 +00:00
committed by John Preston
parent 57f10040e1
commit b14c2878b3
9 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "base/options.h"
#include "base/platform/base_platform_info.h"
#include "base/platform/linux/base_linux_dbus_utilities.h"
#include "platform/platform_specific.h"
#include "core/application.h"
#include "core/sandbox.h"
#include "core/core_settings.h"
@@ -27,6 +28,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include <QtCore/QVersionNumber>
#include <QtGui/QGuiApplication>
#include <ksandbox.h>
#include <xdgnotifications/xdgnotifications.hpp>
#include <dlfcn.h>
@@ -547,7 +550,7 @@ void Manager::Private::showNotification(
notification.set_body(info.message.toStdString());
notification.set_icon(
Gio::ThemedIcon::new_(base::IconName().toStdString()));
Gio::ThemedIcon::new_(ApplicationIconName().toStdString()));
// for chat messages, according to
// https://docs.gtk.org/gio/enum.NotificationPriority.html
@@ -761,7 +764,7 @@ void Manager::Private::showNotification(
AppName.data(),
0,
(!hasImage
? base::IconName().toStdString()
? ApplicationIconName().toStdString()
: std::string()).c_str(),
(hasBodyMarkup || info.subtitle.isEmpty()
? info.title.toStdString()