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: adapt to upstream asynchronous polkit agent api

Browse Source
This commit is contained in:
loner
2026-05-06 10:46:23 +08:00
parent c99be6a1b9
commit 5702893aaa
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/dbus/polkit/polkit_agent.cpp
+17 -3
View File
@@ -312,14 +312,16 @@ struct PolkitAgent::Impl {
void onSessionReady(GObject* /*source*/, GAsyncResult* result) {
starting = false;
GError* error = nullptr;
PolkitSubject* subject = polkit_unix_session_new_for_process_finish(result, &error);
PolkitSubject* subject = nullptr;
PolkitSubject* pidSubject = polkit_unix_session_new_for_process_finish(result, &error);
// If we were cancelled (destruction), bail out without touching members
// beyond the cancellable cleanup that the destructor already handled.
if (error != nullptr && g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
g_clear_error(&error);
if (subject != nullptr) {
g_object_unref(subject);
if (pidSubject != nullptr) {
g_object_unref(pidSubject);
}
return;
}
@@ -329,6 +331,18 @@ struct PolkitAgent::Impl {
registerCancellable = nullptr;
}
// Polkit's underlying authorization logic is session-based rather than tied to isolated processes
const char* sessionId = std::getenv("XDG_SESSION_ID");
if (sessionId != nullptr && sessionId[0] != '\0') {
subject = polkit_unix_session_new(sessionId);
if (pidSubject != nullptr) {
g_object_unref(pidSubject);
}
} else {
// Retained for non-systemd environment support
subject = pidSubject;
}
if (subject == nullptr || error != nullptr) {
std::string message = error != nullptr ? error->message : "failed to create polkit session subject";
g_clear_error(&error);