mirrors/ly
1
0
Fork 0
mirror of https://github.com/fairyglade/ly.git synced 2025-12-20 19:24:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up redundant authentication & session code

Browse Source 
Signed-off-by: AnErrupTion <anerruption@disroot.org>
This commit is contained in:
AnErrupTion
2025-09-25 08:32:30 +02:00
parent d8b0ae34f3
commit 145ad5142c
2 changed files with 14 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main.zig
View File

@@ -990,6 +990,7 @@ fn addOtherEnvironment(session: *Session, lang: Lang, display_server: DisplaySer
.cmd = exec orelse "",
.specifier = lang.other,
.display_server = display_server,
.is_terminal = display_server == .shell,
});
}
@@ -1010,24 +1011,23 @@ fn crawl(session: *Session, lang: Lang, path: []const u8, display_server: Displa
});
errdefer entry_ini.deinit();
var maybe_xdg_session_desktop: ?[]const u8 = null;
const maybe_desktop_names = entry_ini.data.@"Desktop Entry".DesktopNames;
if (maybe_desktop_names) |desktop_names| {
maybe_xdg_session_desktop = std.mem.sliceTo(desktop_names, ';');
} else if (display_server != .custom) {
// If DesktopNames is empty, and this isn't a custom session entry,
// we'll take the name of the session file
maybe_xdg_session_desktop = std.fs.path.stem(item.name);
}
// Prepare the XDG_CURRENT_DESKTOP environment variable here
const entry = entry_ini.data.@"Desktop Entry";
var maybe_xdg_session_desktop: ?[]const u8 = null;
var maybe_xdg_desktop_names: ?[]const u8 = null;
// Prepare the XDG_SESSION_DESKTOP and XDG_CURRENT_DESKTOP environment
// variables here
if (entry.DesktopNames) |desktop_names| {
maybe_xdg_session_desktop = std.mem.sliceTo(desktop_names, ';');
for (desktop_names) |*c| {
if (c.* == ';') c.* = ':';
}
maybe_xdg_desktop_names = desktop_names;
} else if (display_server != .custom) {
// If DesktopNames is empty, and this isn't a custom session entry,
// we'll take the name of the session file
maybe_xdg_session_desktop = std.fs.path.stem(item.name);
}
try session.addEnvironment(.{