brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

keyboard: ignore D-Bus requests when the OSK isn't enabled

Browse Source 
Fixes spurious warnings about "this.actor is null" when processing
org.gnome.Caribou.Keyboard messages when the keyboard isn't enabled.

https://bugzilla.gnome.org/show_bug.cgi?id=659940
This commit is contained in:
Dan Winship 2011-09-27 14:55:38 -04:00
parent 9c76318df8
commit 6aa411fecc
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
js/ui/keyboard.js
View File

@ -476,6 +476,9 @@ Keyboard.prototype = {
// D-Bus methods // D-Bus methods
Show: function(timestamp) { Show: function(timestamp) {
if (!this._enableKeyboard)
return;
if (timestamp - this._timestamp < 0) if (timestamp - this._timestamp < 0)
return; return;
@ -484,6 +487,9 @@ Keyboard.prototype = {
}, },
Hide: function(timestamp) { Hide: function(timestamp) {
if (!this._enableKeyboard)
return;
if (timestamp - this._timestamp < 0) if (timestamp - this._timestamp < 0)
return; return;
@ -492,10 +498,16 @@ Keyboard.prototype = {
}, },
SetCursorLocation: function(x, y, w, h) { SetCursorLocation: function(x, y, w, h) {
if (!this._enableKeyboard)
return;
// this._setLocation(x, y); // this._setLocation(x, y);
}, },
SetEntryLocation: function(x, y, w, h) { SetEntryLocation: function(x, y, w, h) {
if (!this._enableKeyboard)
return;
// this._setLocation(x, y); // this._setLocation(x, y);
}, },