mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

fix: replace deprecated libnotify API calls (#43982)

Browse source 
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:
trop[bot] 2024-09-26 17:08:12 -05:00 • committed by GitHub
commit 514fc26eb2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
BUILD.gn
View file

@ -75,7 +75,6 @@ if (is_linux) {
"notify_notification_set_image_from_pixbuf", "notify_notification_set_image_from_pixbuf",
"notify_notification_set_timeout", "notify_notification_set_timeout",
"notify_notification_set_urgency", "notify_notification_set_urgency",
"notify_notification_set_hint_string",
"notify_notification_set_hint", "notify_notification_set_hint",
"notify_notification_show", "notify_notification_show",
"notify_notification_close", "notify_notification_close",

13
shell/browser/notifications/linux/libnotify_notification.cc
View file

@ -131,19 +131,20 @@ void LibnotifyNotification::Show(const NotificationOptions& options) {
// Always try to append notifications. // Always try to append notifications.
// Unique tags can be used to prevent this. // Unique tags can be used to prevent this.
if (HasCapability("append")) { if (HasCapability("append")) {
libnotify_loader_.notify_notification_set_hint_string(notification_, libnotify_loader_.notify_notification_set_hint(
"append", "true"); notification_, "append", g_variant_new_string("true"));
} else if (HasCapability("x-canonical-append")) { } else if (HasCapability("x-canonical-append")) {
libnotify_loader_.notify_notification_set_hint_string( libnotify_loader_.notify_notification_set_hint(
notification_, "x-canonical-append", "true"); notification_, "x-canonical-append", g_variant_new_string("true"));
} }
// Send the desktop name to identify the application // Send the desktop name to identify the application
// The desktop-entry is the part before the .desktop // The desktop-entry is the part before the .desktop
std::string desktop_id = platform_util::GetXdgAppId(); std::string desktop_id = platform_util::GetXdgAppId();
if (!desktop_id.empty()) { if (!desktop_id.empty()) {
libnotify_loader_.notify_notification_set_hint_string( libnotify_loader_.notify_notification_set_hint(
notification_, "desktop-entry", desktop_id.c_str()); notification_, "desktop-entry",
g_variant_new_string(desktop_id.c_str()));
} }
libnotify_loader_.notify_notification_set_hint( libnotify_loader_.notify_notification_set_hint(