зеркало из https://github.com/electron/electron.git
fix: replace deprecated libnotify API calls (#43984)
notify_notification_set_hint_string() is deprecated, so let's use
notify_notification_set_hint() instead.
Xref: 2fe1748295
Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
This commit is contained in:
Родитель
ebf189b304
Коммит
21a8a97c28
1
BUILD.gn
1
BUILD.gn
|
@ -74,7 +74,6 @@ if (is_linux) {
|
|||
"notify_notification_set_image_from_pixbuf",
|
||||
"notify_notification_set_timeout",
|
||||
"notify_notification_set_urgency",
|
||||
"notify_notification_set_hint_string",
|
||||
"notify_notification_set_hint",
|
||||
"notify_notification_show",
|
||||
"notify_notification_close",
|
||||
|
|
|
@ -131,19 +131,20 @@ void LibnotifyNotification::Show(const NotificationOptions& options) {
|
|||
// Always try to append notifications.
|
||||
// Unique tags can be used to prevent this.
|
||||
if (HasCapability("append")) {
|
||||
libnotify_loader_.notify_notification_set_hint_string(notification_,
|
||||
"append", "true");
|
||||
libnotify_loader_.notify_notification_set_hint(
|
||||
notification_, "append", g_variant_new_string("true"));
|
||||
} else if (HasCapability("x-canonical-append")) {
|
||||
libnotify_loader_.notify_notification_set_hint_string(
|
||||
notification_, "x-canonical-append", "true");
|
||||
libnotify_loader_.notify_notification_set_hint(
|
||||
notification_, "x-canonical-append", g_variant_new_string("true"));
|
||||
}
|
||||
|
||||
// Send the desktop name to identify the application
|
||||
// The desktop-entry is the part before the .desktop
|
||||
std::string desktop_id = platform_util::GetXdgAppId();
|
||||
if (!desktop_id.empty()) {
|
||||
libnotify_loader_.notify_notification_set_hint_string(
|
||||
notification_, "desktop-entry", desktop_id.c_str());
|
||||
libnotify_loader_.notify_notification_set_hint(
|
||||
notification_, "desktop-entry",
|
||||
g_variant_new_string(desktop_id.c_str()));
|
||||
}
|
||||
|
||||
libnotify_loader_.notify_notification_set_hint(
|
||||
|
|
Загрузка…
Ссылка в новой задаче