| 1 |
tetromino 12/01/10 17:38:32 |
| 2 |
|
| 3 |
Added: gnome-tweak-tool-3.2.2-missing-schemas-error.patch |
| 4 |
gnome-tweak-tool-3.2.2-gnome-shell-3.2.1-r2.patch |
| 5 |
Log: |
| 6 |
Fix gnome-shell-3.2.1-r2 compatibility (bug #398385, thanks to Juergen Rose or reporting) and report a more useful error on missing schemas. Drop old. |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.2.2-missing-schemas-error.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.2.2-missing-schemas-error.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.2.2-missing-schemas-error.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: gnome-tweak-tool-3.2.2-missing-schemas-error.patch |
| 17 |
=================================================================== |
| 18 |
From 96ca58e9034c0a4ae6d84ca53e37bc1d50ec0923 Mon Sep 17 00:00:00 2001 |
| 19 |
From: John Stowers <john.stowers@×××××.com> |
| 20 |
Date: Thu, 24 Nov 2011 09:55:38 +1300 |
| 21 |
Subject: [PATCH] Print more useful error for missing schemas |
| 22 |
|
| 23 |
--- |
| 24 |
gtweak/gsettings.py | 4 +++- |
| 25 |
1 files changed, 3 insertions(+), 1 deletions(-) |
| 26 |
|
| 27 |
diff --git a/gtweak/gsettings.py b/gtweak/gsettings.py |
| 28 |
index ca7020f..9ab8749 100644 |
| 29 |
--- a/gtweak/gsettings.py |
| 30 |
+++ b/gtweak/gsettings.py |
| 31 |
@@ -31,7 +31,9 @@ class _GSettingsSchema: |
| 32 |
schema_filename = schema_name + ".gschema.xml" |
| 33 |
|
| 34 |
schema_path = os.path.join(schema_dir, schema_filename) |
| 35 |
- assert(os.path.exists(schema_path)) |
| 36 |
+ if not os.path.exists(schema_path): |
| 37 |
+ logging.critical("Could not find schema %s" % schema_path) |
| 38 |
+ assert(False) |
| 39 |
|
| 40 |
self._schema_name = schema_name |
| 41 |
self._schema = {} |
| 42 |
-- |
| 43 |
1.7.8.3 |
| 44 |
|
| 45 |
|
| 46 |
|
| 47 |
|
| 48 |
1.1 gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.2.2-gnome-shell-3.2.1-r2.patch |
| 49 |
|
| 50 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.2.2-gnome-shell-3.2.1-r2.patch?rev=1.1&view=markup |
| 51 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.2.2-gnome-shell-3.2.1-r2.patch?rev=1.1&content-type=text/plain |
| 52 |
|
| 53 |
Index: gnome-tweak-tool-3.2.2-gnome-shell-3.2.1-r2.patch |
| 54 |
=================================================================== |
| 55 |
From 92b3fbafb7a4f43761dfc3469f20c7fad0cf99d0 Mon Sep 17 00:00:00 2001 |
| 56 |
From: John Stowers <john.stowers@×××××.com> |
| 57 |
Date: Sun, 20 Nov 2011 22:54:58 +1300 |
| 58 |
Subject: [PATCH] Fix compatibility with gnome-shell master |
| 59 |
|
| 60 |
--- |
| 61 |
gtweak/gshellwrapper.py | 4 +++- |
| 62 |
gtweak/tweaks/tweak_shell_extensions.py | 6 +++++- |
| 63 |
2 files changed, 8 insertions(+), 2 deletions(-) |
| 64 |
|
| 65 |
diff --git a/gtweak/gshellwrapper.py b/gtweak/gshellwrapper.py |
| 66 |
index 4c4ef81..254d246 100644 |
| 67 |
--- a/gtweak/gshellwrapper.py |
| 68 |
+++ b/gtweak/gshellwrapper.py |
| 69 |
@@ -51,7 +51,9 @@ class GnomeShell: |
| 70 |
"ENABLED" : 1, |
| 71 |
"DISABLED" : 2, |
| 72 |
"ERROR" : 3, |
| 73 |
- "OUT_OF_DATE" : 4 |
| 74 |
+ "OUT_OF_DATE" : 4, |
| 75 |
+ "DOWNLOADING" : 5, |
| 76 |
+ "INITIALIZED" : 6, |
| 77 |
} |
| 78 |
|
| 79 |
EXTENSION_TYPE = { |
| 80 |
diff --git a/gtweak/tweaks/tweak_shell_extensions.py b/gtweak/tweaks/tweak_shell_extensions.py |
| 81 |
index a453f33..7f883bc 100644 |
| 82 |
--- a/gtweak/tweaks/tweak_shell_extensions.py |
| 83 |
+++ b/gtweak/tweaks/tweak_shell_extensions.py |
| 84 |
@@ -24,11 +24,15 @@ class _ShellExtensionTweak(Tweak): |
| 85 |
sw.set_active(self._shell.extension_is_active(state, ext["uuid"])) |
| 86 |
sw.connect('notify::active', self._on_extension_toggled, ext["uuid"]) |
| 87 |
|
| 88 |
+ info = None |
| 89 |
warning = None |
| 90 |
sensitive = False |
| 91 |
if state == GnomeShell.EXTENSION_STATE["ENABLED"] or \ |
| 92 |
- state == GnomeShell.EXTENSION_STATE["DISABLED"]: |
| 93 |
+ state == GnomeShell.EXTENSION_STATE["DISABLED"] or \ |
| 94 |
+ state == GnomeShell.EXTENSION_STATE["INITIALIZED"]: |
| 95 |
sensitive = True |
| 96 |
+ elif state == GnomeShell.EXTENSION_STATE["DOWNLOADING"]: |
| 97 |
+ info = _("Extension downloading") |
| 98 |
elif state == GnomeShell.EXTENSION_STATE["ERROR"]: |
| 99 |
warning = _("Error loading extension") |
| 100 |
elif state == GnomeShell.EXTENSION_STATE["OUT_OF_DATE"]: |
| 101 |
-- |
| 102 |
1.7.8.3 |
Archives