r41880 - in /desktop/experimental/gnome-shell/debian: changelog patches/42-atspi-on-demand.patch patches/series

[bigon at users.alioth.debian.org]

Author: bigon
Date: Sat Jun 28 10:37:05 2014
New Revision: 41880

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=41880
Log:
Add debian/patches/42-atspi-on-demand.patch: Only call atspi.init if
needed, this is working around a performance issue with GtkTreeView

Added:
    desktop/experimental/gnome-shell/debian/patches/42-atspi-on-demand.patch
Modified:
    desktop/experimental/gnome-shell/debian/changelog
    desktop/experimental/gnome-shell/debian/patches/series

Modified: desktop/experimental/gnome-shell/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/changelog?rev=41880&op=diff
==============================================================================
--- desktop/experimental/gnome-shell/debian/changelog	[utf-8] (original)
+++ desktop/experimental/gnome-shell/debian/changelog	[utf-8] Sat Jun 28 10:37:05 2014
@@ -1,3 +1,10 @@
+gnome-shell (3.12.2-2) UNRELEASED; urgency=medium
+
+  * Add debian/patches/42-atspi-on-demand.patch: Only call atspi.init if
+    needed, this is working around a performance issue with GtkTreeView
+
+ -- Laurent Bigonville <bigon at debian.org>  Sat, 28 Jun 2014 12:31:13 +0200
+
 gnome-shell (3.12.2-1) experimental; urgency=medium
 
   [ Laurent Bigonville ]

Added: desktop/experimental/gnome-shell/debian/patches/42-atspi-on-demand.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/patches/42-atspi-on-demand.patch?rev=41880&op=file
==============================================================================
--- desktop/experimental/gnome-shell/debian/patches/42-atspi-on-demand.patch	(added)
+++ desktop/experimental/gnome-shell/debian/patches/42-atspi-on-demand.patch	[utf-8] Sat Jun 28 10:37:05 2014
@@ -0,0 +1,63 @@
+From e021ca2135ff8b0897ee5f8d014f7ff16cd9243e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Alejandro=20Pi=C3=B1eiro?= <apinheiro at igalia.com>
+Date: Thu, 29 May 2014 14:12:16 +0200
+Subject: a11y: initialize atspi on demand
+
+Only call atspi.init if needed. This is also more
+coherent with the listener registration, that is
+only done when needed.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=730118
+
+diff --git a/js/ui/focusCaretTracker.js b/js/ui/focusCaretTracker.js
+index beaf2de..265fcce 100644
+--- a/js/ui/focusCaretTracker.js
++++ b/js/ui/focusCaretTracker.js
+@@ -32,11 +32,9 @@ const FocusCaretTracker = new Lang.Class({
+     Name: 'FocusCaretTracker',
+ 
+     _init: function() {
+-        Atspi.init();
+-        Atspi.set_timeout(250, 250);
+-
+         this._atspiListener = Atspi.EventListener.new(Lang.bind(this, this._onChanged));
+ 
++        this._atspiInited = false;
+         this._focusListenerRegistered = false;
+         this._caretListenerRegistered = false;
+     },
+@@ -48,12 +46,20 @@ const FocusCaretTracker = new Lang.Class({
+             this.emit('caret-moved', event);
+     },
+ 
++    _initAtspi: function() {
++        if (!this._atspiInited) {
++            Atspi.init();
++            Atspi.set_timeout(250, 250);
++            this._atspiInited = true;
++        }
++    },
++
+     registerFocusListener: function() {
+         if (this._focusListenerRegistered)
+             return;
+ 
+-        // Ignore the return value, we get an exception if they fail
+-        // And they should never fail
++        this._initAtspi();
++
+         this._atspiListener.register(STATECHANGED + ':focused');
+         this._atspiListener.register(STATECHANGED + ':selected');
+         this._focusListenerRegistered = true;
+@@ -63,6 +69,8 @@ const FocusCaretTracker = new Lang.Class({
+         if (this._caretListenerRegistered)
+             return;
+ 
++        this._initAtspi();
++
+         this._atspiListener.register(CARETMOVED);
+         this._caretListenerRegistered = true;
+     },
+-- 
+cgit v0.10.1
+

Modified: desktop/experimental/gnome-shell/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/patches/series?rev=41880&op=diff
==============================================================================
--- desktop/experimental/gnome-shell/debian/patches/series	[utf-8] (original)
+++ desktop/experimental/gnome-shell/debian/patches/series	[utf-8] Sat Jun 28 10:37:05 2014
@@ -2,3 +2,4 @@
 27-nm-libexec-path.patch
 #30-remoteMenu-Prevent-the-shell-from-becoming-unrespons.patch
 41-handle-logind-fail.patch
+42-atspi-on-demand.patch