Skip to content

Blacklist icon themes only #13439

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

Open
City-busz wants to merge 1 commit into
base: master
Choose a base branch
from
+2 −6
Open

Blacklist icon themes only #13439

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
8 changes: 2 additions & 6 deletions files/usr/share/cinnamon/cinnamon-settings/modules/cs_themes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
os.path.join(GLib.get_user_data_dir(), "themes")
] + [os.path.join(datadir, "themes") for datadir in GLib.get_system_data_dirs()]

THEMES_BLACKLIST = [
ICON_THEMES_BLACKLIST = [
"gnome", # not meant to be used as a theme. Provides icons to inheriting themes.
"hicolor", # same
"adwaita", "adwaita-dark", "adwaitalegacy", # incomplete outside of GNOME, doesn't support Cinnamon.
Expand Down Expand Up @@ -114,8 +114,6 @@ def refresh_themes(self):

# Gtk themes -- Only shows themes that have a gtk-3.* variation
for (name, path) in walk_directories(THEME_FOLDERS, self.filter_func_gtk_dir, return_directories=True):
if name.lower() in THEMES_BLACKLIST:
continue
for theme in self.gtk_themes:
if name == theme[0]:
if path == THEME_FOLDERS[0]:
Expand All @@ -142,7 +140,7 @@ def refresh_themes(self):
walked = walk_directories(ICON_FOLDERS, lambda d: os.path.isdir(d), return_directories=True)
valid = []
for directory in walked:
if directory[0].lower() in THEMES_BLACKLIST:
if directory[0].lower() in ICON_THEMES_BLACKLIST:
continue
path = os.path.join(directory[1], directory[0], "index.theme")
if os.path.exists(path):
Expand All @@ -162,8 +160,6 @@ def refresh_themes(self):

# Cursor themes
for (name, path) in walk_directories(ICON_FOLDERS, lambda d: os.path.isdir(d) and os.path.exists(os.path.join(d, "cursors")), return_directories=True):
if name.lower() in THEMES_BLACKLIST:
continue
for theme in self.cursor_themes:
if name == theme[0]:
if path == ICON_FOLDERS[0]:
Expand Down
Loading