diff options
Diffstat (limited to 'pkgs/desktops/gnome-3/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch')
| -rw-r--r-- | pkgs/desktops/gnome-3/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch | 52 |
1 files changed, 13 insertions, 39 deletions
diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch index d236730282a9..23be404ea406 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch +++ b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch @@ -1,25 +1,24 @@ -From ac9e8e835888da1faa57f07c54fa4e73783621e2 Mon Sep 17 00:00:00 2001 +From f7f7fe6bf36ca08c66192077bf964036eb02ffb5 Mon Sep 17 00:00:00 2001 From: Jascha Geerds <jascha@jgeerds.name> -Date: Sun, 25 Jun 2017 11:32:30 +0100 +Date: Tue, 19 Sep 2017 03:08:07 +0200 Subject: [PATCH 1/3] Search for themes and icons in system data dirs --- - gtweak/tweaks/tweak_group_interface.py | 17 ++++------------- - gtweak/tweaks/tweak_group_keymouse.py | 7 ++----- - gtweak/utils.py | 17 +++++++++++++++++ - 3 files changed, 23 insertions(+), 18 deletions(-) + gtweak/tweaks/tweak_group_appearance.py | 17 ++++------------- + gtweak/utils.py | 17 +++++++++++++++++ + 2 files changed, 21 insertions(+), 13 deletions(-) -diff --git a/gtweak/tweaks/tweak_group_interface.py b/gtweak/tweaks/tweak_group_interface.py -index 97751ed..db89b85 100644 ---- a/gtweak/tweaks/tweak_group_interface.py -+++ b/gtweak/tweaks/tweak_group_interface.py +diff --git a/gtweak/tweaks/tweak_group_appearance.py b/gtweak/tweaks/tweak_group_appearance.py +index ccadefc..0d12194 100644 +--- a/gtweak/tweaks/tweak_group_appearance.py ++++ b/gtweak/tweaks/tweak_group_appearance.py @@ -26,7 +26,7 @@ from gi.repository import Gtk from gi.repository import GLib import gtweak -from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file +from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file, get_resource_dirs - from gtweak.tweakmodel import Tweak, TWEAK_GROUP_APPEARANCE + from gtweak.tweakmodel import Tweak from gtweak.gshellwrapper import GnomeShellFactory from gtweak.gsettings import GSettingsSetting @@ -50,10 +50,7 @@ class GtkThemeSwitcher(GSettingsComboTweak): @@ -58,33 +57,8 @@ index 97751ed..db89b85 100644 os.path.isdir(d) and \ os.path.exists(os.path.join(d, "cursors"))) return valid -diff --git a/gtweak/tweaks/tweak_group_keymouse.py b/gtweak/tweaks/tweak_group_keymouse.py -index 69c4b7e..b06900c 100644 ---- a/gtweak/tweaks/tweak_group_keymouse.py -+++ b/gtweak/tweaks/tweak_group_keymouse.py -@@ -21,7 +21,7 @@ from gi.repository import GLib - - import gtweak - from gtweak.gshellwrapper import GnomeShellFactory --from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default -+from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default, get_resource_dirs - from gtweak.widgets import ListBoxTweakGroup, GSettingsComboTweak, GSettingsSwitchTweak, GetterSetterSwitchTweak, Title, GSettingsComboEnumTweak - - _shell = GnomeShellFactory().get_shell() -@@ -41,10 +41,7 @@ class KeyThemeSwitcher(GSettingsComboTweak): - **options) - - def _get_valid_key_themes(self): -- dirs = ( os.path.join(gtweak.DATA_DIR, "themes"), -- os.path.join(GLib.get_user_data_dir(), "themes"), -- os.path.join(os.path.expanduser("~"), ".themes")) -- valid = walk_directories(dirs, lambda d: -+ valid = walk_directories(get_resource_dirs("themes"), lambda d: - os.path.isfile(os.path.join(d, "gtk-3.0", "gtk-keys.css")) and \ - os.path.isfile(os.path.join(d, "gtk-2.0-key", "gtkrc"))) - return valid diff --git a/gtweak/utils.py b/gtweak/utils.py -index 39f8833..b0993b6 100644 +index de6c345..6c60b88 100644 --- a/gtweak/utils.py +++ b/gtweak/utils.py @@ -21,6 +21,7 @@ import tempfile @@ -95,7 +69,7 @@ index 39f8833..b0993b6 100644 import gtweak from gtweak.gsettings import GSettingsSetting -@@ -116,6 +117,22 @@ def execute_subprocess(cmd_then_args, block=True): +@@ -117,6 +118,22 @@ def execute_subprocess(cmd_then_args, block=True): stdout, stderr = p.communicate() return stdout, stderr, p.returncode @@ -119,5 +93,5 @@ index 39f8833..b0993b6 100644 class AutostartManager: -- -2.12.2 +2.14.1 |