leyoda/cosmic-session
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Do not start xdg-desktop-portal-cosmic; so socket activation can

Browse source 
https://github.com/pop-os/xdg-desktop-portal-cosmic/pull/176
This commit is contained in:
Ian Douglas Scott 2025-09-30 16:58:37 -07:00 • committed by Ian Douglas Scott
parent 379ce30715
commit d8ec361e3c
2 changed files with 1 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Justfile
View file

@ -9,7 +9,6 @@ target := if debug == '1' { 'debug' } else { 'release' }
vendor_args := if vendor == '1' { '--frozen --offline' } else { '' }
debug_args := if debug == '1' { '' } else { '--release' }
cargo_args := vendor_args + ' ' + debug_args
xdp_cosmic := '/usr/libexec/xdg-desktop-portal-cosmic'
orca := '/usr/bin/orca'
cosmic_dconf_profile := prefix + '/share/dconf/profile/cosmic'
@ -21,7 +20,7 @@ applicationdir := rootdir / prefix + '/share/applications'
all: _extract_vendor build
build:
XDP_COSMIC={{xdp_cosmic}} ORCA={{orca}} cargo build {{cargo_args}}
ORCA={{orca}} cargo build {{cargo_args}}
# Installs files into the system
install:

24
src/main.rs
View file

@ -46,7 +46,6 @@ use tracing::{Instrument, metadata::LevelFilter};
use tracing_subscriber::{EnvFilter, fmt, prelude::*};
use crate::notifications::notifications_process;
const XDP_COSMIC: Option<&'static str> = option_env!("XDP_COSMIC");
#[cfg(feature = "autostart")]
const AUTOSTART_DIR: &'static str = "autostart";
#[cfg(feature = "autostart")]
@ -427,29 +426,6 @@ async fn start(
)
.await;
if env::var("XDG_CURRENT_DESKTOP").as_deref() == Ok("COSMIC") {
let span = info_span!(parent: None, "xdg-desktop-portal-cosmic");
let mut sockets = Vec::with_capacity(1);
let extra_env = Vec::with_capacity(1);
let portal_extras =
if let Ok((mut env, fd)) = create_privileged_socket(&mut sockets, &extra_env) {
let mut env = env.remove(0);
env.0 = "PORTAL_WAYLAND_SOCKET".to_string();
vec![(fd, env, sockets.remove(0))]
} else {
Vec::new()
};
start_component(
XDP_COSMIC.unwrap_or("/usr/libexec/xdg-desktop-portal-cosmic"),
span,
&process_manager,
&env_vars,
&socket_tx,
portal_extras,
)
.await;
}
#[cfg(feature = "autostart")]
if !*is_systemd_used() {
info!("looking for autostart folders");