hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "skip env tries for lightdm login screen"

Browse Source 
This reverts commit d28d3baf056f09509fcc0813295ac6024e762806.
This commit is contained in:
Sahil Yeole 2023-08-09 17:35:02 +05:30
parent 6b17644d98
commit 0d2c46a893
1 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/platform/linux.rs
View File

@ -919,19 +919,13 @@ mod desktop {
}
fn get_display(&mut self) {
// skip env tries for lightdm login screen
if self.username != "lightdm"{
let display_envs = vec![GNOME_SESSION_BINARY, XFCE4_PANEL, SDDM_GREETER, PLASMA_X11];
for display_env in display_envs {
self.display = get_env_tries("DISPLAY", &self.uid, display_env, 10);
if !self.display.is_empty() {
break;
}
let display_envs = vec![GNOME_SESSION_BINARY, XFCE4_PANEL, SDDM_GREETER, PLASMA_X11];
for diplay_env in display_envs {
self.display = get_env_tries("DISPLAY", &self.uid, diplay_env, 20);
if !self.display.is_empty() {
break;
}
}
else {
self.display = String::new();
}
if self.display.is_empty() {
self.display = Self::get_display_by_user(&self.username);
@ -988,19 +982,13 @@ mod desktop {
fn get_xauth(&mut self) {
// try by direct access to window manager process by name
// skip env tries for lightdm login screen
if self.username != "lightdm"{
let display_envs = vec![GNOME_SESSION_BINARY, XFCE4_PANEL, SDDM_GREETER, PLASMA_X11];
for display_env in display_envs {
self.xauth = get_env_tries("XAUTHORITY", &self.uid, display_env, 20);
if !self.xauth.is_empty() {
break;
}
let display_envs = vec![GNOME_SESSION_BINARY, XFCE4_PANEL, SDDM_GREETER, PLASMA_X11];
for diplay_env in display_envs {
self.xauth = get_env_tries("XAUTHORITY", &self.uid, diplay_env, 20);
if !self.xauth.is_empty() {
break;
}
}
else {
self.xauth = String::new();
}
// get from Xorg process, parameter and environment
if self.xauth.is_empty() {