|
 |
c1b792 |
From 000396a7ac3f03b0cea1c7897819634edd9f2dd4 Mon Sep 17 00:00:00 2001
|
|
|
c1b792 |
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
|
|
|
c1b792 |
Date: Wed, 18 Jul 2018 17:09:05 +0200
|
|
|
c1b792 |
Subject: [PATCH] settings: Drop override settings support
|
|
|
c1b792 |
|
|
|
c1b792 |
Now that session-specific overrides landed in GIO, it is no longer
|
|
|
c1b792 |
necessary to explicitly handle different defaults in GNOME and Classic.
|
|
|
c1b792 |
|
|
|
c1b792 |
https://gitlab.gnome.org/GNOME/gnome-tweaks/merge_requests/9
|
|
|
c1b792 |
---
|
|
|
c1b792 |
gtweak/widgets.py | 23 -----------------------
|
|
|
c1b792 |
1 file changed, 23 deletions(-)
|
|
|
c1b792 |
|
|
|
c1b792 |
diff --git a/gtweak/widgets.py b/gtweak/widgets.py
|
|
|
c1b792 |
index 3d48a51..f1d607c 100644
|
|
|
c1b792 |
--- a/gtweak/widgets.py
|
|
|
c1b792 |
+++ b/gtweak/widgets.py
|
|
|
c1b792 |
@@ -116,32 +116,9 @@ def build_tight_button(stock_id):
|
|
|
c1b792 |
button.get_style_context().add_provider(provider, 600)
|
|
|
c1b792 |
return button
|
|
|
c1b792 |
|
|
|
c1b792 |
-def adjust_schema_for_overrides(originalSchema, key, options):
|
|
|
c1b792 |
- if (_shell is None):
|
|
|
c1b792 |
- return originalSchema
|
|
|
c1b792 |
-
|
|
|
c1b792 |
- if (_shell.mode == 'user'):
|
|
|
c1b792 |
- overridesSchema = "org.gnome.shell.overrides"
|
|
|
c1b792 |
- overridesFile = "org.gnome.shell.gschema.xml"
|
|
|
c1b792 |
- elif (_shell.mode == 'classic'):
|
|
|
c1b792 |
- overridesSchema = "org.gnome.shell.extensions.classic-overrides"
|
|
|
c1b792 |
- overridesFile = None
|
|
|
c1b792 |
- else:
|
|
|
c1b792 |
- return originalSchema
|
|
|
c1b792 |
-
|
|
|
c1b792 |
- try:
|
|
|
c1b792 |
- if (key in GSettingsSetting(overridesSchema, schema_filename=overridesFile).list_keys()):
|
|
|
c1b792 |
- options['schema_filename'] = overridesFile
|
|
|
c1b792 |
- return overridesSchema
|
|
|
c1b792 |
- except GSettingsMissingError as e:
|
|
|
c1b792 |
- logging.info("GSetting missing %s", e)
|
|
|
c1b792 |
-
|
|
|
c1b792 |
- return originalSchema
|
|
|
c1b792 |
-
|
|
|
c1b792 |
|
|
|
c1b792 |
class _GSettingsTweak(Tweak):
|
|
|
c1b792 |
def __init__(self, name, schema_name, key_name, **options):
|
|
|
c1b792 |
- schema_name = adjust_schema_for_overrides(schema_name, key_name, options)
|
|
|
c1b792 |
self.schema_name = schema_name
|
|
|
c1b792 |
self.key_name = key_name
|
|
|
c1b792 |
self._extra_info = None
|
|
|
c1b792 |
--
|
|
|
c1b792 |
2.21.0
|
|
|
c1b792 |
|