Skip to content

Do not try to fallback to x11 session when it is unavailable #824

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danirabbit merged 2 commits into from
Sep 14, 2025
+23 −17
Merged

Do not try to fallback to x11 session when it is unavailable #824

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c3d8a7e
Do not try to fallback to x11 session when it is unavailable
bobby285271 Sep 14, 2025
acd6ad5
Avoid connecting if no x11 session
bobby285271 Sep 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 23 additions & 17 deletions src/Application.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,12 @@ public class Greeter.Application : Gtk.Application {

var select_session_action = new GLib.SimpleAction.stateful ("select-session", GLib.VariantType.STRING, selected_session);
var vardict = new GLib.VariantDict ();
var has_pantheon_x11_session = false;
sessions.foreach ((session) => {
vardict.insert_value (session.name, new GLib.Variant.string (session.key));
if (session.key == "pantheon") {
has_pantheon_x11_session = true;
}
});
select_session_action.set_state_hint (vardict.end ());

Expand All @@ -103,28 +107,30 @@ public class Greeter.Application : Gtk.Application {

add_action (select_session_action);

var a11y_settings = new GLib.Settings ("org.gnome.desktop.a11y.applications");
a11y_settings.changed.connect ((key) => {
if (key != "screen-keyboard-enabled" && key != "screen-reader-enabled") {
return;
}
if (has_pantheon_x11_session) {
var a11y_settings = new GLib.Settings ("org.gnome.desktop.a11y.applications");
a11y_settings.changed.connect ((key) => {
if (key != "screen-keyboard-enabled" && key != "screen-reader-enabled") {
return;
}

if (!a11y_settings.get_boolean (key)) {
return;
}
if (!a11y_settings.get_boolean (key)) {
return;
}

if (select_session_action.get_state ().get_string () != "pantheon-wayland") {
return;
}
if (select_session_action.get_state ().get_string () != "pantheon-wayland") {
return;
}

select_session_action.set_state (new Variant.string ("pantheon"));
select_session_action.set_state (new Variant.string ("pantheon"));

var notification = new Notification (_("Classic session automatically selected"));
notification.set_body (_("Accessibility features may be unavailable in the Secure session"));
notification.set_icon (new ThemedIcon ("preferences-desktop-accessibility"));
var notification = new Notification (_("Classic session automatically selected"));
notification.set_body (_("Accessibility features may be unavailable in the Secure session"));
notification.set_icon (new ThemedIcon ("preferences-desktop-accessibility"));

send_notification ("session-type", notification);
});
send_notification ("session-type", notification);
});
}
}

public override void activate () {
Expand Down