diff options
| author | Bastien Nocera <hadess@hadess.net> | 2013-03-01 16:28:24 +0100 |
|---|---|---|
| committer | Bastien Nocera <hadess@hadess.net> | 2013-03-01 16:34:57 +0100 |
| commit | 236edf2b5db641940743fdd53e97242b11993e07 (patch) | |
| tree | e051a815f3b08560404f9f05cd23b96fed64e530 /plugins | |
| parent | 4e7c5544a35abb47cb91f14017481f158b21f540 (diff) | |
| download | gnome-settings-daemon-236edf2b5db641940743fdd53e97242b11993e07.tar.gz | |
Revert "cursor: Only enable the OSK when touch is used"
This reverts commit 2c5e3f8ac3803a19de49d09d1c028b75f7b048d2.
The code as it is is broken, as we don't differentiate between
"no cursor because we haven't used the device yet" and "a touchscreen
has been used".
It also changes a GSetting which is something we should not be touching
(gnome-shell or gnome-settings-daemon should be using the GSetting in
addition to this computed state to show the keyboard or not).
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/cursor/gsd-cursor-manager.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/plugins/cursor/gsd-cursor-manager.c b/plugins/cursor/gsd-cursor-manager.c index b0b888fb..611392bf 100644 --- a/plugins/cursor/gsd-cursor-manager.c +++ b/plugins/cursor/gsd-cursor-manager.c @@ -56,7 +56,6 @@ struct GsdCursorManagerPrivate guint changed_id; gboolean cursor_shown; GHashTable *monitors; - GSettings *osk_settings; }; static void gsd_cursor_manager_class_init (GsdCursorManagerClass *klass); @@ -123,8 +122,6 @@ set_cursor_visibility (GsdCursorManager *manager, visible ? "show" : "hide"); } - g_settings_set_boolean (manager->priv->osk_settings, "screen-keyboard-enabled", !visible); - manager->priv->cursor_shown = visible; } @@ -339,7 +336,6 @@ gsd_cursor_manager_init (GsdCursorManager *manager) g_direct_equal, NULL, g_object_unref); - manager->priv->osk_settings = g_settings_new ("org.gnome.desktop.a11y.applications"); } static void @@ -353,7 +349,6 @@ gsd_cursor_manager_finalize (GObject *object) cursor_manager = GSD_CURSOR_MANAGER (object); g_clear_pointer (&cursor_manager->priv->monitors, g_hash_table_destroy); - g_clear_object (&cursor_manager->priv->osk_settings); G_OBJECT_CLASS (gsd_cursor_manager_parent_class)->finalize (object); } |