diff --git a/src/panel/settings/themes.vala b/src/panel/settings/themes.vala index fd255fa80..02412314a 100644 --- a/src/panel/settings/themes.vala +++ b/src/panel/settings/themes.vala @@ -49,14 +49,35 @@ class ThemeInfo : GLib.Object { public class ThemeScanner : GLib.Object { string[]? xdg_paths = null; + + string[] gtk_theme_blacklist = { + "Adwaita", + "Breeze", + "Clearlooks", + "Crux", + "Emacs", + "Industrial", + "Mist", + "Raleigh", + "Redmond", + "ThinIce" + }; + + string[] icon_theme_blacklist = { + "breeze", + "solus-sc" + }; + string[] normal_suffixes = { "themes", "icons" }; + string[] legacy_suffixes = { ".themes", ".icons" }; + string[]? gtk_theme_paths = null; private HashTable gtk_themes = null; @@ -169,6 +190,14 @@ public class ThemeScanner : GLib.Object */ private async bool maybe_add_gtk_theme(string path, string theme_name) { + for (int index = 0; index < gtk_theme_blacklist.length; index++) { + string blacklisted_item = gtk_theme_blacklist[index]; + + if ((blacklisted_item == theme_name) || (theme_name.index_of(blacklisted_item) != -1)) { + return false; + } + } + unowned ThemeInfo? info = gtk_themes.lookup(theme_name); if (info == null) { ThemeInfo? ninfo = new ThemeInfo(ThemeType.GTK_THEME); @@ -286,6 +315,14 @@ public class ThemeScanner : GLib.Object */ private async bool maybe_add_icons(string path, string theme_name) { + for (int index = 0; index < icon_theme_blacklist.length; index++) { + string blacklisted_item = icon_theme_blacklist[index]; + + if ((blacklisted_item == theme_name) || (theme_name.index_of(blacklisted_item) != -1)) { + return false; + } + } + unowned ThemeInfo? info = icon_themes.lookup(theme_name); if (info == null) { ThemeInfo? ninfo = new ThemeInfo(ThemeType.ICON_THEME); diff --git a/src/raven/sound.vala b/src/raven/sound.vala index 1f5218778..c049fefee 100644 --- a/src/raven/sound.vala +++ b/src/raven/sound.vala @@ -520,7 +520,7 @@ namespace Budgie { if (allow_higher_than_max) { // If overdrive is enabled and thus should show mark var vol_max = mixer.get_vol_max_norm(); - volume_slider.add_mark(vol_max, Gtk.PositionType.BOTTOM, "100%"); + volume_slider.add_mark(vol_max, Gtk.PositionType.BOTTOM, ""); } else { // If we should not show markets volume_slider.clear_marks(); }