[Xfce4-commits] <xfce4-settings:master> Remove the standalone xsettings daemon.

Nick Schermer noreply at xfce.org
Mon Feb 28 17:16:01 CET 2011


Updating branch refs/heads/master
         to 0122fde699de1c49748d09016c1447bd3eb7e647 (commit)
       from 01e0b356974a02b0b3ae0559810189a011c187e6 (commit)

commit 0122fde699de1c49748d09016c1447bd3eb7e647
Author: Nick Schermer <nick at xfce.org>
Date:   Tue Feb 22 22:25:07 2011 +0100

    Remove the standalone xsettings daemon.
    
    It will be merged in the helper in the next commit.

 Makefile.am               |    1 -
 configure.ac.in           |   11 -
 po/POTFILES.in            |    2 -
 xfsettingsd/Makefile.am   |   49 ---
 xfsettingsd/main.c        |  217 ------------
 xfsettingsd/registry.c    |  863 ---------------------------------------------
 xfsettingsd/registry.h    |   89 -----
 xfsettingsd/xsettings.xml |   11 -
 8 files changed, 0 insertions(+), 1243 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 5008100..4d1a319 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,6 @@ SUBDIRS = \
 	xfce4-settings-helper \
 	xfce4-settings-manager \
 	xfce4-settings-editor \
-	xfsettingsd \
 	po
 
 EXTRA_DIST = \
diff --git a/configure.ac.in b/configure.ac.in
index 8f50f80..6b1735a 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -151,16 +151,6 @@ XDT_CHECK_OPTIONAL_PACKAGE([LIBXKLAVIER4], [libxklavier], [4.0],
 XDT_CHECK_OPTIONAL_PACKAGE([LIBXKLAVIER5], [libxklavier], [5.0],
                            [libxklavier], [Keyboard layout selection])
 
-dnl ************************************
-dnl *** Xsettings daemon is optional ***
-dnl ************************************
-AC_ARG_ENABLE([xsettings-daemon],
-              [AC_HELP_STRING([--disable-xsettings-daemon],
-                              [Build the XSETTINGS daemon (default=enabled)])],
-              [build_xfsettingsd=$enableval],
-              [build_xfsettingsd=yes])
-AM_CONDITIONAL([BUILD_XFSETTINGSD], [test "x$build_xfsettingsd" = "xyes"])
-
 dnl make pluggable settings dialogs optional
 AC_ARG_ENABLE([pluggable-dialogs],
               [AC_HELP_STRING([--enable-pluggable-dialogs],
@@ -224,7 +214,6 @@ dialogs/mouse-settings/Makefile
 xfce4-settings-helper/Makefile
 xfce4-settings-manager/Makefile
 xfce4-settings-editor/Makefile
-xfsettingsd/Makefile
 ])
 
 dnl ***************************
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 8766ce6..462ad59 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -39,5 +39,3 @@ xfce4-settings-manager/main.c
 xfce4-settings-manager/xfce-settings-manager-dialog.c
 xfce4-settings-manager/xfce-settings-manager.desktop.in
 xfce4-settings-manager/xfce-text-renderer.c
-
-xfsettingsd/main.c
diff --git a/xfsettingsd/Makefile.am b/xfsettingsd/Makefile.am
deleted file mode 100644
index 3c1c679..0000000
--- a/xfsettingsd/Makefile.am
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id$
-
-if BUILD_XFSETTINGSD
-
-INCLUDES = \
-	-I${top_srcdir} \
-	-DDATADIR=\"$(datadir)\" \
-	-DBINDIR=\"$(bindir)\" \
-	-DSRCDIR=\"$(top_srcdir)\" \
-	-DLOCALEDIR=\"$(localedir)\" \
-	-DG_LOG_DOMAIN=\"xfsettingsd\" \
-	$(PLATFORM_CPPFLAGS)
-
-bin_PROGRAMS = \
-	xfsettingsd
-
-xfsettingsd_SOURCES = \
-	main.c \
-	registry.c \
-	registry.h
-
-xfsettingsd_CFLAGS = \
-	$(GTK_CFLAGS) \
-	$(GLIB_CFLAGS) \
-	$(LIBNOTIFY_CFLAGS) \
-	$(XFCONF_CFLAGS) \
-	$(LIBXFCE4UTIL_CFLAGS) \
-	$(PLATFORM_CFLAGS) \
-	$(LIBX11_CFLAGS)
-
-xfsettingsd_LDFLAGS = \
-	-no-undefined \
-	$(PLATFORM_LDFLAGS)
-
-xfsettingsd_LDADD = \
-	$(GTK_LIBS) \
-	$(GLIB_LIBS) \
-	$(LIBNOTIFY_LIBS) \
-	$(XFCONF_LIBS) \
-	$(LIBXFCE4UTIL_LIBS) \
-	$(LIBX11_LIBS)
-
-settingsdir = $(sysconfdir)/xdg/xfce4/xfconf/xfce-perchannel-xml
-settings_DATA = xsettings.xml
-
-EXTRA_DIST = \
-	$(settings_DATA)
-
-endif
diff --git a/xfsettingsd/main.c b/xfsettingsd/main.c
deleted file mode 100644
index 272c30f..0000000
--- a/xfsettingsd/main.c
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- *  Copyright (c) 2008 Stephan Arts <stephan at xfce.org>
- *
- *  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 Library General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#include <X11/Xlib.h>
-
-#include <glib.h>
-
-#include <gtk/gtk.h>
-#include <gdk/gdkx.h>
-
-#include <libxfce4util/libxfce4util.h>
-#include <xfconf/xfconf.h>
-
-#include "registry.h"
-
-#define XF_DEBUG(str) \
-    if (debug) g_print (str)
-
-static gboolean version = FALSE;
-static gboolean force_replace = FALSE;
-static gboolean running = FALSE;
-static gboolean debug = FALSE;
-
-static GList *registries = NULL;
-
-static GOptionEntry entries[] =
-{
-    {    "version", 'V', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &version,
-        N_("Version information"),
-        NULL
-    },
-    {    "verbose", 'v', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &debug,
-        N_("Verbose output"),
-        NULL
-    },
-    {    "force", 'f', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &force_replace,
-        N_("Replace running xsettings daemon (if any)"),
-        NULL
-    },
-    {    "debug", 'd', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &debug,
-        N_("Start in debug mode (don't fork to the background)"),
-        NULL
-    },
-    { NULL }
-};
-
-
-static GdkFilterReturn
-manager_event_filter (GdkXEvent *xevent,
-                      GdkEvent *event,
-                      gpointer data)
-{
-    XSettingsRegistry *registry = XSETTINGS_REGISTRY(data);
-
-    if (xsettings_registry_process_event(registry, xevent))
-    {
-        g_object_unref(G_OBJECT(registry));
-        registries = g_list_remove(registries, registry);
-        if(!registries)
-            gtk_main_quit();
-        return GDK_FILTER_REMOVE;
-    }
-    else
-    {
-        return GDK_FILTER_CONTINUE;
-    }
-}
-
-/**
- * settings_daemon_check_running:
- * @display: X11 Display object
- * @screen: X11 Screen number
- *
- * Return value: TRUE if an XSETTINGS daemon is already running
- */
-static gboolean
-settings_daemon_check_running (Display *display, gint screen)
-{
-    Atom atom;
-    gchar buffer[256];
-
-    g_snprintf(buffer, sizeof(buffer), "_XSETTINGS_S%d", screen);
-    atom = XInternAtom((Display *)display, buffer, False);
-
-    if (XGetSelectionOwner((Display *)display, atom))
-    {
-        return TRUE;
-    }
-    else
-        return FALSE;
-}
-
-int
-main(int argc, char **argv)
-{
-    GError *cli_error = NULL;
-    GdkDisplay *gdpy;
-    gint n_screens, screen;
-    gboolean keep_running = FALSE;
-    XfconfChannel *xsettings_channel;
-
-    xfce_textdomain(GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
-
-    if(!gtk_init_with_args(&argc, &argv, _(""), entries, PACKAGE, &cli_error))
-    {
-        if (cli_error != NULL)
-        {
-            g_print (_("%s: %s\nTry %s --help to see a full list of available command line options.\n"), PACKAGE, cli_error->message, PACKAGE_NAME);
-            g_error_free (cli_error);
-            return 1;
-        }
-    }
-
-    if(version)
-    {
-        g_print("xfsettingsd %s\n", PACKAGE_VERSION);
-        return 0;
-    }
-
-    if(!xfconf_init(&cli_error))
-    {
-        g_printerr("Failed to connect to Xfconf daemon: %s\n",
-                   cli_error->message);
-        return 1;
-    }
-
-    xsettings_channel = xfconf_channel_new("xsettings");
-
-    gdpy = gdk_display_get_default();
-    n_screens = gdk_display_get_n_screens(gdpy);
-
-    for(screen = 0; screen < n_screens; ++screen)
-    {
-        XSettingsRegistry *registry;
-
-        running = settings_daemon_check_running(GDK_DISPLAY_XDISPLAY(gdpy),
-                                                screen);
-
-        if (running)
-        {
-            XF_DEBUG("XSETTINGS Daemon running\n");
-            if (force_replace)
-            {
-                XF_DEBUG("Replacing XSETTINGS daemon\n");
-                keep_running = TRUE;
-            }
-            else
-            {
-                continue;
-            }
-        }
-
-        XF_DEBUG("Initializing...\n");
-
-        registry = xsettings_registry_new(xsettings_channel,
-                                          GDK_DISPLAY_XDISPLAY(gdpy),
-                                          screen);
-        registries = g_list_append(registries, registry);
-
-        xsettings_registry_load(registry, debug);
-
-        xsettings_registry_notify(registry);
-
-        xsettings_registry_xft_notify(registry);
-
-        gdk_window_add_filter(NULL, manager_event_filter, registry);
-
-        keep_running = TRUE;
-    }
-
-    if(!keep_running)
-    {
-        XF_DEBUG("Not replacing existing XSETTINGS manager\n");
-        return 1;
-    }
-
-    if(!debug) /* If not in debug mode, fork to background */
-    {
-        if(!fork())
-        {
-            gtk_main();
-
-            xfconf_shutdown();
-        }
-    }
-    else
-    {
-        gtk_main();
-
-        xfconf_shutdown();
-    }
-
-    return 0;
-}
diff --git a/xfsettingsd/registry.c b/xfsettingsd/registry.c
deleted file mode 100644
index e2f58e9..0000000
--- a/xfsettingsd/registry.c
+++ /dev/null
@@ -1,863 +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.
- *
- *  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 Library General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- *          Stephan Arts <stephan at xfce.org>: adapted to the "xfconf" concept
- */
-
-#include <config.h>
-#include <X11/Xlib.h>
-#include <X11/Xmd.h>
-#include <X11/Xatom.h>
-
-#include <glib.h>
-
-#if defined(GETTEXT_PACKAGE)
-#include <glib/gi18n-lib.h>
-#else
-#include <glib/gi18n.h>
-#endif
-
-#include <gtk/gtk.h>
-#include <gdk/gdkx.h>
-
-#include <string.h>
-
-#include <libxfce4util/libxfce4util.h>
-#include <xfconf/xfconf.h>
-
-#include "registry.h"
-
-#define XSETTINGS_PAD(n,m) ((n + m - 1) & (~(m-1)))
-
-#define XSETTINGS_DEBUG(str) \
-    if (debug) g_print ("%s", str)
-#define XSETTINGS_DEBUG_CREATE(str) \
-    if (debug) g_print ("Creating Property: '%s'\n", str)
-#define XSETTINGS_DEBUG_LOAD(str) \
-    if (debug) g_print ("Loading Property: '%s'\n", str)
-
-#define XSETTINGS_PARAM_FLAGS (G_PARAM_READWRITE \
-                               | G_PARAM_CONSTRUCT_ONLY \
-                               | G_PARAM_STATIC_NAME \
-                               | G_PARAM_STATIC_NICK \
-                               | G_PARAM_STATIC_BLURB)
-
-#define INCH_MM      25.4
-
-/* Use a fallback DPI of 96 which should be ok-ish on most systems
- * and is only applied on rare occasions */
-#define FALLBACK_DPI 96
-
-/* Use the same min/max DPI as in the appearance settings dialog */
-#define MIN_DPI      48
-#define MAX_DPI      1000
-
-G_DEFINE_TYPE(XSettingsRegistry, xsettings_registry, G_TYPE_OBJECT);
-
-enum
-{
-    XSETTING_ENTRY_NET_DOUBLECLICKTIME,
-    XSETTING_ENTRY_NET_DOUBLECLICKDISTANCE,
-    XSETTING_ENTRY_NET_DNDDRAGTRESHOLD,
-    XSETTING_ENTRY_NET_CURSORBLINK,
-    XSETTING_ENTRY_NET_CURSORBLINKTIME,
-    XSETTING_ENTRY_NET_THEMENAME,
-    XSETTING_ENTRY_NET_ICONTHEMENAME,
-    XSETTING_ENTRY_NET_SOUNDTHEMENAME,
-    XSETTING_ENTRY_NET_ENABLESOUNDEVENTS,
-    XSETTING_ENTRY_NET_ENABLEINPUTFEEDBACKSOUNDS,
-    XSETTING_ENTRY_XFT_ANTIALIAS,
-    XSETTING_ENTRY_XFT_HINTING,
-    XSETTING_ENTRY_XFT_HINTSTYLE,
-    XSETTING_ENTRY_XFT_RGBA,
-    XSETTING_ENTRY_XFT_DPI,
-    XSETTING_ENTRY_GTK_CANCHANGEACCELS,
-    XSETTING_ENTRY_GTK_COLORPALETTE,
-    XSETTING_ENTRY_GTK_FONTNAME,
-    XSETTING_ENTRY_GTK_ICONSIZES,
-    XSETTING_ENTRY_GTK_KEYTHEMENAME,
-    XSETTING_ENTRY_GTK_TOOLBARSTYLE,
-    XSETTING_ENTRY_GTK_TOOLBARICONSIZE,
-    XSETTING_ENTRY_GTK_IMPREEDITSTYLE,
-    XSETTING_ENTRY_GTK_IMSTATUSSTYLE,
-    XSETTING_ENTRY_GTK_MENUIMAGES,
-    XSETTING_ENTRY_GTK_BUTTONIMAGES,
-    XSETTING_ENTRY_GTK_MENUBARACCEL,
-    XSETTING_ENTRY_GTK_CURSORTHEMENAME,
-    XSETTING_ENTRY_GTK_CURSORTHEMESIZE,
-    XSETTING_ENTRY_GTK_IMMODULE,
-} XSettingType;
-
-static XSettingsRegistryEntry properties[] = {
-{ "Net/DoubleClickTime", {G_TYPE_INT, }},
-{ "Net/DoubleClickDistance", {G_TYPE_INT, }},
-{ "Net/DndDragThreshold", {G_TYPE_INT, }},
-{ "Net/CursorBlink", {G_TYPE_BOOLEAN, }},
-{ "Net/CursorBlinkTime", {G_TYPE_INT, }},
-{ "Net/ThemeName", {G_TYPE_STRING, }},
-{ "Net/IconThemeName", {G_TYPE_STRING, }},
-{ "Net/SoundThemeName", {G_TYPE_STRING, }},
-{ "Net/EnableEventSounds", {G_TYPE_BOOLEAN, }},
-{ "Net/EnableInputFeedbackSounds", {G_TYPE_BOOLEAN, }},
-
-{ "Xft/Antialias", {G_TYPE_INT, }},
-{ "Xft/Hinting", {G_TYPE_INT, }},
-{ "Xft/HintStyle", {G_TYPE_STRING, }},
-{ "Xft/RGBA", {G_TYPE_STRING, }},
-{ "Xft/DPI", {G_TYPE_INT, }},
-
-{ "Gtk/CanChangeAccels", {G_TYPE_BOOLEAN, }},
-{ "Gtk/ColorPalette", {G_TYPE_STRING, }},
-{ "Gtk/FontName", {G_TYPE_STRING, }},
-{ "Gtk/IconSizes", {G_TYPE_STRING, }},
-{ "Gtk/KeyThemeName", {G_TYPE_STRING, }},
-{ "Gtk/ToolbarStyle", {G_TYPE_STRING, }},
-{ "Gtk/ToolbarIconSize", {G_TYPE_INT, }},
-{ "Gtk/IMPreeditStyle", {G_TYPE_STRING, }},
-{ "Gtk/IMStatusStyle", {G_TYPE_STRING, }},
-{ "Gtk/MenuImages", {G_TYPE_BOOLEAN, }},
-{ "Gtk/ButtonImages", {G_TYPE_BOOLEAN, }},
-{ "Gtk/MenuBarAccel", {G_TYPE_STRING, }},
-{ "Gtk/CursorThemeName", {G_TYPE_STRING, }},
-{ "Gtk/CursorThemeSize", {G_TYPE_INT, }},
-{ "Gtk/IMModule", {G_TYPE_STRING, }},
-
-{ NULL, {0, }},
-};
-
-
-struct _XSettingsRegistryPriv
-{
-    gint serial;
-    gint last_change_serial;
-
-    /* props */
-    XfconfChannel *channel;
-    gint screen;
-    Display *display;
-    Window window;
-    Atom xsettings_atom;
-    Atom selection_atom;
-    gboolean debug;
-};
-
-static void xsettings_registry_set_property(GObject*, guint, const GValue*, GParamSpec*);
-static void xsettings_registry_get_property(GObject*, guint, GValue*, GParamSpec*);
-
-static void
-cb_xsettings_registry_channel_property_changed(XfconfChannel *channel, const gchar *property_name, const GValue *value, XSettingsRegistry *registry);
-static Bool
-timestamp_predicate (Display *display, XEvent  *xevent, XPointer arg);
-static int
-compute_xsettings_dpi (XSettingsRegistry *registry);
-
-gboolean
-xsettings_registry_process_event (XSettingsRegistry *registry, XEvent *xevent)
-{
-    if ((xevent->xany.window == registry->priv->window) &&
-        (xevent->xany.type == SelectionClear) &&
-        (xevent->xselectionclear.selection == registry->priv->selection_atom))
-    {
-        return TRUE;
-    }
-
-    return FALSE;
-}
-
-enum {
-    XSETTINGS_REGISTRY_PROPERTY_CHANNEL = 1,
-    XSETTINGS_REGISTRY_PROPERTY_DISPLAY,
-    XSETTINGS_REGISTRY_PROPERTY_SCREEN,
-    XSETTINGS_REGISTRY_PROPERTY_XSETTINGS_ATOM,
-    XSETTINGS_REGISTRY_PROPERTY_SELECTION_ATOM,
-    XSETTINGS_REGISTRY_PROPERTY_WINDOW
-};
-
-void
-xsettings_registry_class_init(XSettingsRegistryClass *reg_class)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS(reg_class);
-  GParamSpec *pspec;
-
-  object_class->set_property = xsettings_registry_set_property;
-  object_class->get_property = xsettings_registry_get_property;
-
-  pspec = g_param_spec_object("channel", NULL, NULL, XFCONF_TYPE_CHANNEL, XSETTINGS_PARAM_FLAGS);
-  g_object_class_install_property(object_class, XSETTINGS_REGISTRY_PROPERTY_CHANNEL, pspec);
-
-  pspec = g_param_spec_int("screen", NULL, NULL, -1, 65535, -1, XSETTINGS_PARAM_FLAGS);
-  g_object_class_install_property(object_class, XSETTINGS_REGISTRY_PROPERTY_SCREEN, pspec);
-
-  pspec = g_param_spec_pointer("display", NULL, NULL, XSETTINGS_PARAM_FLAGS);
-  g_object_class_install_property(object_class, XSETTINGS_REGISTRY_PROPERTY_DISPLAY, pspec);
-
-  pspec = g_param_spec_long("xsettings-atom", NULL, NULL, G_MINLONG, G_MAXLONG, 0, XSETTINGS_PARAM_FLAGS);
-  g_object_class_install_property(object_class, XSETTINGS_REGISTRY_PROPERTY_XSETTINGS_ATOM, pspec);
-
-  pspec = g_param_spec_long("selection-atom", NULL, NULL, G_MINLONG, G_MAXLONG, 0, XSETTINGS_PARAM_FLAGS);
-  g_object_class_install_property(object_class, XSETTINGS_REGISTRY_PROPERTY_SELECTION_ATOM, pspec);
-
-  pspec = g_param_spec_long("window", NULL, NULL, G_MINLONG, G_MAXLONG, 0, XSETTINGS_PARAM_FLAGS);
-  g_object_class_install_property(object_class, XSETTINGS_REGISTRY_PROPERTY_WINDOW, pspec);
-}
-
-/**
- *
- * Initialize xsettings registry according to the defaults mentioned
- * in the XSETTINGS-Registry-spec.
- *
- * Override inside xsettings.xml to set the XFCE defaults
- */
-void
-xsettings_registry_init(XSettingsRegistry *registry)
-{
-    registry->priv = g_new0(XSettingsRegistryPriv, 1);
-
-    /* Net settings */
-    g_value_set_int (&properties[XSETTING_ENTRY_NET_DOUBLECLICKTIME].value, 250);
-    g_value_set_int (&properties[XSETTING_ENTRY_NET_DOUBLECLICKDISTANCE].value, 5);
-    g_value_set_int (&properties[XSETTING_ENTRY_NET_DNDDRAGTRESHOLD].value, 8);
-    g_value_set_boolean (&properties[XSETTING_ENTRY_NET_CURSORBLINK].value, TRUE);
-    g_value_set_int (&properties[XSETTING_ENTRY_NET_CURSORBLINKTIME].value, 1200);
-    g_value_set_string (&properties[XSETTING_ENTRY_NET_THEMENAME].value, "Default");
-    g_value_set_string (&properties[XSETTING_ENTRY_NET_ICONTHEMENAME].value, "hicolor");
-    g_value_set_string (&properties[XSETTING_ENTRY_NET_SOUNDTHEMENAME].value, "default");
-    g_value_set_boolean (&properties[XSETTING_ENTRY_NET_ENABLESOUNDEVENTS].value, FALSE);
-    g_value_set_boolean (&properties[XSETTING_ENTRY_NET_ENABLEINPUTFEEDBACKSOUNDS].value, FALSE);
-
-    /* Xft settings */
-    g_value_set_int (&properties[XSETTING_ENTRY_XFT_ANTIALIAS].value, -1);
-    g_value_set_int (&properties[XSETTING_ENTRY_XFT_HINTING].value, -1);
-    g_value_set_string (&properties[XSETTING_ENTRY_XFT_HINTSTYLE].value, "hintnone");
-    g_value_set_string (&properties[XSETTING_ENTRY_XFT_RGBA].value, "none");
-    g_value_set_int (&properties[XSETTING_ENTRY_XFT_DPI].value, -1);
-    /* GTK settings */
-    g_value_set_boolean (&properties[XSETTING_ENTRY_GTK_CANCHANGEACCELS].value, FALSE);
-    g_value_set_string (&properties[XSETTING_ENTRY_GTK_COLORPALETTE].value,
-                    "black:white:gray50:red:purple:blue:light "
-                    "blue:green:yellow:orange:lavender:brown:goldenrod4:dodger "
-                    "blue:pink:light green:gray10:gray30:gray75:gray90");
-    g_value_set_string (&properties[XSETTING_ENTRY_GTK_FONTNAME].value, "Sans 10");
-    g_value_set_string (&properties[XSETTING_ENTRY_GTK_ICONSIZES].value, NULL);
-    g_value_set_string (&properties[XSETTING_ENTRY_GTK_KEYTHEMENAME].value, NULL);
-    g_value_set_string (&properties[XSETTING_ENTRY_GTK_TOOLBARSTYLE].value, "icons");
-    g_value_set_int (&properties[XSETTING_ENTRY_GTK_TOOLBARICONSIZE].value, 3);
-    g_value_set_string (&properties[XSETTING_ENTRY_GTK_IMPREEDITSTYLE].value, "");
-    g_value_set_string (&properties[XSETTING_ENTRY_GTK_IMSTATUSSTYLE].value, "");
-    g_value_set_boolean (&properties[XSETTING_ENTRY_GTK_MENUIMAGES].value, TRUE);
-    g_value_set_boolean (&properties[XSETTING_ENTRY_GTK_BUTTONIMAGES].value, TRUE);
-    g_value_set_string (&properties[XSETTING_ENTRY_GTK_MENUBARACCEL].value, "F10");
-
-    g_value_set_string (&properties[XSETTING_ENTRY_GTK_CURSORTHEMENAME].value, NULL);
-    g_value_set_int (&properties[XSETTING_ENTRY_GTK_CURSORTHEMESIZE].value, 0);
-    g_value_set_string (&properties[XSETTING_ENTRY_GTK_IMMODULE].value, NULL);
-}
-
-static void
-cb_xsettings_registry_channel_property_changed(XfconfChannel *channel, const gchar *name, const GValue *value, XSettingsRegistry *registry)
-{
-    XSettingsRegistryEntry *entry = properties;
-
-    for(; entry->name != NULL; ++entry)
-    {
-        if (!strcmp(entry->name, &name[1]))
-        {
-            g_value_reset(&entry->value);
-            g_value_copy(value, &entry->value);
-            break;
-        }
-    }
-
-    xsettings_registry_notify(registry);
-    if (!strncmp(name, "/Xft", 4) || !strncmp(name, "/Gtk/CursorTheme", 16))
-        xsettings_registry_xft_notify(registry);
-}
-
-static void
-update_property (GString *props, const gchar* key, const gchar* value)
-{
-    gchar *needle;
-    gssize needle_len;
-    gchar *found = NULL;
-    gsize value_index;
-    gchar *end;
-
-    if (G_UNLIKELY (value == NULL))
-        value = "";
-
-    /* update an existing property */
-    needle = g_strconcat (key, ":", NULL);
-    needle_len = strlen (needle);
-    if (g_str_has_prefix (props->str, needle))
-        found = props->str;
-    else
-        found = strstr (props->str, needle);
-
-    if (found)
-    {
-        end = strchr (found, '\n');
-        value_index = (found - props->str) + needle_len + 1;
-        g_string_erase (props, value_index, end ? (end - found - needle_len) : -1);
-        g_string_insert (props, value_index, "\n");
-        g_string_insert (props, value_index, value);
-    }
-    else
-    {
-        g_string_append_printf (props, "%s:\t%s\n", key, value);
-    }
-}
-
-static void
-remove_property (GString *props, const gchar *key)
-{
-    gchar *needle;
-    gsize needle_len;
-    gchar *found = NULL;
-    gchar *end;
-
-    /* search for the property */
-    needle = g_strconcat (key, ":", NULL);
-    needle_len = strlen (needle);
-    if (g_str_has_prefix (props->str, needle))
-        found = props->str;
-    else
-        found = strstr (props->str, needle);
-
-    if (found)
-    {
-        end = strchr (found, '\n');
-        g_string_erase (props, found - props->str, end ? (end - found + 1) : -1);
-    }
-}
-
-void
-xsettings_registry_xft_notify(XSettingsRegistry *registry)
-{
-    Display *dpy;
-    GString *props;
-    gchar buf[256];
-    const gchar *str;
-
-    dpy = XOpenDisplay (NULL);
-    g_return_if_fail (dpy != NULL);
-    props = g_string_new (XResourceManagerString (dpy));
-
-    g_snprintf (buf, sizeof (buf), "%d", g_value_get_int (&properties[XSETTING_ENTRY_XFT_ANTIALIAS].value));
-    update_property (props, "Xft.antialias", buf);
-
-    g_snprintf (buf, sizeof (buf), "%d", g_value_get_int (&properties[XSETTING_ENTRY_XFT_HINTING].value));
-    update_property (props, "Xft.hinting", buf);
-
-    str = g_value_get_string (&properties[XSETTING_ENTRY_XFT_RGBA].value);
-    update_property (props, "Xft.rgba", str);
-
-    /*update_property (props, "Xft.lcdfilter", g_str_equal (str, "rgb") ? "lcddefault" : "none");*/
-
-    if (g_value_get_int (&properties[XSETTING_ENTRY_XFT_HINTING].value))
-        str = g_value_get_string (&properties[XSETTING_ENTRY_XFT_HINTSTYLE].value);
-    else
-        str = "hintnone";
-    update_property (props, "Xft.hintstyle", str);
-
-    if (g_value_get_int (&properties[XSETTING_ENTRY_XFT_DPI].value) > 0)
-    {
-        g_snprintf (buf, sizeof (buf), "%d", g_value_get_int (&properties[XSETTING_ENTRY_XFT_DPI].value));
-        update_property (props, "Xft.dpi", buf);
-    }
-    else
-    {
-        remove_property (props, "Xft.dpi");
-    }
-
-    str = g_value_get_string (&properties[XSETTING_ENTRY_GTK_CURSORTHEMENAME].value);
-    update_property (props, "Xcursor.theme", str);
-
-    update_property (props, "Xcursor.theme_core", "true");
-
-    g_snprintf (buf, sizeof (buf), "%d", g_value_get_int (&properties[XSETTING_ENTRY_GTK_CURSORTHEMESIZE].value));
-    update_property (props, "Xcursor.size", buf);
-
-    if (registry->priv->debug)
-        g_print ("Update XA_RESOURCE_MANAGER properties (len=%" G_GSIZE_FORMAT ")\n", props->len);
-
-    XChangeProperty (dpy, RootWindow (dpy, 0),
-                     XA_RESOURCE_MANAGER, XA_STRING, 8,
-                     PropModeReplace,
-                     (const guchar *) props->str,
-                     props->len);
-
-    XCloseDisplay (dpy);
-
-    g_string_free (props, TRUE);
-}
-
-static int
-compute_xsettings_dpi (XSettingsRegistry *registry)
-{
-    Screen *xscreen;
-    int width_mm, height_mm;
-    int width, height;
-    int dpi;
-
-    xscreen = ScreenOfDisplay (registry->priv->display,
-                                registry->priv->screen);
-    width_mm = WidthMMOfScreen (xscreen);
-    height_mm = HeightMMOfScreen (xscreen);
-    dpi = FALLBACK_DPI;
-
-    if (width_mm > 0 && height_mm > 0)
-    {
-        width = WidthOfScreen (xscreen);
-        height = HeightOfScreen (xscreen);
-        dpi = MIN (INCH_MM * width  / width_mm,
-                   INCH_MM * height / height_mm);
-    }
-
-    return dpi;
-}
-
-void
-xsettings_registry_notify(XSettingsRegistry *registry)
-{
-    guchar *buffer, *pos;
-    gint buf_len;
-    gint prop_count = 0;
-    XSettingsRegistryEntry *entry = properties;
-    const gchar *value, *val;
-    gint name_len, value_len, str_length;
-    gint dpi;
-
-    registry->priv->last_change_serial = registry->priv->serial;
-
-    buf_len = 12;
-
-    /* Calculate buffer size */
-    for(; entry->name != NULL; ++entry)
-    {
-        prop_count++;
-        buf_len += 8 + XSETTINGS_PAD(strlen(entry->name), 4);
-        switch (G_VALUE_TYPE(&entry->value))
-        {
-            case G_TYPE_INT:
-            case G_TYPE_BOOLEAN:
-                buf_len += 4;
-                break;
-            case G_TYPE_STRING:
-                {
-                    buf_len += 4;
-                    value = g_value_get_string(&entry->value);
-                    if(value)
-                    {
-                        buf_len += XSETTINGS_PAD(strlen(value), 4);
-                    }
-
-                }
-                break;
-            case G_TYPE_UINT64:
-                buf_len += 8;
-                break;
-            default:
-                g_assert_not_reached ();
-                break;
-        }
-    }
-
-    buffer = NULL;
-    pos = buffer = g_new0(guchar, buf_len);
-
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-    *(CARD8 *)pos = LSBFirst;
-#else
-    *(CARD8 *)pos = MSBFirst;
-#endif
-    pos +=4;
-
-    *(CARD32 *)pos = registry->priv->serial++;
-    pos += 4;
-
-    *(CARD32 *)pos = prop_count; /* nr of props */
-    pos += 4;
-
-    /** Fill the buffer */
-    entry = properties;
-    for(; entry->name != NULL; ++entry)
-    {
-        name_len = XSETTINGS_PAD(strlen(entry->name), 4);
-        value_len = 0;
-
-        switch (G_VALUE_TYPE(&entry->value))
-        {
-            case G_TYPE_INT:
-            case G_TYPE_BOOLEAN:
-                *pos++ = 0;
-                break;
-            case G_TYPE_STRING:
-                *pos++ = 1; /* String */
-                {
-                    value = g_value_get_string(&entry->value);
-                    if(value)
-                    {
-                        value_len = XSETTINGS_PAD(strlen(value), 4);
-                    }
-                    else
-                    {
-                        value_len = 0;
-                    }
-                }
-                break;
-            case G_TYPE_UINT64: /* Color is a 64-bits value */
-                *pos++ = 2;
-                break;
-            default:
-                g_assert_not_reached ();
-                break;
-        }
-        *pos++ = 0;
-
-        str_length = strlen(entry->name);
-        *(CARD16 *)pos = str_length;
-        pos += 2;
-        memcpy (pos, entry->name, str_length);
-        name_len -= str_length;
-        pos += str_length;
-
-        while(name_len > 0)
-        {
-            *(pos++) = 0;
-            name_len--;
-        }
-
-        *(CARD32 *)pos = registry->priv->last_change_serial;
-        pos+= 4;
-
-        switch (G_VALUE_TYPE(&entry->value))
-        {
-            case G_TYPE_STRING:
-                {
-                    val = g_value_get_string(&entry->value);
-
-                    if (val)
-                    {
-                        *(CARD32 *)pos = strlen(val);
-                        pos += 4;
-
-                        memcpy (pos, val, strlen(val));
-                        pos += strlen(val);
-                        value_len -= strlen(val);
-                    }
-                    else
-                    {
-                        *(CARD32 *)pos = 0;
-                        pos += 4;
-                    }
-                }
-                while(value_len > 0)
-                {
-                    *(pos++) = 0;
-                    value_len--;
-                }
-                break;
-            case G_TYPE_INT:
-                /* See http://www.freedesktop.org/wiki/Specifications/XSettingsRegistry
-                 * for an explanation.  Weirdly, this is still not correct, as
-                 * font sizes with -1 DPI and a forced setting equal to the X
-                 * server's calculated DPI don't match.  Need to look into
-                 * this a bit more. */
-                if (strcmp (entry->name, "Xft/DPI") == 0)
-                {
-                    dpi = g_value_get_int (&entry->value);
-
-                    if (dpi < 0)
-                    {
-                        /* Compute the DPI based on X */
-                        dpi = compute_xsettings_dpi (registry);
-                    }
-
-                    /* Make sure to use the fallback DPI if the user-defined or computed
-                     * value is out of range */
-                    dpi = dpi < MIN_DPI ? FALLBACK_DPI : (dpi > MAX_DPI ? FALLBACK_DPI : dpi);
-
-                    /* Apply the new value */
-                    *(CARD32 *)pos = 1024 * dpi;
-                }
-                else
-                    *(CARD32 *)pos = g_value_get_int(&entry->value);
-                pos += 4;
-                break;
-            case G_TYPE_BOOLEAN:
-                *(CARD32 *)pos = g_value_get_boolean(&entry->value);
-                pos += 4;
-                break;
-            case G_TYPE_UINT64:
-                pos += 8;
-                break;
-            default:
-                g_assert_not_reached ();
-                break;
-        }
-
-    }
-
-    if (registry->priv->debug)
-        g_print ("Update _XSETTINGS_SETTINGS properties (len=%d)\n", buf_len);
-
-    XChangeProperty(registry->priv->display,
-                    registry->priv->window,
-                    registry->priv->xsettings_atom,
-                    registry->priv->xsettings_atom,
-                    8, PropModeReplace, buffer, buf_len);
-
-    registry->priv->last_change_serial = registry->priv->serial;
-
-    g_free (buffer);
-}
-
-XSettingsRegistry *
-xsettings_registry_new (XfconfChannel *channel, Display *dpy, gint screen)
-{
-    Atom xsettings_atom = XInternAtom(dpy, "_XSETTINGS_SETTINGS", True);
-
-    Window window = 0;
-    gchar buffer[256];
-    unsigned char c = 'a';
-    TimeStampInfo info;
-    XEvent xevent;
-    Atom selection_atom, manager_atom;
-    GObject *object;
-
-    window = XCreateSimpleWindow (dpy,
-           RootWindow (dpy, screen),
-           0, 0, 10, 10, 0,
-           WhitePixel (dpy, screen),
-           WhitePixel (dpy, screen));
-    if (!window)
-    {
-        g_critical( "no window");
-        return NULL;
-    }
-
-    g_snprintf(buffer, sizeof(buffer), "_XSETTINGS_S%d", screen);
-    selection_atom = XInternAtom(dpy, buffer, True);
-    manager_atom = XInternAtom(dpy, "MANAGER", True);
-
-
-    object = g_object_new(XSETTINGS_REGISTRY_TYPE,
-                          "channel", channel,
-                          "display", dpy,
-                          "screen", screen,
-                          "xsettings-atom", xsettings_atom,
-                          "selection-atom", selection_atom,
-                          "window", window,
-                          NULL);
-
-    info.timestamp_prop_atom = XInternAtom(dpy, "_TIMESTAMP_PROP", False);
-    info.window = window;
-
-    XSelectInput (dpy, window, PropertyChangeMask);
-
-    XChangeProperty (dpy, window,
-       info.timestamp_prop_atom, info.timestamp_prop_atom,
-       8, PropModeReplace, &c, 1);
-
-    XIfEvent (dpy, &xevent,
-              timestamp_predicate, (XPointer)&info);
-
-    XSetSelectionOwner (dpy, selection_atom,
-                        window, xevent.xproperty.time);
-
-    if (XGetSelectionOwner (dpy, selection_atom) ==
-        window)
-    {
-        XClientMessageEvent xev;
-
-        xev.type = ClientMessage;
-        xev.window = RootWindow (dpy, screen);
-        xev.message_type = manager_atom;
-        xev.format = 32;
-        xev.data.l[0] = xevent.xproperty.time;
-        xev.data.l[1] = selection_atom;
-        xev.data.l[2] = window;
-        xev.data.l[3] = 0;  /* manager specific data */
-        xev.data.l[4] = 0;  /* manager specific data */
-
-        XSendEvent (dpy, RootWindow (dpy, screen),
-          False, StructureNotifyMask, (XEvent *)&xev);
-    }
-    else
-    {
-        g_debug("fail");
-    }
-
-    return XSETTINGS_REGISTRY(object);
-}
-
-static void
-xsettings_registry_set_property(GObject *object, guint property_id, const GValue *value, GParamSpec *p_spec)
-{
-  switch(property_id)
-  {
-      case XSETTINGS_REGISTRY_PROPERTY_CHANNEL:
-            if (XSETTINGS_REGISTRY(object)->priv->channel)
-            {
-                XfconfChannel *channel = XSETTINGS_REGISTRY(object)->priv->channel;
-
-                g_signal_handlers_disconnect_by_func(G_OBJECT(channel), (GCallback)cb_xsettings_registry_channel_property_changed, object);
-                XSETTINGS_REGISTRY(object)->priv->channel = NULL;
-            }
-
-            XSETTINGS_REGISTRY(object)->priv->channel = g_value_get_object(value);
-
-            if (XSETTINGS_REGISTRY(object)->priv->channel)
-            {
-                XfconfChannel *channel = XSETTINGS_REGISTRY(object)->priv->channel;
-
-                g_signal_connect(G_OBJECT(channel), "property-changed", (GCallback)cb_xsettings_registry_channel_property_changed, object);
-            }
-            break;
-      case XSETTINGS_REGISTRY_PROPERTY_SCREEN:
-            XSETTINGS_REGISTRY(object)->priv->screen = g_value_get_int(value);
-            break;
-      case XSETTINGS_REGISTRY_PROPERTY_DISPLAY:
-            XSETTINGS_REGISTRY(object)->priv->display = g_value_get_pointer(value);
-            break;
-      case XSETTINGS_REGISTRY_PROPERTY_XSETTINGS_ATOM:
-            XSETTINGS_REGISTRY(object)->priv->xsettings_atom = g_value_get_long(value);
-            break;
-      case XSETTINGS_REGISTRY_PROPERTY_SELECTION_ATOM:
-            XSETTINGS_REGISTRY(object)->priv->selection_atom = g_value_get_long(value);
-            break;
-      case XSETTINGS_REGISTRY_PROPERTY_WINDOW:
-            XSETTINGS_REGISTRY(object)->priv->window = g_value_get_long(value);
-            break;
-  }
-
-}
-
-static void
-xsettings_registry_get_property(GObject *object, guint property_id, GValue *value, GParamSpec *p_spec)
-{
-  switch(property_id)
-  {
-      case XSETTINGS_REGISTRY_PROPERTY_CHANNEL:
-          g_value_set_object(value, XSETTINGS_REGISTRY(object)->priv->channel);
-          break;
-      case XSETTINGS_REGISTRY_PROPERTY_SCREEN:
-          g_value_set_int(value, XSETTINGS_REGISTRY(object)->priv->screen);
-          break;
-      case XSETTINGS_REGISTRY_PROPERTY_DISPLAY:
-          g_value_set_pointer(value, XSETTINGS_REGISTRY(object)->priv->display);
-          break;
-      case XSETTINGS_REGISTRY_PROPERTY_XSETTINGS_ATOM:
-          g_value_set_long(value, XSETTINGS_REGISTRY(object)->priv->xsettings_atom);
-          break;
-      case XSETTINGS_REGISTRY_PROPERTY_SELECTION_ATOM:
-          g_value_set_long(value, XSETTINGS_REGISTRY(object)->priv->selection_atom);
-          break;
-      case XSETTINGS_REGISTRY_PROPERTY_WINDOW:
-          g_value_set_long(value, XSETTINGS_REGISTRY(object)->priv->window);
-          break;
-  }
-}
-
-static Bool
-timestamp_predicate (Display *display,
-                     XEvent  *xevent,
-                     XPointer arg)
-{
-  TimeStampInfo *info = (TimeStampInfo *)arg;
-
-  if (xevent->type == PropertyNotify &&
-      xevent->xproperty.window == info->window &&
-      xevent->xproperty.atom == info->timestamp_prop_atom)
-    return True;
-
-  return False;
-}
-
-gboolean
-xsettings_registry_load(XSettingsRegistry *registry, gboolean debug)
-{
-    XfconfChannel *channel = registry->priv->channel;
-    XSettingsRegistryEntry *entry = properties;
-    gchar *str;
-
-    registry->priv->debug = debug;
-
-    while (entry->name)
-    {
-        gchar *name = g_strconcat("/", entry->name, NULL);
-
-        if (xfconf_channel_has_property(channel, name) == TRUE)
-        {
-            XSETTINGS_DEBUG_LOAD(entry->name);
-            switch (G_VALUE_TYPE(&entry->value))
-            {
-                case G_TYPE_INT:
-                    g_value_set_int(&entry->value, xfconf_channel_get_int(channel, name, g_value_get_int(&entry->value)));
-                    break;
-                case G_TYPE_STRING:
-                    str = xfconf_channel_get_string(channel, name, g_value_get_string(&entry->value));
-                    g_value_set_string(&entry->value, str);
-                    g_free(str);
-                    break;
-                case G_TYPE_BOOLEAN:
-                    g_value_set_boolean(&entry->value, xfconf_channel_get_bool(channel, name, g_value_get_boolean(&entry->value)));
-                    break;
-                default:
-                    g_assert_not_reached ();
-                    break;
-            }
-        }
-        else
-        {
-            XSETTINGS_DEBUG_CREATE(entry->name);
-
-            if(xfconf_channel_set_property(channel, name, &entry->value))
-            {
-                XSETTINGS_DEBUG("... OK\n");
-            }
-            else
-            {
-                XSETTINGS_DEBUG("... FAIL\n");
-            }
-        }
-
-        g_free(name);
-        entry++;
-    }
-
-    return TRUE;
-}
diff --git a/xfsettingsd/registry.h b/xfsettingsd/registry.h
deleted file mode 100644
index 1b86473..0000000
--- a/xfsettingsd/registry.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- *  Copyright (c) 2008 Stephan Arts <stephan at xfce.org>
- *
- *  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 Library General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef __XSETTINGS_REGISTRY_H__
-#define __XSETTINGS_REGISTRY_H__
-
-typedef struct _XSettingsRegistryEntry XSettingsRegistryEntry;
-
-struct _XSettingsRegistryEntry {
-    gchar *name;
-    GValue value;
-};
-
-#define XSETTINGS_REGISTRY_TYPE xsettings_registry_get_type()
-
-#define XSETTINGS_REGISTRY(obj) (			   \
-		G_TYPE_CHECK_INSTANCE_CAST ((obj),  \
-			XSETTINGS_REGISTRY_TYPE,				  \
-			XSettingsRegistry))
-
-#define XSETTINGS_IS_REGISTRY(obj) (			\
-		G_TYPE_CHECK_INSTANCE_TYPE ((obj),  \
-			XSETTINGS_REGISTRY_TYPE))
-
-#define XSETTINGS_REGISTRY_CLASS(class) (	  \
-		G_TYPE_CHECK_CLASS_CAST ((class),  \
-			XSETTINGS_REGISTRY_TYPE,				 \
-			XSettingsRegistryClass))
-
-#define XSETTINGS_IS_REGISTRY_CLASS(class) (   \
-		G_TYPE_CHECK_CLASS_TYPE ((class),  \
-			XSETTINGS_REGISTRY_TYPE))
-
-#define XSETTINGS_REGISTRY_GET_CLASS(obj) (	\
-		G_TYPE_INSTANCE_GET_CLASS ((obj),  \
-			XSETTINGS_REGISTRY_TYPE,				 \
-	  XSettingsRegistryClass))
-
-typedef struct 
-{
-  Window window;
-  Atom timestamp_prop_atom;
-} TimeStampInfo;
-
-
-typedef struct _XSettingsRegistryPriv XSettingsRegistryPriv;
-typedef struct _XSettingsRegistry XSettingsRegistry;
-
-struct _XSettingsRegistry {
-    GObject parent;
-    XSettingsRegistryPriv *priv;
-};
-
-typedef struct _XSettingsRegistryClass XSettingsRegistryClass;
-
-struct _XSettingsRegistryClass {
-    GObjectClass parent_class;
-};
-
-GType xsettings_registry_get_type(void);
-
-XSettingsRegistry *
-xsettings_registry_new (XfconfChannel *channel, Display *dpy, gint screen);
-
-gboolean
-xsettings_registry_load(XSettingsRegistry *registry, gboolean debug);
-void
-xsettings_registry_notify(XSettingsRegistry *registry);
-void
-xsettings_registry_xft_notify(XSettingsRegistry *registry);
-gboolean
-xsettings_registry_process_event (XSettingsRegistry *registry, XEvent *xevent);
-
-#endif /* __XSETTINGS_REGISTRY_H__ */
diff --git a/xfsettingsd/xsettings.xml b/xfsettingsd/xsettings.xml
deleted file mode 100644
index 049b4ed..0000000
--- a/xfsettingsd/xsettings.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xsettings" version="1.0">
-  <property name="Net" type="empty">
-    <property name="ThemeName" type="string" value="Xfce"/>
-    <property name="IconThemeName" type="string" value="Rodent"/>
-  </property>
-  <property name="Xft" type="empty">
-    <property name="DPI" type="int" value="-1"/>
-  </property>
-</channel>



More information about the Xfce4-commits mailing list