Skip to content

Assume on Pantheon #122

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
ryonakano merged 1 commit into from
Jul 9, 2025
Merged

Assume on Pantheon #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 10 additions & 12 deletions src/Application.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,18 +65,16 @@ public class Atlas.Application : Adw.Application {
}

protected override void startup () {
if (Util.is_on_pantheon ()) {
/*
* Granite.init() calls Gdk.DisplayManager.get() internally without
* initializing Gtk, which is illegal and causes an intentional
* crash since Gtk 4.17. So, initialize Gtk explicitly here as a
* workaround.
* TODO: Remove this when https://github.com/elementary/granite/pull/893 is released
*/
Gtk.init ();
// Apply elementary stylesheet instead of default Adwaita stylesheet
Granite.init ();
}
/*
* Granite.init() calls Gdk.DisplayManager.get() internally without
* initializing Gtk, which is illegal and causes an intentional
* crash since Gtk 4.17. So, initialize Gtk explicitly here as a
* workaround.
* TODO: Remove this when https://github.com/elementary/granite/pull/893 is released
*/
Gtk.init ();
// Apply elementary stylesheet instead of default Adwaita stylesheet
Granite.init ();

base.startup ();

Expand Down
4 changes: 0 additions & 4 deletions src/Util.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@
*/

namespace Util {
public static bool is_on_pantheon () {
return Environment.get_variable ("XDG_CURRENT_DESKTOP") == "Pantheon";
}

public static Adw.ColorScheme to_adw_scheme (string str_scheme) {
switch (str_scheme) {
case Define.ColorScheme.DEFAULT:
Expand Down