--- a/ChangeLog	Mon Oct 29 05:27:55 2007 +0000
+++ b/ChangeLog	Mon Oct 29 05:53:35 2007 +0000
@@ -1,3 +1,10 @@
+2007-10-29  Glynn Foster  <[email protected]>
+
+	* base-specs/control-center.spec,
+	* patches/control-center-02-add-wallpaper-dialog.diff: This
+        patch is long due to be removed since we're now using the 
+        G_USER_DIRECTORY_* defines from freedesktop.org.
+
 2007-10-29  Glynn Foster  <[email protected]>
 
 	* patches/gnome-system-tools-03-network.diff,

--- a/base-specs/control-center.spec	Mon Oct 29 05:27:55 2007 +0000
+++ b/base-specs/control-center.spec	Mon Oct 29 05:53:35 2007 +0000
@@ -20,8 +20,6 @@
 Source1:     %{name}-po-sun-%{po_sun_version}.tar.bz2
 # date:2006-12-07 owner:dcarbery type:bug bugzilla:383356
 Patch1:       control-center-01-no-libgnomekbd.diff
-# date:2004-06-25 owner:dkenny type:bug bugster:5043340
-Patch2:       control-center-02-add-wallpaper-dialog.diff
 # date:2004-10-06 owner:dkenny type:bug bugster:5101706
 Patch3:       control-center-03-logout-shortcut.diff
 # date:2004-10-19 owner:dkenny type:feature bugster:4878555
@@ -98,7 +96,6 @@
 cd po-sun; make; cd ..
 %endif
 %patch1 -p1
-%patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1

--- a/patches/control-center-02-add-wallpaper-dialog.diff	Mon Oct 29 05:27:55 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-diff -up gnome-control-center-2.19.92/capplets/appearance/appearance-desktop.c.orig gnome-control-center-2.19.92/capplets/appearance/appearance-desktop.c
---- gnome-control-center-2.19.92/capplets/appearance/appearance-desktop.c.orig	2007-08-23 17:46:39.000000000 +0100
-+++ gnome-control-center-2.19.92/capplets/appearance/appearance-desktop.c	2007-09-05 18:17:43.378242000 +0100
-@@ -925,6 +925,7 @@ desktop_init (AppearanceData *data,
-   GtkCellRenderer *cr;
-   GtkFileFilter *filter;
-   const gchar *pictures;
-+  char *default_dir, *temp_dir;
- 
-   g_object_set (gtk_settings_get_default (), "gtk-tooltip-timeout", 500, NULL);
- 
-@@ -1039,6 +1040,16 @@ desktop_init (AppearanceData *data,
- 
-   wp_set_sensitivities (data);
- 
-+  temp_dir = g_strconcat (g_get_home_dir () , "/Documents", NULL);
-+  default_dir = g_strconcat (temp_dir, "/Pictures", NULL);
-+
-+  if (!g_file_test (default_dir, G_FILE_TEST_IS_DIR)) {
-+       g_free (default_dir);
-+       default_dir = g_strdup (temp_dir);
-+  }
-+
-+  g_free (temp_dir);
-+
-   data->wp_filesel = GTK_FILE_CHOOSER (
-   		     gtk_file_chooser_dialog_new_with_backend (_("Add Wallpaper"),
-                      GTK_WINDOW (glade_xml_get_widget (data->xml, "appearance_window")),
-@@ -1051,6 +1062,9 @@ desktop_init (AppearanceData *data,
-                      NULL));
- 
-   gtk_file_chooser_set_select_multiple (data->wp_filesel, TRUE);
-+
-+  gtk_file_chooser_set_current_folder (data->wp_filesel, default_dir);
-+
-   gtk_file_chooser_set_use_preview_label (data->wp_filesel, FALSE);
- 
-   pictures = g_get_user_special_dir (G_USER_DIRECTORY_PICTURES);