+Fri Oct 24 19:16:46 2008 Søren Sandmann <sandmann@redhat.com>

+
+	* gnome-about-me.c (main): Remove unused GnomeProgram variable
+
+Fri Oct 24 19:19:46 2008  Søren Sandmann  <sandmann@redhat.com>
+
+	* sound-properties-capplet.c (setup_dialog): Delete code for
+	legacy config options
+	
+Fri Oct 24 19:18:37 2008  Søren Sandmann  <sandmann@redhat.com>
+
+	* capplet-util.c: Include <stdlib.h>
+	* capplet-util.h: Delete COPY_FROM_LEGACY macro
+
+Fri Oct 24 19:16:10 2008  Søren Sandmann  <sandmann@redhat.com>
+
+	* gnome-keyboard-properties.c (main): Remove copying of legacy settings
+


svn path=/trunk/; revision=9112

capplets/common/capplet-util.h

@@ -25,7 +25,8 @@
 #define __CAPPLET_UTIL_H
 
 #include <gio/gio.h>
-#include <gnome.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
 #include <gconf/gconf.h>
 #include <gconf/gconf-changeset.h>
 
@@ -35,14 +36,6 @@
 
 #define WID(s) glade_xml_get_widget (dialog, s)
 
-/* Copy a setting from the legacy gnome-config settings to the ConfigDatabase */
-
-#define COPY_FROM_LEGACY(type, key, legacy_key)                                 \
-	val_##type = gnome_config_get_##type##_with_default (legacy_key, &def); \
-                                                                                \
-	if (!def)                                                               \
-		gconf_client_set_##type (client, key, val_##type, NULL);
-
 /* Some miscellaneous functions useful to all capplets */
 
 void capplet_help (GtkWindow *parent, char const *section);