[gnome-shell] keyboardManager: Adopt to changes in meta_display_freeze_keyboard
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] keyboardManager: Adopt to changes in meta_display_freeze_keyboard
- Date: Tue, 14 Oct 2014 21:47:52 +0000 (UTC)
commit ea552ea1573f998eac9d88806613f2586160ac98
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Sun Oct 12 21:52:56 2014 -0700
keyboardManager: Adopt to changes in meta_display_freeze_keyboard
js/misc/keyboardManager.js | 2 +-
src/shell-global.c | 8 --------
src/shell-global.h | 2 --
3 files changed, 1 insertions(+), 11 deletions(-)
---
diff --git a/js/misc/keyboardManager.js b/js/misc/keyboardManager.js
index acc7eec..e8a3e78 100644
--- a/js/misc/keyboardManager.js
+++ b/js/misc/keyboardManager.js
@@ -35,7 +35,7 @@ function releaseKeyboard() {
}
function holdKeyboard() {
- global.freeze_keyboard(global.get_current_time());
+ global.display.freeze_keyboard(global.get_current_time());
}
const KeyboardManager = new Lang.Class({
diff --git a/src/shell-global.c b/src/shell-global.c
index d90ceaf..e9c60bf 100644
--- a/src/shell-global.c
+++ b/src/shell-global.c
@@ -1132,14 +1132,6 @@ shell_global_end_modal (ShellGlobal *global,
sync_input_region (global);
}
-void
-shell_global_freeze_keyboard (ShellGlobal *global,
- guint32 timestamp)
-{
- if (global->stage_xwindow != None)
- meta_display_freeze_keyboard (global->meta_display, global->stage_xwindow, timestamp);
-}
-
/* Code to close all file descriptors before we exec; copied from gspawn.c in GLib.
*
* Authors: Padraig O'Briain, Matthias Clasen, Lennart Poettering
diff --git a/src/shell-global.h b/src/shell-global.h
index a5630ec..4a03087 100644
--- a/src/shell-global.h
+++ b/src/shell-global.h
@@ -45,8 +45,6 @@ gboolean shell_global_begin_modal (ShellGlobal *global,
MetaModalOptions options);
void shell_global_end_modal (ShellGlobal *global,
guint32 timestamp);
-void shell_global_freeze_keyboard (ShellGlobal *global,
- guint32 timestamp);
void shell_global_set_stage_input_region (ShellGlobal *global,
GSList *rectangles);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]