lainns-mirror/noctalia-shell
1
0
Fork 0
mirror of https://github.com/noctalia-dev/noctalia-shell.git synced 2026-05-11 17:08:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(notifications): release daemon bus name on disable

Browse Source
This commit is contained in:
Lemmy
2026-05-03 18:08:36 -04:00
parent 9f48d4da21
commit 05ec24ae75
3 changed files with 91 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/application.cpp
+2 -2
View File
@@ -161,8 +161,8 @@ Application::~Application() {
void Application::syncNotificationDaemon() {
if (m_bus == nullptr) {
m_notificationDbus.reset();
m_notificationPollSource.setDbusService(nullptr);
m_notificationDbus.reset();
return;
}
@@ -170,8 +170,8 @@ void Application::syncNotificationDaemon() {
if (m_notificationDbus != nullptr) {
kLog.info("notification daemon disabled by config");
}
m_notificationDbus.reset();
m_notificationPollSource.setDbusService(nullptr);
m_notificationDbus.reset();
return;
}
src/dbus/notification/notification_service.cpp
+86 -35
View File
@@ -17,51 +17,102 @@ namespace {
static const sdbus::ServiceName k_bus_name{"org.freedesktop.Notifications"};
static const sdbus::ObjectPath k_object_path{"/org/freedesktop/Notifications"};
static constexpr auto k_interface = "org.freedesktop.Notifications";
static constexpr auto k_already_owner_error = "System.Error.EALREADY";
NotificationService::NotificationService(SessionBus& bus, NotificationManager& manager) : m_manager(manager) {
m_manager.setActionInvokeCallback(
[this](uint32_t id, const std::string& actionKey) { emitActionInvoked(id, actionKey); });
namespace {
void requestNotificationBusName(sdbus::IConnection& connection) {
try {
connection.requestName(k_bus_name);
} catch (const sdbus::Error& e) {
if (e.getName() == k_already_owner_error) {
kLog.debug("notification daemon bus name already owned by this connection; reusing");
return;
}
throw;
}
}
} // namespace
bus.connection().requestName(k_bus_name);
m_object = sdbus::createObject(bus.connection(), k_object_path);
NotificationService::NotificationService(SessionBus& bus, NotificationManager& manager)
: m_bus(bus), m_manager(manager) {
try {
m_object = sdbus::createObject(m_bus.connection(), k_object_path);
m_object
->addVTable(
sdbus::registerMethod("Notify")
.withInputParamNames("app_name", "replaces_id", "app_icon", "summary", "body", "actions", "hints",
"expire_timeout")
.withOutputParamNames("id")
.implementedAs([this](const std::string& app_name, uint32_t replaces_id, const std::string& app_icon,
const std::string& summary, const std::string& body,
const std::vector<std::string>& actions,
const std::map<std::string, sdbus::Variant>& hints, int32_t expire_timeout) {
return onNotify(app_name, replaces_id, app_icon, summary, body, actions, hints, expire_timeout);
}),
m_object
->addVTable(
sdbus::registerMethod("Notify")
.withInputParamNames("app_name", "replaces_id", "app_icon", "summary", "body", "actions", "hints",
"expire_timeout")
.withOutputParamNames("id")
.implementedAs([this](const std::string& app_name, uint32_t replaces_id, const std::string& app_icon,
const std::string& summary, const std::string& body,
const std::vector<std::string>& actions,
const std::map<std::string, sdbus::Variant>& hints, int32_t expire_timeout) {
return onNotify(app_name, replaces_id, app_icon, summary, body, actions, hints, expire_timeout);
}),
sdbus::registerMethod("GetCapabilities").withOutputParamNames("capabilities").implementedAs([this]() {
return onGetCapabilities();
}),
sdbus::registerMethod("GetCapabilities").withOutputParamNames("capabilities").implementedAs([this]() {
return onGetCapabilities();
}),
sdbus::registerMethod("GetNotifications").withOutputParamNames("notifications").implementedAs([this]() {
return onGetNotifications();
}),
sdbus::registerMethod("GetNotifications").withOutputParamNames("notifications").implementedAs([this]() {
return onGetNotifications();
}),
sdbus::registerMethod("GetServerInformation")
.withOutputParamNames("name", "vendor", "version", "spec_version")
.implementedAs([this]() { return onGetServerInformation(); }),
sdbus::registerMethod("GetServerInformation")
.withOutputParamNames("name", "vendor", "version", "spec_version")
.implementedAs([this]() { return onGetServerInformation(); }),
sdbus::registerMethod("CloseNotification").withInputParamNames("id").implementedAs([this](uint32_t id) {
onCloseNotification(id);
}),
sdbus::registerMethod("CloseNotification").withInputParamNames("id").implementedAs([this](uint32_t id) {
onCloseNotification(id);
}),
sdbus::registerMethod("InvokeAction")
.withInputParamNames("id", "action_key")
.implementedAs([this](uint32_t id, const std::string& actionKey) { onInvokeAction(id, actionKey); }),
sdbus::registerMethod("InvokeAction")
.withInputParamNames("id", "action_key")
.implementedAs([this](uint32_t id, const std::string& actionKey) { onInvokeAction(id, actionKey); }),
sdbus::registerSignal("NotificationClosed").withParameters<uint32_t, uint32_t>("id", "reason"),
sdbus::registerSignal("NotificationClosed").withParameters<uint32_t, uint32_t>("id", "reason"),
sdbus::registerSignal("ActionInvoked").withParameters<uint32_t, std::string>("id", "action_key"))
.forInterface(k_interface);
sdbus::registerSignal("ActionInvoked").withParameters<uint32_t, std::string>("id", "action_key"))
.forInterface(k_interface);
requestNotificationBusName(m_bus.connection());
m_nameAcquired = true;
m_manager.setActionInvokeCallback(
[this](uint32_t id, const std::string& actionKey) { emitActionInvoked(id, actionKey); });
} catch (...) {
m_manager.setActionInvokeCallback(nullptr);
if (m_nameAcquired) {
try {
m_bus.connection().releaseName(k_bus_name);
} catch (const sdbus::Error& e) {
kLog.debug("notification daemon release after init failure failed: {}", e.what());
}
m_nameAcquired = false;
}
throw;
}
}
NotificationService::~NotificationService() {
m_manager.setActionInvokeCallback(nullptr);
if (m_nameAcquired) {
try {
m_bus.connection().releaseName(k_bus_name);
} catch (const sdbus::Error& e) {
kLog.debug("notification daemon bus name release failed: {}", e.what());
}
m_nameAcquired = false;
}
if (m_object != nullptr) {
try {
m_object->unregister();
} catch (const sdbus::Error& e) {
kLog.debug("notification daemon object unregister failed: {}", e.what());
}
}
}
void NotificationService::processExpired() {
src/dbus/notification/notification_service.h
+3
View File
@@ -14,13 +14,16 @@ class SessionBus;
class NotificationService {
public:
NotificationService(SessionBus& bus, NotificationManager& manager);
~NotificationService();
// Close expired notifications and emit D-Bus signals for them.
void processExpired();
private:
SessionBus& m_bus;
NotificationManager& m_manager;
std::unique_ptr<sdbus::IObject> m_object;
bool m_nameAcquired = false;
// D-Bus method handlers
uint32_t onNotify(const std::string& app_name, uint32_t replaces_id, const std::string& app_icon,