summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Fourdan <ofourdan@redhat.com>2019-06-06 15:18:09 +0200
committerCarlos Garnacho <mrgarnacho@gmail.com>2019-07-29 21:27:36 +0000
commitc58539784f23622bcc746e95d7f4755f53981f3e (patch)
treef69431ad4e0a1b8319f2a9f16be33d1237240473
parent301a69fc73483fb5a97bf74b6a33604461f74db5 (diff)
downloadgnome-settings-daemon-c58539784f23622bcc746e95d7f4755f53981f3e.tar.gz
mouse: Remove mouse plugin
There is nothing left in the mouse plugin but the settings migration, which occurred more than 3 years ago in GNOME 3.14. Remove that plugin altogether. Note, we keep the schemas as this is still used by the XSettings plugin. https://gitlab.gnome.org/GNOME/gnome-settings-daemon/merge_requests/115
-rw-r--r--plugins/meson.build1
-rw-r--r--plugins/mouse/gsd-mouse-manager.c207
-rw-r--r--plugins/mouse/gsd-mouse-manager.h38
-rw-r--r--plugins/mouse/main.c7
-rw-r--r--plugins/mouse/meson.build30
-rw-r--r--plugins/mouse/org.gnome.SettingsDaemon.Mouse.desktop.in9
6 files changed, 0 insertions, 292 deletions
diff --git a/plugins/meson.build b/plugins/meson.build
index 3db69da7..f5c2a6bf 100644
--- a/plugins/meson.build
+++ b/plugins/meson.build
@@ -8,7 +8,6 @@ enabled_plugins = [
['housekeeping', 'Housekeeping'],
['keyboard', 'Keyboard'],
['media-keys', 'MediaKeys'],
- ['mouse', 'Mouse'],
['screensaver-proxy', 'ScreensaverProxy'],
['sharing', 'Sharing'],
['sound', 'Sound'],
diff --git a/plugins/mouse/gsd-mouse-manager.c b/plugins/mouse/gsd-mouse-manager.c
deleted file mode 100644
index ee266003..00000000
--- a/plugins/mouse/gsd-mouse-manager.c
+++ /dev/null
@@ -1,207 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2007 William Jon McCann <mccann@jhu.edu>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "config.h"
-
-#include <locale.h>
-
-#include <glib.h>
-#include <glib/gi18n.h>
-#include <gio/gio.h>
-
-#include <gdesktop-enums.h>
-
-#include "gnome-settings-bus.h"
-#include "gnome-settings-profile.h"
-#include "gsd-mouse-manager.h"
-#include "gsd-enums.h"
-#include "gsd-settings-migrate.h"
-
-#define GSD_SETTINGS_MOUSE_SCHEMA "org.gnome.settings-daemon.peripherals.mouse"
-#define GSETTINGS_MOUSE_SCHEMA "org.gnome.desktop.peripherals.mouse"
-#define GSETTINGS_TOUCHPAD_SCHEMA "org.gnome.desktop.peripherals.touchpad"
-
-struct _GsdMouseManager
-{
- GObject parent;
-
- GSettings *touchpad_settings;
- GSettings *mouse_settings;
- GSettings *gsd_mouse_settings;
-};
-
-static void gsd_mouse_manager_class_init (GsdMouseManagerClass *klass);
-static void gsd_mouse_manager_init (GsdMouseManager *mouse_manager);
-static void gsd_mouse_manager_finalize (GObject *object);
-
-G_DEFINE_TYPE (GsdMouseManager, gsd_mouse_manager, G_TYPE_OBJECT)
-
-static gpointer manager_object = NULL;
-
-static void migrate_mouse_settings (void);
-
-static void
-gsd_mouse_manager_class_init (GsdMouseManagerClass *klass)
-{
- GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
- object_class->finalize = gsd_mouse_manager_finalize;
-}
-
-static void
-gsd_mouse_manager_init (GsdMouseManager *manager)
-{
-}
-
-gboolean
-gsd_mouse_manager_start (GsdMouseManager *manager,
- GError **error)
-{
- gnome_settings_profile_start (NULL);
-
- migrate_mouse_settings ();
-
- if (gnome_settings_is_wayland ())
- return TRUE;
-
- gnome_settings_profile_end (NULL);
-
- return TRUE;
-}
-
-void
-gsd_mouse_manager_stop (GsdMouseManager *manager)
-{
- g_debug ("Stopping mouse manager");
-
- g_clear_object (&manager->mouse_settings);
- g_clear_object (&manager->touchpad_settings);
- g_clear_object (&manager->gsd_mouse_settings);
-}
-
-static void
-gsd_mouse_manager_finalize (GObject *object)
-{
- GsdMouseManager *mouse_manager;
-
- g_return_if_fail (object != NULL);
- g_return_if_fail (GSD_IS_MOUSE_MANAGER (object));
-
- mouse_manager = GSD_MOUSE_MANAGER (object);
-
- g_return_if_fail (mouse_manager != NULL);
-
- gsd_mouse_manager_stop (mouse_manager);
-
- G_OBJECT_CLASS (gsd_mouse_manager_parent_class)->finalize (object);
-}
-
-static GVariant *
-map_speed (GVariant *variant, GVariant *old_default, GVariant *new_default)
-{
- gdouble value;
-
- value = g_variant_get_double (variant);
-
- /* Remap from [0..10] to [-1..1] */
- value = (value / 5) - 1;
-
- return g_variant_new_double (value);
-}
-
-static GVariant *
-map_send_events (GVariant *variant, GVariant *old_default, GVariant *new_default)
-{
- gboolean enabled;
-
- enabled = g_variant_get_boolean (variant);
-
- if (enabled) {
- return g_variant_new_string ("enabled");
- } else {
- return g_variant_new_string ("disabled");
- }
-}
-
-static GVariant *
-map_edge_scrolling_enabled (GVariant *variant, GVariant *old_default, GVariant *new_default)
-{
- GsdTouchpadScrollMethod method;
-
- method = g_variant_get_uint32 (variant);
- if (method == GSD_TOUCHPAD_SCROLL_METHOD_EDGE_SCROLLING)
- return g_variant_new_boolean (TRUE);
- else
- return g_variant_new_boolean (FALSE);
-}
-
-static void
-migrate_mouse_settings (void)
-{
- GsdSettingsMigrateEntry trackball_entries[] = {
- { "scroll-wheel-emulation-button", "scroll-wheel-emulation-button", NULL }
- };
- GsdSettingsMigrateEntry mouse_entries[] = {
- { "left-handed", "left-handed", NULL },
- { "motion-acceleration", "speed", map_speed },
- { "motion-threshold", NULL, NULL },
- { "middle-button-enabled", NULL, NULL },
- };
- GsdSettingsMigrateEntry touchpad_entries[] = {
- { "disable-while-typing", NULL, NULL },
- { "horiz-scroll-enabled", NULL, NULL },
- { "scroll-method", "edge-scrolling-enabled", map_edge_scrolling_enabled },
- { "tap-to-click", "tap-to-click", NULL },
- { "touchpad-enabled", "send-events", map_send_events },
- { "left-handed", "left-handed", NULL },
- { "motion-acceleration", "speed", map_speed },
- { "motion-threshold", NULL, NULL },
- { "natural-scroll", "natural-scroll", NULL }
- };
-
- gsd_settings_migrate_check ("org.gnome.settings-daemon.peripherals.trackball.deprecated",
- "/org/gnome/settings-daemon/peripherals/trackball/",
- "org.gnome.desktop.peripherals.trackball",
- "/org/gnome/desktop/peripherals/trackball/",
- trackball_entries, G_N_ELEMENTS (trackball_entries));
- gsd_settings_migrate_check ("org.gnome.settings-daemon.peripherals.mouse.deprecated",
- "/org/gnome/settings-daemon/peripherals/mouse/",
- "org.gnome.desktop.peripherals.mouse",
- "/org/gnome/desktop/peripherals/mouse/",
- mouse_entries, G_N_ELEMENTS (mouse_entries));
- gsd_settings_migrate_check ("org.gnome.settings-daemon.peripherals.touchpad.deprecated",
- "/org/gnome/settings-daemon/peripherals/touchpad/",
- "org.gnome.desktop.peripherals.touchpad",
- "/org/gnome/desktop/peripherals/touchpad/",
- touchpad_entries, G_N_ELEMENTS (touchpad_entries));
-}
-
-GsdMouseManager *
-gsd_mouse_manager_new (void)
-{
- if (manager_object != NULL) {
- g_object_ref (manager_object);
- } else {
- manager_object = g_object_new (GSD_TYPE_MOUSE_MANAGER, NULL);
- g_object_add_weak_pointer (manager_object,
- (gpointer *) &manager_object);
- }
-
- return GSD_MOUSE_MANAGER (manager_object);
-}
diff --git a/plugins/mouse/gsd-mouse-manager.h b/plugins/mouse/gsd-mouse-manager.h
deleted file mode 100644
index d7af385a..00000000
--- a/plugins/mouse/gsd-mouse-manager.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2007 William Jon McCann <mccann@jhu.edu>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef __GSD_MOUSE_MANAGER_H
-#define __GSD_MOUSE_MANAGER_H
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-#define GSD_TYPE_MOUSE_MANAGER (gsd_mouse_manager_get_type ())
-
-G_DECLARE_FINAL_TYPE (GsdMouseManager, gsd_mouse_manager, GSD, MOUSE_MANAGER, GObject)
-
-GsdMouseManager * gsd_mouse_manager_new (void);
-gboolean gsd_mouse_manager_start (GsdMouseManager *manager,
- GError **error);
-void gsd_mouse_manager_stop (GsdMouseManager *manager);
-
-G_END_DECLS
-
-#endif /* __GSD_MOUSE_MANAGER_H */
diff --git a/plugins/mouse/main.c b/plugins/mouse/main.c
deleted file mode 100644
index 78665a13..00000000
--- a/plugins/mouse/main.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#define NEW gsd_mouse_manager_new
-#define START gsd_mouse_manager_start
-#define STOP gsd_mouse_manager_stop
-#define MANAGER GsdMouseManager
-#include "gsd-mouse-manager.h"
-
-#include "daemon-skeleton.h"
diff --git a/plugins/mouse/meson.build b/plugins/mouse/meson.build
deleted file mode 100644
index 92623d56..00000000
--- a/plugins/mouse/meson.build
+++ /dev/null
@@ -1,30 +0,0 @@
-sources = files(
- 'gsd-mouse-manager.c',
- 'main.c'
-)
-
-deps = plugins_deps + [
- gio_dep,
- gsettings_desktop_dep,
- libcommon_dep,
- m_dep
-]
-
-cflags += ['-DLIBEXECDIR="@0@"'.format(gsd_libexecdir)]
-
-executable(
- 'gsd-' + plugin_name,
- sources,
- include_directories: [top_inc, data_inc],
- dependencies: deps,
- c_args: cflags,
- install: true,
- install_rpath: gsd_pkglibdir,
- install_dir: gsd_libexecdir
-)
-
-deps = [
- gtk_dep,
- m_dep,
- x11_dep
-]
diff --git a/plugins/mouse/org.gnome.SettingsDaemon.Mouse.desktop.in b/plugins/mouse/org.gnome.SettingsDaemon.Mouse.desktop.in
deleted file mode 100644
index fb4c7d3d..00000000
--- a/plugins/mouse/org.gnome.SettingsDaemon.Mouse.desktop.in
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=GNOME Settings Daemon's mouse plugin
-Exec=@libexecdir@/gsd-mouse
-OnlyShowIn=GNOME;
-NoDisplay=true
-X-GNOME-Autostart-Phase=Initialization
-X-GNOME-Autostart-Notify=true
-X-GNOME-AutoRestart=true