[gnome-settings-daemon] xrdb: Remove xrdb plugin

[Bastien Nocera <hadess src gnome org>]

commit cc982caf2d02eeebf85ed763ddd4ca0819d72435
Author: Bastien Nocera <hadess hadess net>
Date:   Wed Nov 10 14:16:58 2010 +0000

    xrdb: Remove xrdb plugin
    
    Because it's not the 1980's any more.

 configure.ac                                       |    2 -
 data/gnome-settings-daemon.convert                 |    4 -
 data/gnome-settings-daemon.schemas.in              |   23 -
 ...gnome.settings-daemon.plugins.gschema.xml.in.in |   13 -
 plugins/Makefile.am                                |    1 -
 plugins/xrdb/Makefile.am                           |   54 --
 plugins/xrdb/data/Editres.ad                       |    5 -
 plugins/xrdb/data/Emacs.ad                         |   21 -
 plugins/xrdb/data/General.ad                       |    2 -
 plugins/xrdb/data/Makefile.am                      |   15 -
 plugins/xrdb/data/Motif.ad                         |   74 ---
 plugins/xrdb/data/Tk.ad                            |  102 ----
 plugins/xrdb/data/Xaw.ad                           |   25 -
 plugins/xrdb/gsd-xrdb-manager.c                    |  636 --------------------
 plugins/xrdb/gsd-xrdb-manager.h                    |   57 --
 plugins/xrdb/gsd-xrdb-plugin.c                     |  110 ----
 plugins/xrdb/gsd-xrdb-plugin.h                     |   59 --
 plugins/xrdb/xrdb.gnome-settings-plugin.in         |    8 -
 18 files changed, 0 insertions(+), 1211 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 6da1467..41d929f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -466,8 +466,6 @@ plugins/mouse/Makefile
 plugins/smartcard/Makefile
 plugins/sound/Makefile
 plugins/xrandr/Makefile
-plugins/xrdb/Makefile
-plugins/xrdb/data/Makefile
 plugins/xsettings/Makefile
 data/Makefile
 data/gnome-settings-daemon.desktop.in
diff --git a/data/gnome-settings-daemon.convert b/data/gnome-settings-daemon.convert
index 99ea6e6..38bba27 100644
--- a/data/gnome-settings-daemon.convert
+++ b/data/gnome-settings-daemon.convert
@@ -94,10 +94,6 @@ active = /apps/gnome_settings_daemon/plugins/xrandr/active
 default-configuration-file = /apps/gnome_settings_daemon/xrandr/default_configuration_file
 priority = /apps/gnome_settings_daemon/plugins/xrandr/priority
 
-[org.gnome.settings-daemon.plugins.xrdb]
-active = /apps/gnome_settings_daemon/plugins/xrdb/active
-priority = /apps/gnome_settings_daemon/plugins/xrdb/priority
-
 [org.gnome.settings-daemon.plugins.xsettings]
 active = /apps/gnome_settings_daemon/plugins/xsettings/active
 antialiasing = /desktop/gnome/font_rendering/antialiasing
diff --git a/data/gnome-settings-daemon.schemas.in b/data/gnome-settings-daemon.schemas.in
index 14fd2ac..8394066 100644
--- a/data/gnome-settings-daemon.schemas.in
+++ b/data/gnome-settings-daemon.schemas.in
@@ -279,29 +279,6 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/gnome_settings_daemon/plugins/xrdb/active</key>
-      <applyto>/apps/gnome_settings_daemon/plugins/xrdb/active</applyto>
-      <owner>gnome-settings-daemon</owner>
-      <type>bool</type>
-      <default>FALSE</default>
-      <locale name="C">
-        <short>Enable xrdb plugin</short>
-        <long>Set to True to enable the plugin to manage xrdb settings.</long>
-      </locale>
-    </schema>
-    <schema>
-      <key>/schemas/apps/gnome_settings_daemon/plugins/xrdb/priority</key>
-      <applyto>/apps/gnome_settings_daemon/plugins/xrdb/priority</applyto>
-      <owner>gnome-settings-daemon</owner>
-      <type>int</type>
-      <default>90</default>
-      <locale name="C">
-        <short></short>
-        <long></long>
-      </locale>
-    </schema>
-
-    <schema>
       <key>/schemas/apps/gnome_settings_daemon/plugins/xsettings/active</key>
       <applyto>/apps/gnome_settings_daemon/plugins/xsettings/active</applyto>
       <owner>gnome-settings-daemon</owner>
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 eb13e2b..1f3729c 100644
--- a/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in
+++ b/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in
@@ -8,7 +8,6 @@
     <child name="mouse" schema="org.gnome.settings-daemon.plugins.mouse"/>
     <child name="smartcard" schema="org.gnome.settings-daemon.plugins.smartcard"/>
     <child name="sound" schema="org.gnome.settings-daemon.plugins.sound"/>
-    <child name="xrdb" schema="org.gnome.settings-daemon.plugins.xrdb"/>
   </schema>
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.a11y-keyboard" path="/org/gnome/settings-daemon/plugins/a11y-keyboard/">
     <key name="active" type="b">
@@ -106,16 +105,4 @@
       <_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.xrdb" path="/org/gnome/settings-daemon/plugins/xrdb/">
-    <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>90</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>
 </schemalist>
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 3107cf4..1132771 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -13,7 +13,6 @@ enabled_plugins =	\
 	mouse		\
 	sound		\
 	xrandr		\
-	xrdb		\
 	xsettings	\
 	$(NULL)