[gnome-settings-daemon] cursor: Remove cursor plugin
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-settings-daemon] cursor: Remove cursor plugin
- Date: Fri, 13 Mar 2015 20:33:36 +0000 (UTC)
commit b8aa2bdbda196db98ffb04941c350ee5cf21d63e
Author: Carlos Garnacho <carlosg gnome org>
Date: Wed Feb 11 17:25:23 2015 +0100
cursor: Remove cursor plugin
Bug 712775 adds this logic to Mutter for both wayland and X11, so remove
the now redundant handling from here.
https://bugzilla.gnome.org/show_bug.cgi?id=744343
.gitignore | 1 -
configure.ac | 7 -
...gnome.settings-daemon.plugins.gschema.xml.in.in | 13 -
plugins/Makefile.am | 1 -
plugins/cursor/Makefile.am | 77 ---
plugins/cursor/cursor.gnome-settings-plugin.in | 10 -
plugins/cursor/gsd-cursor-manager.c | 518 --------------------
plugins/cursor/gsd-cursor-manager.h | 56 ---
plugins/cursor/gsd-cursor-plugin.c | 28 -
plugins/cursor/test-cursor.c | 7 -
po/POTFILES.in | 1 -
11 files changed, 0 insertions(+), 719 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e4e5725..01517df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,7 +56,6 @@ plugins/a11y-settings/gsd-test-a11y-settings
plugins/background/test-background
plugins/common/gsd-test-input-helper
plugins/common/test-egg-key-parsing
-plugins/cursor/gsd-test-cursor
plugins/datetime/gsd-test-datetime
plugins/datetime/geoclue.c
plugins/datetime/geoclue.h
diff --git a/configure.ac b/configure.ac
index 0c137d3..257e991 100644
--- a/configure.ac
+++ b/configure.ac
@@ -181,12 +181,6 @@ dnl ---------------------------------------------------------------------------
PKG_CHECK_MODULES(MOUSE, x11 xi)
dnl ---------------------------------------------------------------------------
-dnl - cursor
-dnl ---------------------------------------------------------------------------
-
-PKG_CHECK_MODULES(CURSOR, xfixes gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
-
-dnl ---------------------------------------------------------------------------
dnl - xsettings
dnl ---------------------------------------------------------------------------
@@ -521,7 +515,6 @@ plugins/a11y-settings/Makefile
plugins/clipboard/Makefile
plugins/color/Makefile
plugins/common/Makefile
-plugins/cursor/Makefile
plugins/datetime/Makefile
plugins/dummy/Makefile
plugins/power/Makefile
diff --git a/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in
b/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in
index b74ed42..bdfcfcd 100644
--- a/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in
+++ b/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in
@@ -13,7 +13,6 @@
<child name="a11y-settings" schema="org.gnome.settings-daemon.plugins.a11y-settings"/>
<child name="clipboard" schema="org.gnome.settings-daemon.plugins.clipboard"/>
<child name="color" schema="org.gnome.settings-daemon.plugins.color"/>
- <child name="cursor" schema="org.gnome.settings-daemon.plugins.cursor"/>
<child name="datetime" schema="org.gnome.settings-daemon.plugins.datetime"/>
<child name="gsdwacom" schema="org.gnome.settings-daemon.plugins.gsdwacom"/>
<child name="housekeeping" schema="org.gnome.settings-daemon.plugins.housekeeping"/>
@@ -66,18 +65,6 @@
<_description>Priority to use for this plugin in gnome-settings-daemon startup queue</_description>
</key>
</schema>
- <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.cursor"
path="/org/gnome/settings-daemon/plugins/cursor/">
- <key name="active" type="b">
- <default>true</default>
- <_summary>Activation of this plugin</_summary>
- <_description>Whether this plugin would be activated by gnome-settings-daemon or not</_description>
- </key>
- <key name="priority" type="i">
- <default>0</default>
- <_summary>Priority to use for this plugin</_summary>
- <_description>Priority to use for this plugin in gnome-settings-daemon startup queue</_description>
- </key>
- </schema>
<schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.mouse"
path="/org/gnome/settings-daemon/plugins/mouse/">
<key name="active" type="b">
<default>true</default>
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 7bb01f0..7365953 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -5,7 +5,6 @@ enabled_plugins = \
a11y-settings \
clipboard \
color \
- cursor \
datetime \
dummy \
power \
diff --git a/po/POTFILES.in b/po/POTFILES.in
index cf7889f..b335e48 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -23,7 +23,6 @@ plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
[type: gettext/ini]plugins/color/color.gnome-settings-plugin.in
plugins/color/gsd-color-calibrate.c
plugins/color/gsd-color-manager.c
-[type: gettext/ini]plugins/cursor/cursor.gnome-settings-plugin.in
[type: gettext/ini]plugins/datetime/datetime.gnome-settings-plugin.in
plugins/datetime/gsd-datetime-manager.c
[type: gettext/ini]plugins/dummy/dummy.gnome-settings-plugin.in
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]