1 files changed, 13 insertions, 36 deletions
diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch
index 40c0969d588..77b952b4b1e 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch
+++ b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch
@@ -1,25 +1,24 @@
-From 25c047ac6a2ac892e2be3d7e002fbf7a16725a4c Mon Sep 17 00:00:00 2001
+From 8e75fe5f1ebd8a140a7306294d2219aea4ac47d2 Mon Sep 17 00:00:00 2001
 From: Jascha Geerds <jascha@jgeerds.name>
-Date: Sun, 25 Jun 2017 11:35:10 +0100
+Date: Tue, 19 Sep 2017 03:16:07 +0200
 Subject: [PATCH 2/3] Don't show multiple entries for a single theme
 
 ---
- gtweak/tweaks/tweak_group_interface.py |  8 ++++----
- gtweak/tweaks/tweak_group_keymouse.py  |  4 ++--
- gtweak/utils.py                        | 16 ++++++++++++++++
- 3 files changed, 22 insertions(+), 6 deletions(-)
+ gtweak/tweaks/tweak_group_appearance.py |  8 ++++----
+ gtweak/utils.py                         | 16 ++++++++++++++++
+ 2 files changed, 20 insertions(+), 4 deletions(-)
 
-diff --git a/gtweak/tweaks/tweak_group_interface.py b/gtweak/tweaks/tweak_group_interface.py
-index db89b85..4697fe3 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 0d12194..8e05077 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, get_resource_dirs
 +from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file, get_resource_dirs, get_unique_resources
- from gtweak.tweakmodel import Tweak, TWEAK_GROUP_APPEARANCE
+ from gtweak.tweakmodel import Tweak
  from gtweak.gshellwrapper import GnomeShellFactory
  from gtweak.gsettings import GSettingsSetting
 @@ -54,7 +54,7 @@ class GtkThemeSwitcher(GSettingsComboTweak):
@@ -49,33 +48,11 @@ index db89b85..4697fe3 100644
  
  class ShellThemeTweak(Gtk.Box, Tweak):
  
-diff --git a/gtweak/tweaks/tweak_group_keymouse.py b/gtweak/tweaks/tweak_group_keymouse.py
-index b06900c..d34793e 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, get_resource_dirs
-+from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default, get_resource_dirs, get_unique_resources
- from gtweak.widgets import ListBoxTweakGroup, GSettingsComboTweak, GSettingsSwitchTweak, GetterSetterSwitchTweak, Title, GSettingsComboEnumTweak
- 
- _shell = GnomeShellFactory().get_shell()
-@@ -44,7 +44,7 @@ class KeyThemeSwitcher(GSettingsComboTweak):
-         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
-+        return get_unique_resources(valid)
- 
- TWEAK_GROUPS = [
-     ListBoxTweakGroup(_("Keyboard and Mouse"),
 diff --git a/gtweak/utils.py b/gtweak/utils.py
-index b0993b6..0d995bc 100644
+index 6c60b88..6fd7c6a 100644
 --- a/gtweak/utils.py
 +++ b/gtweak/utils.py
-@@ -133,6 +133,22 @@ def get_resource_dirs(resource):
+@@ -134,6 +134,22 @@ def get_resource_dirs(resource):
  
      return [dir for dir in dirs if os.path.isdir(dir)]
  
@@ -99,5 +76,5 @@ index b0993b6..0d995bc 100644
  class AutostartManager:
  
 -- 
-2.12.2
+2.14.1