[gnome-shell/wip/carlosg/osk-cldr: 34/34] keyboard: Remove duplicate code



commit d2674c82a574465c4a767dd8b00b234b9e354402
Author: Carlos Garnacho <carlosg gnome org>
Date:   Fri Dec 22 17:25:48 2017 +0100

    keyboard: Remove duplicate code
    
    The same calls happen right at the beginning of the function.

 data/theme/gnome-shell-sass |    2 +-
 js/ui/keyboard.js           |    2 --
 src/main.c                  |    2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/data/theme/gnome-shell-sass b/data/theme/gnome-shell-sass
index 57a2e5b..26f3a14 160000
--- a/data/theme/gnome-shell-sass
+++ b/data/theme/gnome-shell-sass
@@ -1 +1 @@
-Subproject commit 57a2e5bfe179d9db1e05c3edaffdcb3fee307be0
+Subproject commit 26f3a14bf5291a3a0b3d156a4af76af8d8ff0575
diff --git a/js/ui/keyboard.js b/js/ui/keyboard.js
index 1aedb4e..9664de7 100644
--- a/js/ui/keyboard.js
+++ b/js/ui/keyboard.js
@@ -238,8 +238,6 @@ var Key = new Lang.Class({
                                                         this._pressTimeoutId = 0;
                                                         this._touchPressed = false;
                                                         this._ensureExtendedKeysPopup();
-                                                        this.actor.fake_release();
-                                                        this.actor.set_hover(false);
                                                         this._showSubkeys();
                                                         return GLib.SOURCE_REMOVE;
                                                     }));
diff --git a/src/main.c b/src/main.c
index 857877b..6ca8c55 100644
--- a/src/main.c
+++ b/src/main.c
@@ -28,7 +28,7 @@
 
 extern GType gnome_shell_plugin_get_type (void);
 
-#define SHELL_DBUS_SERVICE "org.gnome.Shell"
+#define SHELL_DBUS_SERVICE "org.gnome.Shell2"
 #define MAGNIFIER_DBUS_SERVICE "org.gnome.Magnifier"
 
 #define OVERRIDES_SCHEMA "org.gnome.shell.overrides"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]