clutter: Drop Xsettings client code

We only listen to it for 2 settings (drag threshold, double click
time), and we already have the stock ClutterSettings object tracking
the source of these. This code is redundant.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1862>

8 files changed, 0 insertions, 1222 deletions

diff --git a/clutter/clutter/meson.build b/clutter/clutter/meson.build
index 35a0afefc..f65b91da2 100644
--- a/clutter/clutter/meson.build
+++ b/clutter/clutter/meson.build
@@ -249,17 +249,8 @@ if have_x11
 
   clutter_x11_private_headers = [
     'x11/clutter-backend-x11.h',
-    'x11/clutter-settings-x11.h',
   ]
   clutter_backend_private_headers += clutter_x11_private_headers
-
-  clutter_x11_nonintrospected_sources = [
-    'x11/xsettings/xsettings-client.c',
-    'x11/xsettings/xsettings-client.h',
-    'x11/xsettings/xsettings-common.c',
-    'x11/xsettings/xsettings-common.h',
-  ]
-  clutter_backend_nonintrospected_sources += clutter_x11_nonintrospected_sources
 endif
 
 cally_headers = [
diff --git a/clutter/clutter/x11/clutter-backend-x11.c b/clutter/clutter/x11/clutter-backend-x11.c
index 8e0631c5c..3d1856a97 100644
--- a/clutter/clutter/x11/clutter-backend-x11.c
+++ b/clutter/clutter/x11/clutter-backend-x11.c
@@ -34,11 +34,8 @@
 #include <errno.h>
 
 #include "clutter-backend-x11.h"
-#include "clutter-settings-x11.h"
 #include "clutter-x11.h"
 
-#include "xsettings/xsettings-common.h"
-
 #include <X11/extensions/Xcomposite.h>
 #include <X11/extensions/XInput2.h>
 
@@ -111,22 +108,6 @@ static int TrappedErrorCode = 0;
 static int (* old_error_handler) (Display *, XErrorEvent *);
 
 static ClutterX11FilterReturn
-xsettings_filter (XEvent       *xevent,
-                  ClutterEvent *event,
-                  gpointer      data)
-{
-  ClutterBackendX11 *backend_x11 = data;
-
-  _clutter_xsettings_client_process_event (backend_x11->xsettings, xevent);
-
-  /* we always want the rest of the stack to get XSettings events, even
-   * if Clutter already handled them
-   */
-
-  return CLUTTER_X11_FILTER_CONTINUE;
-}
-
-static ClutterX11FilterReturn
 cogl_xlib_filter (XEvent       *xevent,
                   ClutterEvent *event,
                   gpointer      data)
@@ -151,78 +132,6 @@ cogl_xlib_filter (XEvent       *xevent,
   return retval;
 }
 
-static void
-clutter_backend_x11_xsettings_notify (const char       *name,
-                                      XSettingsAction   action,
-                                      XSettingsSetting *setting,
-                                      void             *cb_data)
-{
-  ClutterSettings *settings = clutter_settings_get_default ();
-  gint i;
-
-  if (name == NULL || *name == '\0')
-    return;
-
-  if (setting == NULL)
-    return;
-
-  g_object_freeze_notify (G_OBJECT (settings));
-
-  for (i = 0; i < _n_clutter_settings_map; i++)
-    {
-      if (g_strcmp0 (name, CLUTTER_SETTING_X11_NAME (i)) == 0)
-        {
-          GValue value = G_VALUE_INIT;
-
-          switch (setting->type)
-            {
-            case XSETTINGS_TYPE_INT:
-              g_value_init (&value, G_TYPE_INT);
-              g_value_set_int (&value, setting->data.v_int);
-              break;
-
-            case XSETTINGS_TYPE_STRING:
-              g_value_init (&value, G_TYPE_STRING);
-              g_value_set_string (&value, setting->data.v_string);
-              break;
-
-            case XSETTINGS_TYPE_COLOR:
-              {
-                ClutterColor color;
-
-                color.red   = (guint8) ((float) setting->data.v_color.red
-                            / 65535.0 * 255);
-                color.green = (guint8) ((float) setting->data.v_color.green
-                            / 65535.0 * 255);
-                color.blue  = (guint8) ((float) setting->data.v_color.blue
-                            / 65535.0 * 255);
-                color.alpha = (guint8) ((float) setting->data.v_color.alpha
-                            / 65535.0 * 255);
-
-                g_value_init (&value, G_TYPE_BOXED);
-                clutter_value_set_color (&value, &color);
-              }
-              break;
-            }
-
-          CLUTTER_NOTE (BACKEND,
-                        "Mapping XSETTING '%s' to 'ClutterSettings:%s'",
-                        CLUTTER_SETTING_X11_NAME (i),
-                        CLUTTER_SETTING_PROPERTY (i));
-
-          clutter_settings_set_property_internal (settings,
-                                                  CLUTTER_SETTING_PROPERTY (i),
-                                                  &value);
-
-          g_value_unset (&value);
-
-          break;
-        }
-    }
-
-  g_object_thaw_notify (G_OBJECT (settings));
-}
-
 static gboolean
 clutter_backend_x11_pre_parse (ClutterBackend  *backend,
                                GError         **error)
@@ -312,17 +221,6 @@ clutter_backend_x11_post_parse (ClutterBackend  *backend,
 
   backend_x11->display_name = g_strdup (clutter_display_name);
 
-  /* create XSETTINGS client */
-  backend_x11->xsettings =
-    _clutter_xsettings_client_new (backend_x11->xdpy,
-                                   backend_x11->xscreen_num,
-                                   clutter_backend_x11_xsettings_notify,
-                                   NULL,
-                                   backend_x11);
-
-  /* add event filter for XSETTINGS events */
-  clutter_x11_add_filter (xsettings_filter, backend_x11);
-
   if (clutter_synchronise)
     XSynchronize (backend_x11->xdpy, True);
 
@@ -398,9 +296,6 @@ clutter_backend_x11_finalize (GObject *gobject)
 
   clutter_x11_remove_filter (cogl_xlib_filter, gobject);
 
-  clutter_x11_remove_filter (xsettings_filter, backend_x11);
-  _clutter_xsettings_client_destroy (backend_x11->xsettings);
-
   XCloseDisplay (backend_x11->xdpy);
 
   G_OBJECT_CLASS (clutter_backend_x11_parent_class)->finalize (gobject);
diff --git a/clutter/clutter/x11/clutter-backend-x11.h b/clutter/clutter/x11/clutter-backend-x11.h
index d08c5409d..84db2e254 100644
--- a/clutter/clutter/x11/clutter-backend-x11.h
+++ b/clutter/clutter/x11/clutter-backend-x11.h
@@ -31,8 +31,6 @@
 
 #include "clutter-backend-private.h"
 
-#include "xsettings/xsettings-client.h"
-
 G_BEGIN_DECLS
 
 #define CLUTTER_TYPE_BACKEND_X11                (clutter_backend_x11_get_type ())
@@ -85,9 +83,6 @@ struct _ClutterBackendX11
   Atom atom_UTF8_STRING;
 
   Time last_event_time;
-
-  XSettingsClient *xsettings;
-  Window xsettings_xwin;
 };
 
 struct _ClutterBackendX11Class
diff --git a/clutter/clutter/x11/clutter-settings-x11.h b/clutter/clutter/x11/clutter-settings-x11.h
deleted file mode 100644
index b678416a0..000000000
--- a/clutter/clutter/x11/clutter-settings-x11.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef __CLUTTER_SETTINGS_X11_H__
-#define __CLUTTER_SETTINGS_X11_H__
-
-/* XSETTINGS key names to ClutterSettings properties */
-static const struct {
-  const char *xsetting_name;
-  const char *settings_property;
-} _clutter_settings_map[] = {
-  { "Net/DoubleClickDistance", "double-click-distance" },
-  { "Net/DndDragThreshold",    "dnd-drag-threshold" },
-};
-
-static const gint _n_clutter_settings_map = G_N_ELEMENTS (_clutter_settings_map);
-
-#define CLUTTER_SETTING_X11_NAME(id)    (_clutter_settings_map[(id)].xsetting_name)
-#define CLUTTER_SETTING_PROPERTY(id)    (_clutter_settings_map[(id)].settings_property)
-
-#endif /* __CLUTTER_SETTINGS_X11_H__ */
diff --git a/clutter/clutter/x11/xsettings/xsettings-client.c b/clutter/clutter/x11/xsettings/xsettings-client.c
deleted file mode 100644
index 120809c65..000000000
--- a/clutter/clutter/x11/xsettings/xsettings-client.c
+++ /dev/null
@@ -1,609 +0,0 @@
-/*
- * Copyright © 2001, 2007 Red Hat, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Red Hat not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission.  Red Hat makes no representations about the
- * suitability of this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- *
- * RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL RED HAT
- * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN 
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Author:  Owen Taylor, Red Hat, Inc.
- */
-#include "clutter-build-config.h"
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <X11/Xlib.h>
-#include <X11/Xmd.h>		/* For CARD16 */
-
-#include "xsettings-client.h"
-
-struct _XSettingsClient
-{
-  Display *display;
-  int screen;
-  XSettingsNotifyFunc notify;
-  XSettingsWatchFunc watch;
-  void *cb_data;
-
-  XSettingsGrabFunc grab;
-  XSettingsGrabFunc ungrab;
-
-  Window manager_window;
-  Atom manager_atom;
-  Atom selection_atom;
-  Atom xsettings_atom;
-
-  XSettingsList *settings;
-};
-
-static void
-notify_changes (XSettingsClient *client,
-		XSettingsList   *old_list)
-{
-  XSettingsList *old_iter = old_list;
-  XSettingsList *new_iter = client->settings;
-
-  if (!client->notify)
-    return;
-
-  while (old_iter || new_iter)
-    {
-      int cmp;
-      
-      if (old_iter && new_iter)
-	cmp = strcmp (old_iter->setting->name, new_iter->setting->name);
-      else if (old_iter)
-	cmp = -1;
-      else
-	cmp = 1;
-
-      if (cmp < 0)
-	{
-	  client->notify (old_iter->setting->name,
-			  XSETTINGS_ACTION_DELETED,
-			  NULL,
-			  client->cb_data);
-	}
-      else if (cmp == 0)
-	{
-	  if (!xsettings_setting_equal (old_iter->setting,
-					new_iter->setting))
-	    client->notify (old_iter->setting->name,
-			    XSETTINGS_ACTION_CHANGED,
-			    new_iter->setting,
-			    client->cb_data);
-	}
-      else
-	{
-	  client->notify (new_iter->setting->name,
-			  XSETTINGS_ACTION_NEW,
-			  new_iter->setting,
-			  client->cb_data);
-	}
-
-      if (old_iter)
-	old_iter = old_iter->next;
-      if (new_iter)
-	new_iter = new_iter->next;
-    }
-}
-
-static int
-ignore_errors (Display *display, XErrorEvent *event)
-{
-  return True;
-}
-
-static char local_byte_order = '\0';
-
-#define BYTES_LEFT(buffer) ((buffer)->data + (buffer)->len - (buffer)->pos)
-
-static XSettingsResult
-fetch_card16 (XSettingsBuffer *buffer,
-	      CARD16          *result)
-{
-  CARD16 x;
-
-  if (BYTES_LEFT (buffer) < 2)
-    return XSETTINGS_ACCESS;
-
-  x = *(CARD16 *)buffer->pos;
-  buffer->pos += 2;
-  
-  if (buffer->byte_order == local_byte_order)
-    *result = x;
-  else
-    *result = (x << 8) | (x >> 8);
-
-  return XSETTINGS_SUCCESS;
-}
-
-static XSettingsResult
-fetch_ushort (XSettingsBuffer *buffer,
-	      unsigned short  *result) 
-{
-  CARD16 x;
-  XSettingsResult r;  
-
-  r = fetch_card16 (buffer, &x);
-  if (r == XSETTINGS_SUCCESS)
-    *result = x;
-
-  return r;
-}
-
-static XSettingsResult
-fetch_card32 (XSettingsBuffer *buffer,
-	      CARD32          *result)
-{
-  CARD32 x;
-
-  if (BYTES_LEFT (buffer) < 4)
-    return XSETTINGS_ACCESS;
-
-  x = *(CARD32 *)buffer->pos;
-  buffer->pos += 4;
-  
-  if (buffer->byte_order == local_byte_order)
-    *result = x;
-  else
-    *result = (x << 24) | ((x & 0xff00) << 8) | ((x & 0xff0000) >> 8) | (x >> 24);
-  
-  return XSETTINGS_SUCCESS;
-}
-
-static XSettingsResult
-fetch_card8 (XSettingsBuffer *buffer,
-	     CARD8           *result)
-{
-  if (BYTES_LEFT (buffer) < 1)
-    return XSETTINGS_ACCESS;
-
-  *result = *(CARD8 *)buffer->pos;
-  buffer->pos += 1;
-
-  return XSETTINGS_SUCCESS;
-}
-
-#define XSETTINGS_PAD(n,m) ((n + m - 1) & (~(m-1)))
-
-static XSettingsList *
-parse_settings (unsigned char *data,
-		size_t         len)
-{
-  XSettingsBuffer buffer = { 0 };
-  XSettingsResult result = XSETTINGS_SUCCESS;
-  XSettingsList *settings = NULL;
-  CARD32 serial;
-  CARD32 n_entries;
-  CARD32 i;
-  XSettingsSetting *setting = NULL;
-  
-  local_byte_order = xsettings_byte_order ();
-
-  buffer.pos = buffer.data = data;
-  buffer.len = len;
-  
-  result = fetch_card8 (&buffer, (unsigned char *)&buffer.byte_order);
-  if (buffer.byte_order != MSBFirst &&
-      buffer.byte_order != LSBFirst)
-    {
-      fprintf (stderr, "Invalid byte order in XSETTINGS property\n");
-      result = XSETTINGS_FAILED;
-      goto out;
-    }
-
-  buffer.pos += 3;
-
-  result = fetch_card32 (&buffer, &serial);
-  if (result != XSETTINGS_SUCCESS)
-    goto out;
-
-  result = fetch_card32 (&buffer, &n_entries);
-  if (result != XSETTINGS_SUCCESS)
-    goto out;
-
-  for (i = 0; i < n_entries; i++)
-    {
-      CARD8 type;
-      CARD16 name_len;
-      CARD32 v_int;
-      size_t pad_len;
-      
-      result = fetch_card8 (&buffer, &type);
-      if (result != XSETTINGS_SUCCESS)
-	goto out;
-
-      buffer.pos += 1;
-
-      result = fetch_card16 (&buffer, &name_len);
-      if (result != XSETTINGS_SUCCESS)
-	goto out;
-
-      pad_len = XSETTINGS_PAD(name_len, 4);
-      if (BYTES_LEFT (&buffer) < pad_len)
-	{
-	  result = XSETTINGS_ACCESS;
-	  goto out;
-	}
-
-      setting = malloc (sizeof *setting);
-      if (!setting)
-	{
-	  result = XSETTINGS_NO_MEM;
-	  goto out;
-	}
-      setting->type = XSETTINGS_TYPE_INT; /* No allocated memory */
-
-      setting->name = malloc (name_len + 1);
-      if (!setting->name)
-	{
-	  result = XSETTINGS_NO_MEM;
-	  goto out;
-	}
-
-      memcpy (setting->name, buffer.pos, name_len);
-      setting->name[name_len] = '\0';
-      buffer.pos += pad_len;
-
-      result = fetch_card32 (&buffer, &v_int);
-      if (result != XSETTINGS_SUCCESS)
-	goto out;
-      setting->last_change_serial = v_int;
-
-      switch (type)
-	{
-	case XSETTINGS_TYPE_INT:
-	  result = fetch_card32 (&buffer, &v_int);
-	  if (result != XSETTINGS_SUCCESS)
-	    goto out;
-
-	  setting->data.v_int = (INT32)v_int;
-	  break;
-	case XSETTINGS_TYPE_STRING:
-	  result = fetch_card32 (&buffer, &v_int);
-	  if (result != XSETTINGS_SUCCESS)
-	    goto out;
-
-	  pad_len = XSETTINGS_PAD (v_int, 4);
-	  if (v_int + 1 == 0 || /* Guard against wrap-around */
-	      BYTES_LEFT (&buffer) < pad_len)
-	    {
-	      result = XSETTINGS_ACCESS;
-	      goto out;
-	    }
-
-	  setting->data.v_string = malloc (v_int + 1);
-	  if (!setting->data.v_string)
-	    {
-	      result = XSETTINGS_NO_MEM;
-	      goto out;
-	    }
-	  
-	  memcpy (setting->data.v_string, buffer.pos, v_int);
-	  setting->data.v_string[v_int] = '\0';
-	  buffer.pos += pad_len;
-
-	  break;
-	case XSETTINGS_TYPE_COLOR:
-	  result = fetch_ushort (&buffer, &setting->data.v_color.red);
-	  if (result != XSETTINGS_SUCCESS)
-	    goto out;
-	  result = fetch_ushort (&buffer, &setting->data.v_color.green);
-	  if (result != XSETTINGS_SUCCESS)
-	    goto out;
-	  result = fetch_ushort (&buffer, &setting->data.v_color.blue);
-	  if (result != XSETTINGS_SUCCESS)
-	    goto out;
-	  result = fetch_ushort (&buffer, &setting->data.v_color.alpha);
-	  if (result != XSETTINGS_SUCCESS)
-	    goto out;
-
-	  break;
-	default:
-	  /* Quietly ignore unknown types */
-	  break;
-	}
-
-      setting->type = type;
-
-      result = xsettings_list_insert (&settings, setting);
-      if (result != XSETTINGS_SUCCESS)
-	goto out;
-
-      setting = NULL;
-    }
-
- out:
-
-  if (result != XSETTINGS_SUCCESS)
-    {
-      switch (result)
-	{
-	case XSETTINGS_NO_MEM:
-	  fprintf(stderr, "Out of memory reading XSETTINGS property\n");
-	  break;
-	case XSETTINGS_ACCESS:
-	  fprintf(stderr, "Invalid XSETTINGS property (read off end)\n");
-	  break;
-	case XSETTINGS_DUPLICATE_ENTRY:
-	  fprintf (stderr, "Duplicate XSETTINGS entry for '%s'\n", setting->name);
-	case XSETTINGS_FAILED:
-	case XSETTINGS_SUCCESS:
-	case XSETTINGS_NO_ENTRY:
-	  break;
-	}
-
-      if (setting)
-	xsettings_setting_free (setting);
-
-      xsettings_list_free (settings);
-      settings = NULL;
-
-    }
-
-  return settings;
-}
-
-static void
-read_settings (XSettingsClient *client)
-{
-  Atom type;
-  int format;
-  unsigned long n_items;
-  unsigned long bytes_after;
-  unsigned char *data;
-  int result;
-
-  int (*old_handler) (Display *, XErrorEvent *);
-  
-  XSettingsList *old_list = client->settings;
-
-  client->settings = NULL;
-
-  if (client->manager_window)
-    {
-      old_handler = XSetErrorHandler (ignore_errors);
-      result = XGetWindowProperty (client->display, client->manager_window,
-				   client->xsettings_atom, 0, LONG_MAX,
-				   False, client->xsettings_atom,
-				   &type, &format, &n_items, &bytes_after, &data);
-      XSetErrorHandler (old_handler);
-      
-      if (result == Success && type != None)
-	{
-	  if (type != client->xsettings_atom)
-	    {
-	      fprintf (stderr, "Invalid type for XSETTINGS property");
-	    }
-	  else if (format != 8)
-	    {
-	      fprintf (stderr, "Invalid format for XSETTINGS property %d", format);
-	    }
-	  else
-	    client->settings = parse_settings (data, n_items);
-	  
-	  XFree (data);
-	}
-    }
-
-  notify_changes (client, old_list);
-  xsettings_list_free (old_list);
-}
-
-static void
-add_events (Display *display,
-	    Window   window,
-	    long     mask)
-{
-  XWindowAttributes attr;
-
-  XGetWindowAttributes (display, window, &attr);
-  XSelectInput (display, window, attr.your_event_mask | mask);
-}
-
-static void
-check_manager_window (XSettingsClient *client)
-{
-  if (client->manager_window && client->watch)
-    client->watch (client->manager_window, False, 0, client->cb_data);
-
-  if (client->grab)
-    client->grab (client->display);
-  else
-    XGrabServer (client->display);
-
-  client->manager_window = XGetSelectionOwner (client->display,
-					       client->selection_atom);
-  if (client->manager_window)
-    XSelectInput (client->display, client->manager_window,
-		  PropertyChangeMask | StructureNotifyMask);
-
-  if (client->ungrab)
-    client->ungrab (client->display);
-  else
-    XUngrabServer (client->display);
-  
-  XFlush (client->display);
-
-  if (client->manager_window && client->watch)
-    {
-      if (!client->watch (client->manager_window, True, 
-			  PropertyChangeMask | StructureNotifyMask,
-			  client->cb_data))
-	{
-	  /* Inability to watch the window probably means that it was destroyed
-	   * after we ungrabbed
-	   */
-	  client->manager_window = None;
-	  return;
-	}
-    }
-      
-  
-  read_settings (client);
-}
-
-XSettingsClient *
-xsettings_client_new (Display             *display,
-		      int                  screen,
-		      XSettingsNotifyFunc  notify,
-		      XSettingsWatchFunc   watch,
-		      void                *cb_data)
-{
-  return xsettings_client_new_with_grab_funcs (display, screen, notify, watch, cb_data,
-                                               NULL, NULL);
-}
-
-XSettingsClient *
-xsettings_client_new_with_grab_funcs (Display             *display,
-		                      int                  screen,
-		                      XSettingsNotifyFunc  notify,
-		                      XSettingsWatchFunc   watch,
-		                      void                *cb_data,
-		                      XSettingsGrabFunc    grab,
-		                      XSettingsGrabFunc    ungrab)
-{
-  XSettingsClient *client;
-  char buffer[256];
-  const char *atom_names[3];
-  Atom atoms[3];
-  
-  client = malloc (sizeof *client);
-  if (!client)
-    return NULL;
-
-  client->display = display;
-  client->screen = screen;
-  client->notify = notify;
-  client->watch = watch;
-  client->cb_data = cb_data;
-  client->grab = grab;
-  client->ungrab = ungrab;
-  
-  client->manager_window = None;
-  client->settings = NULL;
-
-  sprintf(buffer, "_XSETTINGS_S%d", screen);
-  atom_names[0] = buffer;
-  atom_names[1] = "_XSETTINGS_SETTINGS";
-  atom_names[2] = "MANAGER";
-
-#ifdef HAVE_XINTERNATOMS
-  XInternAtoms (display, atom_names, 3, False, atoms);
-#else
-  atoms[0] = XInternAtom (display, atom_names[0], False);
-  atoms[1] = XInternAtom (display, atom_names[1], False);
-  atoms[2] = XInternAtom (display, atom_names[2], False);
-#endif
-  
-  client->selection_atom = atoms[0];
-  client->xsettings_atom = atoms[1];
-  client->manager_atom = atoms[2];
-
-  /* Select on StructureNotify so we get MANAGER events
-   */
-  add_events (display, RootWindow (display, screen), StructureNotifyMask);
-
-  if (client->watch)
-    client->watch (RootWindow (display, screen), True, StructureNotifyMask,
-		   client->cb_data);
-
-  check_manager_window (client);
-
-  return client;
-}
-
-
-void
-xsettings_client_set_grab_func   (XSettingsClient      *client,
-				  XSettingsGrabFunc     grab)
-{
-  client->grab = grab;
-}
-
-void
-xsettings_client_set_ungrab_func (XSettingsClient      *client,
-				  XSettingsGrabFunc     ungrab)
-{
-  client->ungrab = ungrab;
-}
-
-void
-xsettings_client_destroy (XSettingsClient *client)
-{
-  if (client->watch)
-    client->watch (RootWindow (client->display, client->screen),
-		   False, 0, client->cb_data);
-  if (client->manager_window && client->watch)
-    client->watch (client->manager_window, False, 0, client->cb_data);
-  
-  xsettings_list_free (client->settings);
-  free (client);
-}
-
-XSettingsResult
-xsettings_client_get_setting (XSettingsClient   *client,
-			      const char        *name,
-			      XSettingsSetting **setting)
-{
-  XSettingsSetting *search = xsettings_list_lookup (client->settings, name);
-  if (search)
-    {
-      *setting = xsettings_setting_copy (search);
-      return *setting ? XSETTINGS_SUCCESS : XSETTINGS_NO_MEM;
-    }
-  else
-    return XSETTINGS_NO_ENTRY;
-}
-
-Bool
-xsettings_client_process_event (XSettingsClient *client,
-				XEvent          *xev)
-{
-  /* The checks here will not unlikely cause us to reread
-   * the properties from the manager window a number of
-   * times when the manager changes from A->B. But manager changes
-   * are going to be pretty rare.
-   */
-  if (xev->xany.window == RootWindow (client->display, client->screen))
-    {
-      if (xev->xany.type == ClientMessage &&
-	  xev->xclient.message_type == client->manager_atom &&
-	  xev->xclient.data.l[1] == client->selection_atom)
-	{
-	  check_manager_window (client);
-	  return True;
-	}
-    }
-  else if (xev->xany.window == client->manager_window)
-    {
-      if (xev->xany.type == DestroyNotify)
-	{
-	  check_manager_window (client);
-          /* let GDK do its cleanup */
-	  return False; 
-	}
-      else if (xev->xany.type == PropertyNotify)
-	{
-	  read_settings (client);
-	  return True;
-	}
-    }
-  
-  return False;
-}
diff --git a/clutter/clutter/x11/xsettings/xsettings-client.h b/clutter/clutter/x11/xsettings/xsettings-client.h
deleted file mode 100644
index 710ed1248..000000000
--- a/clutter/clutter/x11/xsettings/xsettings-client.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright © 2001, 2007 Red Hat, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Red Hat not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission.  Red Hat makes no representations about the
- * suitability of this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- *
- * RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL RED HAT
- * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN 
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Author:  Owen Taylor, Red Hat, Inc.
- */
-#ifndef XSETTINGS_CLIENT_H
-#define XSETTINGS_CLIENT_H
-
-#include <X11/Xlib.h>
-#include "xsettings-common.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-typedef struct _XSettingsClient XSettingsClient;
-
-typedef enum 
-{
-  XSETTINGS_ACTION_NEW,
-  XSETTINGS_ACTION_CHANGED,
-  XSETTINGS_ACTION_DELETED
-} XSettingsAction;
-
-typedef void (*XSettingsNotifyFunc) (const char       *name,
-				     XSettingsAction   action,
-				     XSettingsSetting *setting,
-				     void             *cb_data);
-typedef Bool (*XSettingsWatchFunc)  (Window            window,
-				     Bool              is_start,
-				     long              mask,
-				     void             *cb_data);
-typedef void (*XSettingsGrabFunc)   (Display          *display);
-
-XSettingsClient *xsettings_client_new             (Display             *display,
-						   int                  screen,
-						   XSettingsNotifyFunc  notify,
-						   XSettingsWatchFunc   watch,
-						   void                *cb_data);
-XSettingsClient *xsettings_client_new_with_grab_funcs (Display             *display,
-						       int                  screen,
-						       XSettingsNotifyFunc  notify,
-						       XSettingsWatchFunc   watch,
-						       void                *cb_data,
-                                                       XSettingsGrabFunc    grab,
-                                                       XSettingsGrabFunc    ungrab);
-void             xsettings_client_set_grab_func   (XSettingsClient     *client,
-						   XSettingsGrabFunc    grab);
-void             xsettings_client_set_ungrab_func (XSettingsClient     *client,
-						   XSettingsGrabFunc    ungrab);
-void             xsettings_client_destroy         (XSettingsClient     *client);
-Bool             xsettings_client_process_event   (XSettingsClient     *client,
-						   XEvent              *xev);
-XSettingsResult  xsettings_client_get_setting     (XSettingsClient     *client,
-						   const char          *name,
-						   XSettingsSetting   **setting);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* XSETTINGS_CLIENT_H */
diff --git a/clutter/clutter/x11/xsettings/xsettings-common.c b/clutter/clutter/x11/xsettings/xsettings-common.c
deleted file mode 100644
index 8a9bcc07d..000000000
--- a/clutter/clutter/x11/xsettings/xsettings-common.c
+++ /dev/null
@@ -1,265 +0,0 @@
-/*
- * Copyright © 2001 Red Hat, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Red Hat not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission.  Red Hat makes no representations about the
- * suitability of this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- *
- * RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL RED HAT
- * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN 
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Author:  Owen Taylor, Red Hat, Inc.
- */
-#include "clutter-build-config.h"
-#include "string.h"
-#include "stdlib.h"
-
-#include <X11/Xlib.h>
-#include <X11/Xmd.h>		/* For CARD32 */
-
-#include "xsettings-common.h"
-
-XSettingsSetting *
-xsettings_setting_copy (XSettingsSetting *setting)
-{
-  XSettingsSetting *result;
-  size_t str_len;
-  
-  result = malloc (sizeof *result);
-  if (!result)
-    return NULL;
-
-  str_len = strlen (setting->name);
-  result->name = malloc (str_len + 1);
-  if (!result->name)
-    goto err;
-
-  memcpy (result->name, setting->name, str_len + 1);
-
-  result->type = setting->type;
-
-  switch (setting->type)
-    {
-    case XSETTINGS_TYPE_INT:
-      result->data.v_int = setting->data.v_int;
-      break;
-    case XSETTINGS_TYPE_COLOR:
-      result->data.v_color = setting->data.v_color;
-      break;
-    case XSETTINGS_TYPE_STRING:
-      str_len = strlen (setting->data.v_string);
-      result->data.v_string = malloc (str_len + 1);
-      if (!result->data.v_string)
-	goto err;
-
-      memcpy (result->data.v_string, setting->data.v_string, str_len + 1);
-      break;
-    }
-
-  result->last_change_serial = setting->last_change_serial;
-
-  return result;
-
- err:
-  if (result->name)
-    free (result->name);
-  free (result);
-  
-  return NULL;
-}
-
-XSettingsList *
-xsettings_list_copy (XSettingsList *list)
-{
-  XSettingsList *new = NULL;
-  XSettingsList *old_iter = list;
-  XSettingsList *new_iter = NULL;
-
-  while (old_iter)
-    {
-      XSettingsList *new_node;
-
-      new_node = malloc (sizeof *new_node);
-      if (!new_node)
-	goto error;
-
-      new_node->setting = xsettings_setting_copy (old_iter->setting);
-      if (!new_node->setting)
-	{
-	  free (new_node);
-	  goto error;
-	}
-
-      if (new_iter)
-	new_iter->next = new_node;
-      else
-	new = new_node;
-
-      new_iter = new_node;
-      
-      old_iter = old_iter->next;
-    }
-
-  return new;
-
- error:
-  xsettings_list_free (new);
-  return NULL;
-}
-
-int
-xsettings_setting_equal (XSettingsSetting *setting_a,
-			 XSettingsSetting *setting_b)
-{
-  if (setting_a->type != setting_b->type)
-    return 0;
-
-  if (strcmp (setting_a->name, setting_b->name) != 0)
-    return 0;
-
-  switch (setting_a->type)
-    {
-    case XSETTINGS_TYPE_INT:
-      return setting_a->data.v_int == setting_b->data.v_int;
-    case XSETTINGS_TYPE_COLOR:
-      return (setting_a->data.v_color.red == setting_b->data.v_color.red &&
-	      setting_a->data.v_color.green == setting_b->data.v_color.green &&
-	      setting_a->data.v_color.blue == setting_b->data.v_color.blue &&
-	      setting_a->data.v_color.alpha == setting_b->data.v_color.alpha);
-    case XSETTINGS_TYPE_STRING:
-      return strcmp (setting_a->data.v_string, setting_b->data.v_string) == 0;
-    }
-
-  return 0;
-}
-
-void
-xsettings_setting_free (XSettingsSetting *setting)
-{
-  if (setting->type == XSETTINGS_TYPE_STRING)
-    free (setting->data.v_string);
-
-  if (setting->name)
-    free (setting->name);
-  
-  free (setting);
-}
-
-void
-xsettings_list_free (XSettingsList *list)
-{
-  while (list)
-    {
-      XSettingsList *next = list->next;
-
-      xsettings_setting_free (list->setting);
-      free (list);
-
-      list = next;
-    }
-}
-
-XSettingsResult
-xsettings_list_insert (XSettingsList    **list,
-		       XSettingsSetting  *setting)
-{
-  XSettingsList *node;
-  XSettingsList *iter;
-  XSettingsList *last = NULL;
-
-  node = malloc (sizeof *node);
-  if (!node)
-    return XSETTINGS_NO_MEM;
-  node->setting = setting;
-
-  iter = *list;
-  while (iter)
-    {
-      int cmp = strcmp (setting->name, iter->setting->name);
-
-      if (cmp < 0)
-	break;
-      else if (cmp == 0)
-	{
-	  free (node);
-	  return XSETTINGS_DUPLICATE_ENTRY;
-	}
-
-      last = iter;
-      iter = iter->next;
-    }
-  
-  if (last)
-    last->next = node;
-  else
-    *list = node;
-  
-  node->next = iter;
-  
-  return XSETTINGS_SUCCESS;
-}
-
-XSettingsResult
-xsettings_list_delete (XSettingsList **list,
-		       const char     *name)
-{
-  XSettingsList *iter;
-  XSettingsList *last = NULL;
-
-  iter = *list;
-  while (iter)
-    {
-      if (strcmp (name, iter->setting->name) == 0)
-	{
-	  if (last)
-	    last->next = iter->next;
-	  else
-	    *list = iter->next;
-  
-	  xsettings_setting_free (iter->setting);
-	  free (iter);
-
-	  return XSETTINGS_SUCCESS;
-	}
-
-      last = iter;
-      iter = iter->next;
-    }
-
-  return XSETTINGS_FAILED;
-}
-
-XSettingsSetting *
-xsettings_list_lookup (XSettingsList *list,
-		       const char    *name)
-{
-  XSettingsList *iter;
-
-  iter = list;
-  while (iter)
-    {
-      if (strcmp (name, iter->setting->name) == 0)
-	return iter->setting;
-
-      iter = iter->next;
-    }
-
-  return NULL;
-}
-
-char
-xsettings_byte_order (void)
-{
-  CARD32 myint = 0x01020304;
-  return (*(char *)&myint == 1) ? MSBFirst : LSBFirst;
-}
diff --git a/clutter/clutter/x11/xsettings/xsettings-common.h b/clutter/clutter/x11/xsettings/xsettings-common.h
deleted file mode 100644
index d8b544b36..000000000
--- a/clutter/clutter/x11/xsettings/xsettings-common.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright © 2001 Red Hat, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Red Hat not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission.  Red Hat makes no representations about the
- * suitability of this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- *
- * RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL RED HAT
- * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN 
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Author:  Owen Taylor, Red Hat, Inc.
- *
- * Modified by:  Emmanuele Bassi, Intel Corp.
- */
-#ifndef XSETTINGS_COMMON_H
-#define XSETTINGS_COMMON_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/* Renames for Clutter inclusion */
-
-#define xsettings_byte_order             _clutter_xsettings_byte_order
-#define xsettings_client_destroy         _clutter_xsettings_client_destroy
-#define xsettings_client_get_setting     _clutter_xsettings_client_get_setting
-#define xsettings_client_new             _clutter_xsettings_client_new
-#define xsettings_client_new_with_grab_funcs _clutter_xsettings_client_new_with_grab_funcs
-#define xsettings_client_set_grab_func   _clutter_xsettings_client_set_grab_func
-#define xsettings_client_set_ungrab_func _clutter_xsettings_client_set_ungrab_func
-#define xsettings_client_process_event   _clutter_xsettings_client_process_event
-#define xsettings_list_copy              _clutter_xsettings_list_copy
-#define xsettings_list_delete            _clutter_xsettings_list_delete
-#define xsettings_list_free              _clutter_xsettings_list_free
-#define xsettings_list_insert            _clutter_xsettings_list_insert
-#define xsettings_list_lookup            _clutter_xsettings_list_lookup
-#define xsettings_setting_copy           _clutter_xsettings_setting_copy
-#define xsettings_setting_equal          _clutter_xsettings_setting_equal
-#define xsettings_setting_free           _clutter_xsettings_setting_free
-
-
-typedef struct _XSettingsBuffer  XSettingsBuffer;
-typedef struct _XSettingsColor   XSettingsColor;
-typedef struct _XSettingsList    XSettingsList;
-typedef struct _XSettingsSetting XSettingsSetting;
-
-/* Types of settings possible. Enum values correspond to
- * protocol values.
- */
-typedef enum 
-{
-  XSETTINGS_TYPE_INT     = 0,
-  XSETTINGS_TYPE_STRING  = 1,
-  XSETTINGS_TYPE_COLOR   = 2
-} XSettingsType;
-
-typedef enum
-{
-  XSETTINGS_SUCCESS,
-  XSETTINGS_NO_MEM,
-  XSETTINGS_ACCESS,
-  XSETTINGS_FAILED,
-  XSETTINGS_NO_ENTRY,
-  XSETTINGS_DUPLICATE_ENTRY
-} XSettingsResult;
-
-struct _XSettingsBuffer
-{
-  char byte_order;
-  size_t len;
-  unsigned char *data;
-  unsigned char *pos;
-};
-
-struct _XSettingsColor
-{
-  unsigned short red, green, blue, alpha;
-};
-
-struct _XSettingsList
-{
-  XSettingsSetting *setting;
-  XSettingsList *next;
-};
-
-struct _XSettingsSetting
-{
-  char *name;
-  XSettingsType type;
-  
-  union {
-    int v_int;
-    char *v_string;
-    XSettingsColor v_color;
-  } data;
-
-  unsigned long last_change_serial;
-};
-
-XSettingsSetting *xsettings_setting_copy  (XSettingsSetting *setting);
-void              xsettings_setting_free  (XSettingsSetting *setting);
-int               xsettings_setting_equal (XSettingsSetting *setting_a,
-					   XSettingsSetting *setting_b);
-
-void              xsettings_list_free   (XSettingsList     *list);
-XSettingsList    *xsettings_list_copy   (XSettingsList     *list);
-XSettingsResult   xsettings_list_insert (XSettingsList    **list,
-					 XSettingsSetting  *setting);
-XSettingsSetting *xsettings_list_lookup (XSettingsList     *list,
-					 const char        *name);
-XSettingsResult   xsettings_list_delete (XSettingsList    **list,
-					 const char        *name);
-
-char xsettings_byte_order (void);
-
-#define XSETTINGS_PAD(n,m) ((n + m - 1) & (~(m-1)))
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* XSETTINGS_COMMON_H */