Removed these old files from the old background capplet

2004-03-04  Rodney Dawes  <dobey@ximian.com>

	* background-properties-capplet.c:
	* background-properties.glade:
	* background-properties.glade1:
	* background-properties.xml: Removed these old files from the old
	background capplet

5 files changed, 8 insertions, 2021 deletions

diff --git a/capplets/background/ChangeLog b/capplets/background/ChangeLog
index 06f60630c..38a4c1c10 100644
--- a/capplets/background/ChangeLog
+++ b/capplets/background/ChangeLog
@@ -1,5 +1,13 @@
 2004-03-04  Rodney Dawes  <dobey@ximian.com>
 
+	* background-properties-capplet.c:
+	* background-properties.glade:
+	* background-properties.glade1:
+	* background-properties.xml: Removed these old files from the old
+	background capplet
+
+2004-03-04  Rodney Dawes  <dobey@ximian.com>
+
 	* gnome-wp-capplet.c (gnome_wp_add_image): Select the added image, and
 	change the scaling type to "wallpaper" if it is "none" (#136228)
 
diff --git a/capplets/background/background-properties-capplet.c b/capplets/background/background-properties-capplet.c
deleted file mode 100644
index c42667164..000000000
--- a/capplets/background/background-properties-capplet.c
+++ /dev/null
@@ -1,619 +0,0 @@
-/* -*- mode: c; style: linux -*- */
-
-/* background-properties-capplet.c
- * Copyright (C) 2000-2001 Ximian, Inc.
- *
- * Written by: Bradford Hovinen <hovinen@ximian.com>,
- *             Rachel Hestilow <hestilow@ximian.com>
- *             Seth Nickell     <snickell@stanford.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, 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, 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
-
-#include <string.h>
-
-#include <gnome.h>
-#include <gconf/gconf-client.h>
-#include <glade/glade.h>
-#include <libgnomevfs/gnome-vfs.h>
-
-#include "capplet-util.h"
-#include "gconf-property-editor.h"
-#include "applier.h"
-#include "activate-settings-daemon.h"
-
-enum
-{
-	TARGET_URI_LIST,
-	TARGET_COLOR,
-	TARGET_BGIMAGE
-/*	TARGET_BACKGROUND_RESET*/  
-};
-
-static GtkTargetEntry drop_types[] =
-{
-	{"text/uri-list", 0, TARGET_URI_LIST},
-	{ "application/x-color", 0, TARGET_COLOR },
-	{ "property/bgimage", 0, TARGET_BGIMAGE }
-/*	{ "x-special/gnome-reset-background", 0, TARGET_BACKGROUND_RESET }*/
-};
-
-static gint n_drop_types = sizeof (drop_types) / sizeof (GtkTargetEntry);
-
-static const int n_enum_vals = WPTYPE_NONE + 1;
-
-typedef struct
-{
-	BGApplier** appliers;
-	BGPreferences *prefs;
-} ApplierSet;
-
-/* Create a new set of appliers, and load the default preferences */
-
-static ApplierSet*
-applier_set_new (void)
-{
-	int i;
-	ApplierSet *set = g_new0 (ApplierSet, 1);
-
-	set->appliers = g_new0 (BGApplier*, n_enum_vals);
-	for (i = 0; i < n_enum_vals; i++)
-		set->appliers[i] = BG_APPLIER (bg_applier_new (BG_APPLIER_PREVIEW));
-	set->prefs = BG_PREFERENCES (bg_preferences_new ());
-	bg_preferences_load (set->prefs);
-
-	return set;
-}
-
-/* Destroy all prefs/appliers in set, and free structure */
-
-static void
-applier_set_free (ApplierSet *set)
-{
-	int i;
-
-	g_return_if_fail (set != NULL);
-
-	for (i = 0; i < n_enum_vals; i++)
-		g_object_unref (G_OBJECT (set->appliers[i]));
-	g_free (set->appliers);
-	g_object_unref (G_OBJECT (set->prefs));
-}
-
-/* Trigger a redraw in each applier in the set */
-
-static void
-applier_set_redraw (ApplierSet *set)
-{
-	int i;
-
-	g_return_if_fail (set != NULL);
-	
-	for (i = 0; i < n_enum_vals; i++)
-	{
-		set->prefs->wallpaper_enabled = TRUE;
-		set->prefs->wallpaper_type = i;
-		bg_applier_apply_prefs (set->appliers[i], set->prefs);
-	}
-}
-
-/* Retrieve legacy gnome_config settings and store them in the GConf
- * database. This involves some translation of the settings' meanings.
- */
-
-static void
-get_legacy_settings (void) 
-{
-	int          val_int;
-	char        *val_string;
-	gboolean     val_boolean;
-	gboolean     def;
-	gchar       *val_filename;
-	gchar	    *path;
-	gchar	    *prefix;
-
-	GConfClient *client;
-
-	/* gnome_config needs to be told to use the Gnome1 prefix */
-	path = g_build_filename (g_get_home_dir (), ".gnome", "Background", NULL);
-	prefix = g_strconcat ("=", path, "=", "/Default/", NULL);
-	gnome_config_push_prefix (prefix);
-	g_free (prefix);
-	g_free (path);
-
-	client = gconf_client_get_default ();
-
-	gconf_client_set_bool (client, BG_PREFERENCES_DRAW_BACKGROUND,
-			       gnome_config_get_bool ("Enabled=true"), NULL);
-
-	val_filename = gnome_config_get_string ("wallpaper=(none)");
-
-	if (val_filename != NULL && strcmp (val_filename, "(none)"))
-	{
-		gconf_client_set_string (client, BG_PREFERENCES_PICTURE_FILENAME,
-					 val_filename, NULL);
-		gconf_client_set_string (client, BG_PREFERENCES_PICTURE_OPTIONS,
-			 bg_preferences_get_wptype_as_string (gnome_config_get_int ("wallpaperAlign=0")), NULL);
-	}
-	else
-		gconf_client_set_string (client, BG_PREFERENCES_PICTURE_OPTIONS, "none", NULL);
-
-	g_free (val_filename);
-
-
-	gconf_client_set_string (client, BG_PREFERENCES_PRIMARY_COLOR,
-				 gnome_config_get_string ("color1"), NULL);
-	gconf_client_set_string (client, BG_PREFERENCES_SECONDARY_COLOR,
-				 gnome_config_get_string ("color2"), NULL);
-
-	/* Code to deal with new enum - messy */
-	val_int = -1;
-	val_string = gnome_config_get_string_with_default ("simple=solid", &def);
-	if (!def) {
-		if (!strcmp (val_string, "solid")) {
-			val_int = ORIENTATION_SOLID;
-		} else {
-			g_free (val_string);
-			val_string = gnome_config_get_string_with_default ("gradient=vertical", &def);
-			if (!def)
-				val_int = (!strcmp (val_string, "vertical")) ? ORIENTATION_VERT : ORIENTATION_HORIZ;
-		}
-	}
-
-	g_free (val_string);
-
-	if (val_int != -1)
-		gconf_client_set_string (client, BG_PREFERENCES_COLOR_SHADING_TYPE, bg_preferences_get_orientation_as_string (val_int), NULL);
-
-	val_boolean = gnome_config_get_bool_with_default ("adjustOpacity=true", &def);
-
-	if (!def && val_boolean)
-		gconf_client_set_int (client, BG_PREFERENCES_PICTURE_OPACITY,
-				      gnome_config_get_int ("opacity=100"), NULL);
-	else
-		gconf_client_set_int (client, BG_PREFERENCES_PICTURE_OPACITY, 100, NULL);
-
-	gnome_config_pop_prefix ();
-}
-
-static orientation_t
-string_to_orientation (const gchar *string)
-{
-        orientation_t type = ORIENTATION_SOLID;
-
-	if (string) {
-		if (!strncmp (string, "vertical-gradient", sizeof ("vertical-gradient"))) {
-			type = ORIENTATION_VERT;
-		} else if (!strncmp (string, "horizontal-gradient", sizeof ("horizontal-gradient"))) {
-			type = ORIENTATION_HORIZ;
-		}
-	}
-	   
-	return type;
-}
-
-static void
-update_color_widget_labels_and_visibility (ApplierSet *set, const gchar *value_str)
-{
-	gboolean two_colors = TRUE;
-	char *color1_string = NULL; 
-	char *color2_string = NULL;
-
-	GtkWidget *color1_label;
-	GtkWidget *color2_label;
-	GtkWidget *color2_box;
-
-	orientation_t orientation = string_to_orientation (value_str);
-
-	switch (orientation) {
-	case ORIENTATION_SOLID: /* solid */ 
-		color1_string = _("Co_lor:"); 
-		two_colors = FALSE; 
-		break;
-	case ORIENTATION_HORIZ: /* horiz */ 
-		color1_string = _("_Left color:"); 
-		color2_string = _("_Right color:"); 
-		break;
-	case ORIENTATION_VERT: /* vert  */
-		color1_string = _("Top co_lor:");
-		color2_string = _("_Bottom color:"); 
-		break;
-	default:
-		break;
-	}
-
-	color1_label = g_object_get_data (G_OBJECT (set->prefs), "color1-label");
-	color2_label = g_object_get_data (G_OBJECT (set->prefs), "color2-label");
-	color2_box =   g_object_get_data (G_OBJECT (set->prefs), "color2-box");
-
-	g_assert (color1_label);
-	gtk_label_set_text_with_mnemonic (GTK_LABEL(color1_label), color1_string);
-
-	if (two_colors) {
-		gtk_widget_show (color2_box);
-
-		g_assert (color2_label);
-		gtk_label_set_text_with_mnemonic (GTK_LABEL(color2_label), color2_string);
-	} else {
-		gtk_widget_hide (color2_box);
-	}
-}
-
-
-/* Initial apply to the preview, and setting of the color frame's sensitivity.
- *
- * We use a double-delay mechanism: first waiting 100 ms, then working in an
- * idle handler so that the preview gets rendered after the rest of the dialog
- * is displayed. This prevents the program from appearing to stall on startup,
- * making it feel more natural to the user.
- */
-
-static gboolean
-real_realize_cb (ApplierSet *set)
-{
-	GtkWidget *color_frame;
-
-	g_return_val_if_fail (set != NULL, TRUE);
-
-	if (G_OBJECT (set->prefs)->ref_count == 0)
-		return FALSE;
-
-	color_frame = g_object_get_data (G_OBJECT (set->prefs), "color-frame");
-
-	applier_set_redraw (set);
-	gtk_widget_set_sensitive (color_frame, bg_applier_render_color_p (set->appliers[0], set->prefs));
-	
-	return FALSE;
-}
-
-static gboolean
-realize_2_cb (ApplierSet *set) 
-{
-	gtk_idle_add ((GtkFunction) real_realize_cb, set);
-	return FALSE;
-}
-
-static void
-realize_cb (GtkWidget *widget, ApplierSet *set)
-{
-	gtk_idle_add ((GtkFunction) real_realize_cb, set);
-	gtk_timeout_add (100, (GtkFunction) realize_2_cb, set);
-}
-
-/* Callback issued when some value changes in a property editor. This merges the
- * value with the preferences object and applies the settings to the preview. It
- * also sets the sensitivity of the color frame depending on whether the base
- * colors are visible through the wallpaper (or whether the wallpaper is
- * enabled). This cannot be done with a guard as it depends on a much more
- * complex criterion than a simple boolean configuration property.
- */
-
-static void
-peditor_value_changed (GConfPropertyEditor *peditor, const gchar *key, const GConfValue *value, ApplierSet *set) 
-{
-	GConfEntry *entry;
-	GtkWidget *color_frame;
-
-	entry = gconf_entry_new (key, value);
-	bg_preferences_merge_entry (set->prefs, entry);
-	gconf_entry_free (entry);
-
-	if (GTK_WIDGET_REALIZED (bg_applier_get_preview_widget (set->appliers[n_enum_vals - 1])))
-		applier_set_redraw (set);
-
-	if (!strcmp (key, BG_PREFERENCES_PICTURE_FILENAME) ||
-	    !strcmp (key, BG_PREFERENCES_PICTURE_OPTIONS))
-	{
-		color_frame = g_object_get_data (G_OBJECT (set->prefs), "color-frame");
-		gtk_widget_set_sensitive (color_frame, bg_applier_render_color_p (set->appliers[0], set->prefs));
-	}
-	else if (!strcmp (key, BG_PREFERENCES_COLOR_SHADING_TYPE))
-	{
-		update_color_widget_labels_and_visibility (set, gconf_value_get_string (value));
-	}
-}
-
-/* Set up the property editors in the dialog. This also loads the preferences
- * and sets up the callbacks.
- */
-
-static void
-setup_dialog (GladeXML *dialog, GConfChangeSet *changeset, ApplierSet *set)
-{
-	GObject     *peditor;
-	GConfClient *client;
-	gchar *color_option;
-
-	/* Override the enabled setting to make sure background is enabled */
-	client = gconf_client_get_default ();
-	gconf_client_set_bool (client, BG_PREFERENCES_DRAW_BACKGROUND, TRUE, NULL);
-
-	/* We need to be able to retrieve the color frame in
-	   callbacks */
-	g_object_set_data (G_OBJECT (set->prefs), "color-frame", WID ("color_vbox"));
-	g_object_set_data (G_OBJECT (set->prefs), "color2-box", WID ("color2_box"));
-	g_object_set_data (G_OBJECT (set->prefs), "color1-label", WID("color1_label"));
-	g_object_set_data (G_OBJECT (set->prefs), "color2-label", WID("color2_label"));
-
-	peditor = gconf_peditor_new_select_menu_with_enum
-		(changeset, BG_PREFERENCES_COLOR_SHADING_TYPE, WID ("border_shading"), bg_preferences_orientation_get_type (), TRUE, NULL);
-	g_signal_connect (peditor, "value-changed", (GCallback) peditor_value_changed, set);
-
-	peditor = gconf_peditor_new_color
-		(changeset, BG_PREFERENCES_PRIMARY_COLOR, WID ("color1"), NULL);
-	g_signal_connect (peditor, "value-changed", (GCallback) peditor_value_changed, set);
-
-	peditor = gconf_peditor_new_color
-		(changeset, BG_PREFERENCES_SECONDARY_COLOR, WID ("color2"), NULL);
-	g_signal_connect (peditor, "value-changed", (GCallback) peditor_value_changed, set);
-	peditor = gconf_peditor_new_image
-		(changeset, BG_PREFERENCES_PICTURE_FILENAME, WID ("background_image_button"), NULL);
-	g_signal_connect (peditor, "value-changed", (GCallback) peditor_value_changed, set);
-	
-	peditor = gconf_peditor_new_select_radio_with_enum
-		(changeset, BG_PREFERENCES_PICTURE_OPTIONS, gtk_radio_button_get_group (GTK_RADIO_BUTTON (WID ("radiobutton1"))), bg_preferences_wptype_get_type (), TRUE, NULL);
-	g_signal_connect (peditor, "value-changed", (GCallback) peditor_value_changed, set);
-
-	/* Make sure preferences get applied to the preview */
-	if (GTK_WIDGET_REALIZED (bg_applier_get_preview_widget (set->appliers[n_enum_vals - 1])))
-		applier_set_redraw (set);
-	else
-		g_signal_connect_after (G_OBJECT (bg_applier_get_preview_widget (set->appliers[n_enum_vals - 1])),
-					"realize", (GCallback) realize_cb, set);
-	
-	color_option = gconf_client_get_string (gconf_client_get_default (),
-						BG_PREFERENCES_COLOR_SHADING_TYPE,
-						NULL);
-	update_color_widget_labels_and_visibility (set, color_option);
-	g_free (color_option);
-}
-
-/* Construct the dialog */
-
-static GladeXML *
-create_dialog (ApplierSet *set) 
-{
-	GtkWidget *widget;
-	GladeXML  *dialog;
-	GSList *group;
-	int i;
-	const gchar *labels[] = { N_("_Tile"), N_("C_enter"), N_("Sc_ale"), N_("_Stretch"), N_("_No Picture") };
-
-	/* FIXME: What the hell is domain? */
-	dialog = glade_xml_new (GNOMECC_DATA_DIR "/interfaces/background-properties.glade", "prefs_widget", NULL);
-	widget = glade_xml_get_widget (dialog, "prefs_widget");
-
-	g_object_weak_ref (G_OBJECT (widget), (GWeakNotify) g_object_unref, dialog);
-
-	/* Set up the applier buttons */
-	group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (WID ("radiobutton1")));
-	group = g_slist_copy (group);
-	group = g_slist_reverse (group);
-	
-	for (i = 0; group && i < n_enum_vals; i++, group = group->next)
-	{
-		GtkWidget *w = GTK_WIDGET (group->data);
-		GtkWidget *vbox = gtk_vbox_new (FALSE, 0);
-		
-		gtk_container_set_border_width (GTK_CONTAINER (vbox), 0);
-		
-		gtk_widget_destroy (GTK_BIN (w)->child);
-		gtk_container_add (GTK_CONTAINER (w), vbox);
-		
-		gtk_box_pack_start (GTK_BOX (vbox),
-				    bg_applier_get_preview_widget (set->appliers[i]),
-				    TRUE, TRUE, 0);
-		gtk_box_pack_start (GTK_BOX (vbox),
-				    gtk_label_new_with_mnemonic (gettext (labels[i])),
-				    FALSE, FALSE, 0);
-		gtk_widget_show_all (vbox);
-	}
-
-	g_slist_free (group);
-
-	gtk_label_set_mnemonic_widget (GTK_LABEL (WID ("border_shading_label")),
-				       WID ("border_shading"));
-	gtk_label_set_mnemonic_widget (GTK_LABEL (WID ("color1_label")),
-				       WID ("color1"));
-	gtk_label_set_mnemonic_widget (GTK_LABEL (WID ("color2_label")),
-				       WID ("color2"));
-
-	return dialog;
-}
-
-
-static void
-cb_dialog_response (GtkDialog *dialog, gint response_id)
-{
-	if (response_id == GTK_RESPONSE_HELP)
-		capplet_help (GTK_WINDOW (dialog),
-			"user-guide.xml",
-			"goscustdesk-7");
-	else
-		gtk_main_quit ();
-}
-/* Callback issued during drag movements */
-
-static gboolean
-drag_motion_cb (GtkWidget *widget, GdkDragContext *context,
-		gint x, gint y, guint time, gpointer data)
-{
-	return FALSE;
-}
-
-/* Callback issued during drag leaves */
-
-static void
-drag_leave_cb (GtkWidget *widget, GdkDragContext *context,
-	       guint time, gpointer data)
-{
-	gtk_widget_queue_draw (widget);
-}
-
-/* Callback issued on actual drops. Attempts to load the file dropped. */
-
-static void
-drag_data_received_cb (GtkWidget *widget, GdkDragContext *context,
-		       gint x, gint y,
-		       GtkSelectionData *selection_data,
-		       guint info, guint time, gpointer data)
-{
-	GConfClient *client = gconf_client_get_default ();
-	ApplierSet *set = (ApplierSet*) data; 
-	gchar *picture_option;    
-
-	if (info == TARGET_URI_LIST ||
-	    info == TARGET_BGIMAGE)
-	{
-		GList *uris;
-
-		g_print ("got %s\n", selection_data->data);
-		uris = gnome_vfs_uri_list_parse ((gchar *) selection_data->data);
-		/* Arbitrarily pick the first item */
-		if (uris != NULL && uris->data != NULL)
-		{
-			GnomeVFSURI *uri = (GnomeVFSURI *) uris->data;
-			GConfEntry *entry;
-			GConfValue *value = gconf_value_new (GCONF_VALUE_STRING);
-			gchar *base;
-
-			base = gnome_vfs_unescape_string (gnome_vfs_uri_get_path (uri),
-							  G_DIR_SEPARATOR_S);
-			gconf_value_set_string (value, base);
-			g_free (base);
-
-			/* Hmm, should we bother with changeset here? */
-			gconf_client_set (client, BG_PREFERENCES_PICTURE_FILENAME, value, NULL);
-			gconf_client_suggest_sync (client, NULL);
-
-			/* this isn't emitted by the peditors,
-			 * so we have to manually update */
-			/* FIXME: this can't be right!!!! -jrb */
-			entry = gconf_entry_new (BG_PREFERENCES_PICTURE_FILENAME, value);
-			bg_preferences_merge_entry (set->prefs, entry);
-			gconf_entry_free (entry);
-			gconf_value_free (value);
-
-			picture_option = gconf_client_get_string (client, BG_PREFERENCES_PICTURE_OPTIONS, NULL);
-			if ((picture_option != NULL) && !strcmp (picture_option, "none"))
-				gconf_client_set_string (client, BG_PREFERENCES_PICTURE_OPTIONS, "wallpaper", NULL);
-
-			g_free (picture_option);
-
-		}
-		gnome_vfs_uri_list_free (uris);
-	} else if (info == TARGET_COLOR) {
-		guint16 *channels;
-		char *color_spec;
-		
-		if (selection_data->length != 8 || selection_data->format != 16) {
-			return;
-		}
-        
-		channels = (guint16 *) selection_data->data;
-		color_spec = g_strdup_printf ("#%02X%02X%02X", channels[0] >> 8, channels[1] >> 8, channels[2] >> 8);
-		gconf_client_set_string (client, BG_PREFERENCES_PICTURE_OPTIONS, "none", NULL);
-		gconf_client_set_string (client, BG_PREFERENCES_COLOR_SHADING_TYPE, "solid", NULL);
-		gconf_client_set_string (client, BG_PREFERENCES_PRIMARY_COLOR, color_spec, NULL);
-		g_free (color_spec);
-	} else if (info == TARGET_BGIMAGE) {
-
-	} else if (info == TARGET_URI_LIST) {
-
-	}
-	
-	if (GTK_WIDGET_REALIZED (bg_applier_get_preview_widget (set->appliers[n_enum_vals - 1])))
-		applier_set_redraw (set);
-
-}
-
-int
-main (int argc, char **argv) 
-{
-	GConfClient    *client;
-	GladeXML       *dialog;
-	GtkWidget      *dialog_win;
-	ApplierSet     *set;
-
-	static gboolean get_legacy;
-	static struct poptOption cap_options[] = {
-		{ "get-legacy", '\0', POPT_ARG_NONE, &get_legacy, 0,
-		  N_("Retrieve and store legacy settings"), NULL },
-		{ NULL, '\0', 0, NULL, 0, NULL, NULL }
-	};
-
-	bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
-	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-	textdomain (GETTEXT_PACKAGE);
-
-	gnome_program_init ("gnome-background-properties", VERSION,
-			    LIBGNOMEUI_MODULE, argc, argv,
-			    GNOME_PARAM_POPT_TABLE, cap_options,
-			    NULL);
-
-	activate_settings_daemon ();
-
-	client = gconf_client_get_default ();
-	gconf_client_add_dir (client, "/desktop/gnome/background", GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
-
-	if (get_legacy) {
-		get_legacy_settings ();
-	} else {
-		set = applier_set_new ();
-		dialog = create_dialog (set);
-		setup_dialog (dialog, NULL, set);
-
-		dialog_win = gtk_dialog_new_with_buttons
-			(_("Background Preferences"), NULL, 0,
-			 GTK_STOCK_HELP, GTK_RESPONSE_HELP,
-			 GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
-			 NULL);
-		gtk_dialog_set_default_response (GTK_DIALOG (dialog_win),
-			GTK_RESPONSE_CLOSE);
-		gtk_dialog_set_has_separator (GTK_DIALOG (dialog_win), FALSE);
-		gtk_container_set_border_width (GTK_CONTAINER (dialog_win), 5);
-		gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog_win)->vbox), 2);
-		gtk_window_set_resizable (GTK_WINDOW (dialog_win), FALSE);
-
-		g_signal_connect (G_OBJECT (dialog_win),
-				    "response",
-				    G_CALLBACK (cb_dialog_response), NULL);
-
-		gtk_drag_dest_set (dialog_win, GTK_DEST_DEFAULT_ALL,
-				   drop_types, n_drop_types,
-				   GDK_ACTION_COPY | GDK_ACTION_LINK | GDK_ACTION_MOVE);
-		g_signal_connect (G_OBJECT (dialog_win), "drag-motion",
-				  G_CALLBACK (drag_motion_cb), NULL);
-		g_signal_connect (G_OBJECT (dialog_win), "drag-leave",
-				  G_CALLBACK (drag_leave_cb), NULL);
-		g_signal_connect (G_OBJECT (dialog_win), "drag-data-received",
-				  G_CALLBACK (drag_data_received_cb),
-				  set);
-
-		g_object_weak_ref (G_OBJECT (dialog_win), (GWeakNotify) applier_set_free, set);
-		gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog_win)->vbox), WID ("prefs_widget"), TRUE, TRUE, 0);
-		capplet_set_icon (dialog_win, "background-capplet.png");
-		gtk_widget_show (dialog_win);
-
-		gtk_main ();
-	}
-
-	return 0;
-}
diff --git a/capplets/background/background-properties.glade b/capplets/background/background-properties.glade
deleted file mode 100644
index 619f5a2eb..000000000
--- a/capplets/background/background-properties.glade
+++ /dev/null
@@ -1,678 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-<requires lib="gnome"/>
-
-<widget class="GtkWindow" id="background_preference_window">
-  <property name="title" translatable="yes">Background Preferences</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="resizable">False</property>
-  <property name="destroy_with_parent">False</property>
-
-  <child>
-    <widget class="GtkNotebook" id="notebook1">
-      <property name="visible">True</property>
-      <property name="can_focus">True</property>
-      <property name="show_tabs">True</property>
-      <property name="show_border">True</property>
-      <property name="tab_pos">GTK_POS_TOP</property>
-      <property name="scrollable">False</property>
-      <property name="enable_popup">False</property>
-
-      <child>
-	<widget class="GtkVBox" id="prefs_widget">
-	  <property name="border_width">5</property>
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">18</property>
-
-	  <child>
-	    <widget class="GtkVBox" id="vbox9">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">0</property>
-
-	      <child>
-		<widget class="GtkHBox" id="hbox8">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">15</property>
-
-		  <child>
-		    <widget class="GtkVBox" id="vbox26">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">6</property>
-
-		      <child>
-			<widget class="GtkLabel" id="label42">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Select _picture:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">background_image_button</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkButton" id="background_image_button">
-			  <property name="visible">True</property>
-			  <property name="tooltip" translatable="yes">To set the background picture, drop an image or click to browse.</property>
-			  <property name="can_focus">True</property>
-			  <property name="relief">GTK_RELIEF_NORMAL</property>
-
-			  <child>
-			    <widget class="GtkVBox" id="vbox21">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">6</property>
-
-			      <child>
-				<widget class="GtkImage" id="background_image_preview">
-				  <property name="visible">True</property>
-				  <property name="xalign">0.5</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xpad">0</property>
-				  <property name="ypad">0</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">True</property>
-				  <property name="fill">True</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkLabel" id="image_filename_label">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes"></property>
-				  <property name="use_underline">False</property>
-				  <property name="use_markup">False</property>
-				  <property name="justify">GTK_JUSTIFY_CENTER</property>
-				  <property name="wrap">False</property>
-				  <property name="selectable">False</property>
-				  <property name="xalign">0.5</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xpad">0</property>
-				  <property name="ypad">0</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-			    </widget>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkVBox" id="vbox15">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
-
-		      <child>
-			<widget class="GtkLabel" id="label39">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes"></property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_CENTER</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkHBox" id="hbox17">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">0</property>
-
-			  <child>
-			    <widget class="GtkImage" id="image1">
-			      <property name="visible">True</property>
-			      <property name="stock">gtk-dialog-info</property>
-			      <property name="icon_size">6</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="label17">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">You can drag image files into the window to set the background picture.</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">True</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label38">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes"></property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_CENTER</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkVBox" id="color_vbox">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">6</property>
-
-	      <child>
-		<widget class="GtkLabel" id="border_shading_label">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Bac_kground style:</property>
-		  <property name="use_underline">True</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">7.45058e-09</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">3</property>
-		  <property name="ypad">0</property>
-		  <property name="mnemonic_widget">border_shading</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkHBox" id="hbox10">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">0</property>
-
-		  <child>
-		    <widget class="GtkVBox" id="vbox23">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
-
-		      <child>
-			<widget class="GtkOptionMenu" id="border_shading">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="history">0</property>
-
-			  <child internal-child="menu">
-			    <widget class="GtkMenu" id="convertwidget1">
-			      <property name="visible">True</property>
-
-			      <child>
-				<widget class="GtkMenuItem" id="convertwidget2">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">Solid color</property>
-				  <property name="use_underline">True</property>
-				</widget>
-			      </child>
-
-			      <child>
-				<widget class="GtkMenuItem" id="convertwidget3">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">Horizontal gradient</property>
-				  <property name="use_underline">True</property>
-				</widget>
-			      </child>
-
-			      <child>
-				<widget class="GtkMenuItem" id="convertwidget4">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">Vertical gradient</property>
-				  <property name="use_underline">True</property>
-				</widget>
-			      </child>
-			    </widget>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkHBox" id="color_box">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">10</property>
-
-		      <child>
-			<widget class="GtkLabel" id="label40">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes"></property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_CENTER</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkHBox" id="color1_box">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">6</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="color1_label">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Primary Color</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_CENTER</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GnomeColorPicker" id="color1">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="dither">True</property>
-			      <property name="use_alpha">False</property>
-			      <property name="title" translatable="yes">Pick a color</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkHBox" id="color2_box">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">6</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="color2_label">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Secondary Color</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_CENTER</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GnomeColorPicker" id="color2">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="dither">True</property>
-			      <property name="use_alpha">False</property>
-			      <property name="title" translatable="yes">Pick a color</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	      <property name="pack_type">GTK_PACK_END</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkVBox" id="vbox24">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">0</property>
-
-	      <child>
-		<widget class="GtkVBox" id="vbox25">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
-
-		  <child>
-		    <widget class="GtkLabel" id="label41">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Picture _options:</property>
-		      <property name="use_underline">True</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		      <property name="mnemonic_widget">radiobutton1</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkHBox" id="hbox16">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">True</property>
-		      <property name="spacing">6</property>
-
-		      <child>
-			<widget class="GtkRadioButton" id="radiobutton1">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="no">radiobutton1</property>
-			  <property name="use_underline">True</property>
-			  <property name="relief">GTK_RELIEF_NORMAL</property>
-			  <property name="active">False</property>
-			  <property name="inconsistent">False</property>
-			  <property name="draw_indicator">False</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkRadioButton" id="radiobutton2">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="no">radiobutton2</property>
-			  <property name="use_underline">True</property>
-			  <property name="relief">GTK_RELIEF_NORMAL</property>
-			  <property name="active">False</property>
-			  <property name="inconsistent">False</property>
-			  <property name="draw_indicator">False</property>
-			  <property name="group">radiobutton1</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkRadioButton" id="radiobutton3">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="no">radiobutton3</property>
-			  <property name="use_underline">True</property>
-			  <property name="relief">GTK_RELIEF_NORMAL</property>
-			  <property name="active">False</property>
-			  <property name="inconsistent">False</property>
-			  <property name="draw_indicator">False</property>
-			  <property name="group">radiobutton1</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkRadioButton" id="radiobutton4">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="no">radiobutton4</property>
-			  <property name="use_underline">True</property>
-			  <property name="relief">GTK_RELIEF_NORMAL</property>
-			  <property name="active">False</property>
-			  <property name="inconsistent">False</property>
-			  <property name="draw_indicator">False</property>
-			  <property name="group">radiobutton1</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkRadioButton" id="radiobutton5">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="no">radiobutton5</property>
-			  <property name="use_underline">True</property>
-			  <property name="relief">GTK_RELIEF_NORMAL</property>
-			  <property name="active">False</property>
-			  <property name="inconsistent">False</property>
-			  <property name="draw_indicator">False</property>
-			  <property name="group">radiobutton1</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	      <property name="pack_type">GTK_PACK_END</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="tab_expand">False</property>
-	  <property name="tab_fill">True</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkLabel" id="label12">
-	  <property name="visible">True</property>
-	  <property name="label" translatable="yes">E-Mail</property>
-	  <property name="use_underline">False</property>
-	  <property name="use_markup">False</property>
-	  <property name="justify">GTK_JUSTIFY_CENTER</property>
-	  <property name="wrap">False</property>
-	  <property name="selectable">False</property>
-	  <property name="xalign">0.5</property>
-	  <property name="yalign">0.5</property>
-	  <property name="xpad">0</property>
-	  <property name="ypad">0</property>
-	</widget>
-	<packing>
-	  <property name="type">tab</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-</glade-interface>
diff --git a/capplets/background/background-properties.glade1 b/capplets/background/background-properties.glade1
deleted file mode 100644
index ef04d4260..000000000
--- a/capplets/background/background-properties.glade1
+++ /dev/null
@@ -1,653 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>Project2</name>
-  <program_name>project2</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-</project>
-
-<widget>
-  <class>GtkWindow</class>
-  <name>background_preference_window</name>
-  <title>Background Properties</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-
-  <widget>
-    <class>GtkNotebook</class>
-    <name>notebook1</name>
-    <can_focus>True</can_focus>
-    <show_tabs>True</show_tabs>
-    <show_border>True</show_border>
-    <tab_pos>GTK_POS_TOP</tab_pos>
-    <scrollable>False</scrollable>
-    <tab_hborder>2</tab_hborder>
-    <tab_vborder>2</tab_vborder>
-    <popup_enable>False</popup_enable>
-
-    <widget>
-      <class>GtkVBox</class>
-      <name>background_preferences_widget</name>
-      <homogeneous>False</homogeneous>
-      <spacing>0</spacing>
-
-      <widget>
-	<class>GtkVBox</class>
-	<name>vbox9</name>
-	<border_width>10</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>0</spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkHBox</class>
-	  <name>hbox8</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>15</spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkFrame</class>
-	    <name>frame6</name>
-	    <label>Picture:</label>
-	    <label_xalign>0</label_xalign>
-	    <shadow_type>GTK_SHADOW_NONE</shadow_type>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkButton</class>
-	      <name>background_image_button</name>
-	      <can_focus>True</can_focus>
-	      <relief>GTK_RELIEF_NORMAL</relief>
-
-	      <widget>
-		<class>GtkVBox</class>
-		<name>vbox21</name>
-		<homogeneous>False</homogeneous>
-		<spacing>0</spacing>
-
-		<widget>
-		  <class>GtkPixmap</class>
-		  <name>background_image_preview</name>
-		  <xalign>0.5</xalign>
-		  <yalign>0.5</yalign>
-		  <xpad>0</xpad>
-		  <ypad>0</ypad>
-		  <build_insensitive>True</build_insensitive>
-		  <child>
-		    <padding>0</padding>
-		    <expand>True</expand>
-		    <fill>True</fill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkLabel</class>
-		  <name>image_filename_label</name>
-		  <label></label>
-		  <justify>GTK_JUSTIFY_CENTER</justify>
-		  <wrap>False</wrap>
-		  <xalign>0.5</xalign>
-		  <yalign>0.5</yalign>
-		  <xpad>0</xpad>
-		  <ypad>0</ypad>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>False</fill>
-		  </child>
-		</widget>
-	      </widget>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkVBox</class>
-	    <name>vbox15</name>
-	    <homogeneous>False</homogeneous>
-	    <spacing>0</spacing>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label39</name>
-	      <label></label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0.5</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label17</name>
-	      <label>You can drag image files
-into the window to set the 
-background picture.</label>
-	      <justify>GTK_JUSTIFY_LEFT</justify>
-	      <wrap>False</wrap>
-	      <xalign>0.5</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label38</name>
-	      <label></label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0.5</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-	  </widget>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkVBox</class>
-	<name>vbox22</name>
-	<border_width>10</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>0</spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	  <pack>GTK_PACK_END</pack>
-	</child>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>border_shading_label</name>
-	  <label>Border the picture with a:</label>
-	  <justify>GTK_JUSTIFY_LEFT</justify>
-	  <wrap>False</wrap>
-	  <xalign>7.45058e-09</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>3</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkHBox</class>
-	  <name>hbox10</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>0</spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkVBox</class>
-	    <name>vbox23</name>
-	    <homogeneous>False</homogeneous>
-	    <spacing>0</spacing>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkOptionMenu</class>
-	      <name>border_shading</name>
-	      <can_focus>True</can_focus>
-	      <items>Solid Colour
-Horizontal Gradient
-Vertical Gradient
-</items>
-	      <initial_choice>0</initial_choice>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkHBox</class>
-	    <name>color_box</name>
-	    <homogeneous>False</homogeneous>
-	    <spacing>10</spacing>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label40</name>
-	      <label></label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0.5</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkHBox</class>
-	      <name>color1_box</name>
-	      <homogeneous>False</homogeneous>
-	      <spacing>3</spacing>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkLabel</class>
-		<name>color1_label</name>
-		<label>Color 1</label>
-		<justify>GTK_JUSTIFY_CENTER</justify>
-		<wrap>False</wrap>
-		<xalign>0.5</xalign>
-		<yalign>0.5</yalign>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GnomeColorPicker</class>
-		<name>color1</name>
-		<can_focus>True</can_focus>
-		<dither>True</dither>
-		<use_alpha>False</use_alpha>
-		<title>Pick a color</title>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkHBox</class>
-	      <name>color2_box</name>
-	      <homogeneous>False</homogeneous>
-	      <spacing>3</spacing>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkLabel</class>
-		<name>color2_label</name>
-		<label>Color 2</label>
-		<justify>GTK_JUSTIFY_CENTER</justify>
-		<wrap>False</wrap>
-		<xalign>0.5</xalign>
-		<yalign>0.5</yalign>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GnomeColorPicker</class>
-		<name>color2</name>
-		<can_focus>True</can_focus>
-		<dither>True</dither>
-		<use_alpha>False</use_alpha>
-		<title>Pick a color</title>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-	    </widget>
-	  </widget>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkFrame</class>
-	<name>frame5</name>
-	<border_width>10</border_width>
-	<label>Picture Options:</label>
-	<label_xalign>0</label_xalign>
-	<shadow_type>GTK_SHADOW_NONE</shadow_type>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	  <pack>GTK_PACK_END</pack>
-	</child>
-
-	<widget>
-	  <class>GtkVBox</class>
-	  <name>vbox14</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>2</spacing>
-
-	  <widget>
-	    <class>GtkHBox</class>
-	    <name>hbox16</name>
-	    <homogeneous>True</homogeneous>
-	    <spacing>5</spacing>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkToggleButton</class>
-	      <name>no_picture_toggle</name>
-	      <can_focus>True</can_focus>
-	      <relief>GTK_RELIEF_NORMAL</relief>
-	      <active>False</active>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkVBox</class>
-		<name>no_picture_frame</name>
-		<homogeneous>False</homogeneous>
-		<spacing>0</spacing>
-
-		<widget>
-		  <class>GtkLabel</class>
-		  <name>label29</name>
-		  <label>_No Picture</label>
-		  <justify>GTK_JUSTIFY_CENTER</justify>
-		  <wrap>False</wrap>
-		  <xalign>0.5</xalign>
-		  <yalign>0.5</yalign>
-		  <xpad>0</xpad>
-		  <ypad>0</ypad>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>False</fill>
-		    <pack>GTK_PACK_END</pack>
-		  </child>
-		</widget>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkToggleButton</class>
-	      <name>wallpaper_toggle</name>
-	      <can_focus>True</can_focus>
-	      <relief>GTK_RELIEF_NORMAL</relief>
-	      <active>False</active>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkVBox</class>
-		<name>wallpaper_frame</name>
-		<homogeneous>False</homogeneous>
-		<spacing>0</spacing>
-
-		<widget>
-		  <class>GtkLabel</class>
-		  <name>label30</name>
-		  <label>_Wallpaper</label>
-		  <justify>GTK_JUSTIFY_CENTER</justify>
-		  <wrap>False</wrap>
-		  <xalign>0.5</xalign>
-		  <yalign>0.5</yalign>
-		  <xpad>0</xpad>
-		  <ypad>0</ypad>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>False</fill>
-		    <pack>GTK_PACK_END</pack>
-		  </child>
-		</widget>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkToggleButton</class>
-	      <name>centered_toggle</name>
-	      <can_focus>True</can_focus>
-	      <relief>GTK_RELIEF_NORMAL</relief>
-	      <active>False</active>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkVBox</class>
-		<name>centered_frame</name>
-		<homogeneous>False</homogeneous>
-		<spacing>0</spacing>
-
-		<widget>
-		  <class>GtkLabel</class>
-		  <name>label31</name>
-		  <label>_Centered</label>
-		  <justify>GTK_JUSTIFY_CENTER</justify>
-		  <wrap>False</wrap>
-		  <xalign>0.5</xalign>
-		  <yalign>0.5</yalign>
-		  <xpad>0</xpad>
-		  <ypad>0</ypad>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>False</fill>
-		    <pack>GTK_PACK_END</pack>
-		  </child>
-		</widget>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkToggleButton</class>
-	      <name>scaled_toggle</name>
-	      <can_focus>True</can_focus>
-	      <relief>GTK_RELIEF_NORMAL</relief>
-	      <active>False</active>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkVBox</class>
-		<name>scaled_frame</name>
-		<homogeneous>False</homogeneous>
-		<spacing>0</spacing>
-
-		<widget>
-		  <class>GtkLabel</class>
-		  <name>label32</name>
-		  <label>_Scaled</label>
-		  <justify>GTK_JUSTIFY_CENTER</justify>
-		  <wrap>False</wrap>
-		  <xalign>0.5</xalign>
-		  <yalign>0.5</yalign>
-		  <xpad>0</xpad>
-		  <ypad>0</ypad>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>False</fill>
-		    <pack>GTK_PACK_END</pack>
-		  </child>
-		</widget>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkToggleButton</class>
-	      <name>stretched_toggle</name>
-	      <can_focus>True</can_focus>
-	      <relief>GTK_RELIEF_NORMAL</relief>
-	      <active>False</active>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkVBox</class>
-		<name>stretched_frame</name>
-		<homogeneous>False</homogeneous>
-		<spacing>0</spacing>
-
-		<widget>
-		  <class>GtkLabel</class>
-		  <name>label33</name>
-		  <label>S_tretched</label>
-		  <justify>GTK_JUSTIFY_CENTER</justify>
-		  <wrap>False</wrap>
-		  <xalign>0.5</xalign>
-		  <yalign>0.5</yalign>
-		  <xpad>0</xpad>
-		  <ypad>0</ypad>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>False</fill>
-		    <pack>GTK_PACK_END</pack>
-		  </child>
-		</widget>
-	      </widget>
-	    </widget>
-	  </widget>
-	</widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkLabel</class>
-      <child_name>Notebook:tab</child_name>
-      <name>label12</name>
-      <label>E-Mail</label>
-      <justify>GTK_JUSTIFY_CENTER</justify>
-      <wrap>False</wrap>
-      <xalign>0.5</xalign>
-      <yalign>0.5</yalign>
-      <xpad>0</xpad>
-      <ypad>0</ypad>
-    </widget>
-
-    <widget>
-      <class>Placeholder</class>
-    </widget>
-
-    <widget>
-      <class>GtkLabel</class>
-      <child_name>Notebook:tab</child_name>
-      <name>label13</name>
-      <label>Workspace 3</label>
-      <justify>GTK_JUSTIFY_CENTER</justify>
-      <wrap>False</wrap>
-      <xalign>0.5</xalign>
-      <yalign>0.5</yalign>
-      <xpad>0</xpad>
-      <ypad>0</ypad>
-    </widget>
-
-    <widget>
-      <class>Placeholder</class>
-    </widget>
-
-    <widget>
-      <class>GtkLabel</class>
-      <child_name>Notebook:tab</child_name>
-      <name>label14</name>
-      <label>Workspace 4</label>
-      <justify>GTK_JUSTIFY_CENTER</justify>
-      <wrap>False</wrap>
-      <xalign>0.5</xalign>
-      <yalign>0.5</yalign>
-      <xpad>0</xpad>
-      <ypad>0</ypad>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/capplets/background/background-properties.xml b/capplets/background/background-properties.xml
deleted file mode 100644
index 2fec0be78..000000000
--- a/capplets/background/background-properties.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0"?>
-<bonobo-config>
-  <section path="main">
-    <entry name="wallpaper-type" type="ulong" value="2"/>
-    <entry name="color1">
-      <any>
-        <type name="Color" repo_id="IDL:Bonobo/Config/Color:1.0" tckind="15" length="0" sub_parts="4">
-          <subnames>
-            <name>r</name>
-            <name>g</name>
-            <name>b</name>
-            <name>a</name>
-          </subnames>
-          <subtypes>
-            <type tckind="7" length="0" sub_parts="0"/>
-            <type tckind="7" length="0" sub_parts="0"/>
-            <type tckind="7" length="0" sub_parts="0"/>
-            <type tckind="7" length="0" sub_parts="0"/>
-          </subtypes>
-        </type>
-        <value>
-          <value>0</value>
-          <value>0.0117189</value>
-          <value>0.156252</value>
-          <value>0</value>
-        </value>
-      </any>
-    </entry>
-    <entry name="color2">
-      <any>
-        <type name="Color" repo_id="IDL:Bonobo/Config/Color:1.0" tckind="15" length="0" sub_parts="4">
-          <subnames>
-            <name>r</name>
-            <name>g</name>
-            <name>b</name>
-            <name>a</name>
-          </subnames>
-          <subtypes>
-            <type tckind="7" length="0" sub_parts="0"/>
-            <type tckind="7" length="0" sub_parts="0"/>
-            <type tckind="7" length="0" sub_parts="0"/>
-            <type tckind="7" length="0" sub_parts="0"/>
-          </subtypes>
-        </type>
-        <value>
-          <value>0.00781262</value>
-          <value>0</value>
-          <value>0.996109</value>
-          <value>0</value>
-        </value>
-      </any>
-    </entry>
-    <entry name="orientation" type="ulong" value="1"/>
-    <entry name="wallpaper_filename">
-      <any>
-        <type name="FileName" repo_id="IDL:Bonobo/Config/FileName:1.0" tckind="21" length="0" sub_parts="1">
-          <subtypes>
-            <type tckind="18" length="0" sub_parts="0"/>
-          </subtypes>
-        </type>
-        <value>
-          <value>/usr/share/pixmaps/backgrounds/ximian/bluestripe.jpeg</value>
-        </value>
-      </any>
-    </entry>
-    <entry name="opacity" type="long" value="100"/>
-    <entry name="enabled" type="boolean" value="true"/>
-    <entry name="wallpaper_enabled" type="boolean" value="true"/>
-    <entry name="show-more-options" type="boolean" value="true"/>
-  </section>
-</bonobo-config>