codesnap: init at 0.8.2 (#364266)
[NixPkgs.git] / pkgs / by-name / gu / guake / no-compile-schemas.patch
blobe73387e1fc098dc149ca741e4d5634be178f8730
1 diff --git a/guake/guake_app.py b/guake/guake_app.py
2 index 48074db..d7d1371 100644
3 --- a/guake/guake_app.py
4 +++ b/guake/guake_app.py
5 @@ -109,12 +109,7 @@ class Guake(SimpleGladeApp):
6 SCHEMA_DIR, Gio.SettingsSchemaSource.get_default(), False
9 - try:
10 - schema_source = load_schema()
11 - except GLib.Error: # pylint: disable=catching-non-exception
12 - log.exception("Unable to load the GLib schema, try to compile it")
13 - try_to_compile_glib_schemas()
14 - schema_source = load_schema()
15 + schema_source = load_schema()
16 self.settings = Settings(schema_source)
17 self.accel_group = None
19 @@ -122,13 +117,8 @@ class Guake(SimpleGladeApp):
20 "schema-version" not in self.settings.general.keys()
21 or self.settings.general.get_string("schema-version") != guake_version()
23 - log.exception("Schema from old guake version detected, regenerating schema")
24 - try:
25 - try_to_compile_glib_schemas()
26 - except subprocess.CalledProcessError:
27 - log.exception("Schema in non user-editable location, attempting to continue")
28 - schema_source = load_schema()
29 - self.settings = Settings(schema_source)
30 + log.exception("Schema from old guake version detected")
31 + # Kept for compatibility with other distros.
32 self.settings.general.set_string("schema-version", guake_version())
34 log.info("Language previously loaded from: %s", LOCALE_DIR)