--- a/ChangeLog	Mon Jan 30 17:42:27 2006 +0000
+++ b/ChangeLog	Tue Jan 31 06:12:32 2006 +0000
@@ -1,3 +1,9 @@
+2006-01-31  Glynn Foster <[email protected]>
+
+	* control-center.spec: Bump to 2.13.90
+	* patches/control-center-23-no-apply-button.diff: Add new
+	patch that removes the apply button.
+
 2006-01-30  Damien Carbery <[email protected]>
 
 	* evolution-data-server.spec: Bump to 1.5.90.

--- a/control-center.spec	Mon Jan 30 17:42:27 2006 +0000
+++ b/control-center.spec	Tue Jan 31 06:12:32 2006 +0000
@@ -9,7 +9,7 @@
 Name:         control-center
 License:      GPL
 Group:        System/GUI/GNOME
-Version:      2.13.5.1
+Version:      2.13.90
 Release:      1
 Distribution: Java Desktop System, Release 3
 Vendor:       Sun Microsystems, Inc.
@@ -55,6 +55,7 @@
 Patch20:      control-center-20-mouse-dialog.diff
 Patch21:      control-center-21-disable-gnome-screensaver.diff
 Patch22:      control-center-22-void-return.diff
+Patch23:      control-center-23-no-apply-button.diff
 
 URL:          http://www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
@@ -131,6 +132,7 @@
 %patch20 -p1
 %patch21 -p1
 %patch22 -p1
+%patch23 -p1
 
 %build
 %ifos linux
@@ -247,6 +249,10 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Jan 31 2006 - [email protected]
+- Add no apply button patch because of braindead maintainer and bump to
+  2.13.90
+
 * Fri Jan 20 2006 - [email protected]
 - Bump to 2.13.5.1.
 - Remove 'mkdir m4' call - fixed in 2.13.5.1.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/control-center-23-no-apply-button.diff	Tue Jan 31 06:12:32 2006 +0000
@@ -0,0 +1,147 @@
+diff -urN control-center-2.13.90/capplets/background/gnome-background-properties.glade control-center-2.13.90-hacked/capplets/background/gnome-background-properties.glade
+--- control-center-2.13.90/capplets/background/gnome-background-properties.glade	2006-01-29 03:52:03.000000000 +1300
++++ control-center-2.13.90-hacked/capplets/background/gnome-background-properties.glade	2006-01-31 19:07:08.567578000 +1300
+@@ -52,19 +52,6 @@
+ 	      <property name="visible">True</property>
+ 	      <property name="can_default">True</property>
+ 	      <property name="can_focus">True</property>
+-	      <property name="label">gtk-apply</property>
+-	      <property name="use_stock">True</property>
+-	      <property name="relief">GTK_RELIEF_NORMAL</property>
+-	      <property name="focus_on_click">True</property>
+-	      <property name="response_id">-10</property>
+-	    </widget>
+-	  </child>
+-
+-	  <child>
+-	    <widget class="GtkButton" id="button2">
+-	      <property name="visible">True</property>
+-	      <property name="can_default">True</property>
+-	      <property name="can_focus">True</property>
+ 	      <property name="label">gtk-cancel</property>
+ 	      <property name="use_stock">True</property>
+ 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+@@ -74,7 +61,7 @@
+ 	  </child>
+ 
+ 	  <child>
+-	    <widget class="GtkButton" id="button3">
++	    <widget class="GtkButton" id="button2">
+ 	      <property name="visible">True</property>
+ 	      <property name="can_default">True</property>
+ 	      <property name="can_focus">True</property>
+diff -urN control-center-2.13.90/capplets/background/gnome-wp-capplet.c control-center-2.13.90-hacked/capplets/background/gnome-wp-capplet.c
+--- control-center-2.13.90/capplets/background/gnome-wp-capplet.c	2006-01-29 03:52:03.000000000 +1300
++++ control-center-2.13.90-hacked/capplets/background/gnome-wp-capplet.c	2006-01-31 19:07:08.570276000 +1300
+@@ -81,9 +81,7 @@
+   GtkTreePath * path;
+ 
+   g_return_if_fail (capplet != NULL);
+-
+-  if (item == NULL)
+-    return;
++  g_return_if_fail (item != NULL);
+ 
+   path = gtk_tree_row_reference_get_path (item->rowref);
+   gtk_tree_view_set_cursor (GTK_TREE_VIEW (capplet->treeview), path,
+@@ -701,9 +699,6 @@
+     g_slist_free (capplet->uri_list);
+   }
+ 
+-  if (capplet->old_item == NULL && item != NULL)
+-    capplet->old_item = gnome_wp_item_dup (item);
+-
+   return FALSE;
+ }
+ 
+diff -urN control-center-2.13.90/capplets/background/gnome-wp-capplet.h control-center-2.13.90-hacked/capplets/background/gnome-wp-capplet.h
+--- control-center-2.13.90/capplets/background/gnome-wp-capplet.h	2006-01-29 03:52:03.000000000 +1300
++++ control-center-2.13.90-hacked/capplets/background/gnome-wp-capplet.h	2006-01-31 19:07:08.568238000 +1300
+@@ -73,10 +73,11 @@
+   GtkWidget * image;
+ 
+   /*
+-     The GnomeWPItem of the wallpaper we were
+-     already set to on startup
++     This is here to compare against when OK is pressed so that we can avoid
++     the 1.4 second timeout for Nautilus to actually give visual feedback,
++     when the filename didn't change
+   */
+-  GnomeWPItem * old_item;
++  gchar * old_filename;
+ };
+ 
+ typedef enum {
+diff -urN control-center-2.13.90/capplets/background/gnome-wp-info.c control-center-2.13.90-hacked/capplets/background/gnome-wp-info.c
+--- control-center-2.13.90/capplets/background/gnome-wp-info.c	2006-01-29 03:52:03.000000000 +1300
++++ control-center-2.13.90-hacked/capplets/background/gnome-wp-info.c	2006-01-31 19:07:08.572345000 +1300
+@@ -96,10 +96,6 @@
+ GnomeWPInfo * gnome_wp_info_dup (const GnomeWPInfo * info) {
+   GnomeWPInfo * new;
+ 
+-  if (info == NULL) {
+-    return NULL;
+-  }
+-
+   new = g_new0 (GnomeWPInfo, 1);
+ 
+   new->uri = g_strdup (info->uri);
+diff -urN control-center-2.13.90/capplets/background/gnome-wp-item.c control-center-2.13.90-hacked/capplets/background/gnome-wp-item.c
+--- control-center-2.13.90/capplets/background/gnome-wp-item.c	2006-01-29 03:52:03.000000000 +1300
++++ control-center-2.13.90-hacked/capplets/background/gnome-wp-item.c	2006-01-31 19:07:08.574239000 +1300
+@@ -109,44 +109,6 @@
+   item = NULL;
+ }
+ 
+-GnomeWPItem * gnome_wp_item_dup (GnomeWPItem * item) {
+-  GnomeWPItem * new_item;
+-  GdkColor color1, color2;
+-
+-  if (item == NULL) {
+-    return NULL;
+-  }
+-
+-  new_item = g_new0 (GnomeWPItem, 1);
+-
+-  new_item->name = g_strdup (item->name);
+-  new_item->filename = g_strdup (item->filename);
+-  new_item->description = g_strdup (item->description);
+-  new_item->imguri = g_strdup (item->imguri);
+-  new_item->options = g_strdup (item->options);
+-  new_item->shade_type = g_strdup (item->shade_type);
+-
+-  new_item->pri_color = g_strdup (item->pri_color);
+-  new_item->sec_color = g_strdup (item->sec_color);
+-
+-  gdk_color_parse (item->pri_color, &color1);
+-  gdk_color_parse (item->sec_color, &color2);
+-
+-  item->pcolor = gdk_color_copy (&color1);
+-  item->scolor = gdk_color_copy (&color2);
+-
+-  new_item->fileinfo = gnome_wp_info_dup (item->fileinfo);
+-  new_item->uriinfo = gnome_wp_info_dup (item->uriinfo);
+-
+-  new_item->rowref = gtk_tree_row_reference_copy (item->rowref);
+-
+-  new_item->deleted = item->deleted;
+-  new_item->width = item->width;
+-  new_item->height = item->height;
+-
+-  return new_item;
+-}
+-
+ static void collect_save_options (GdkPixbuf * pixbuf,
+ 				  gchar *** keys,
+ 				  gchar *** vals,
+diff -urN control-center-2.13.90/capplets/background/gnome-wp-item.h control-center-2.13.90-hacked/capplets/background/gnome-wp-item.h
+--- control-center-2.13.90/capplets/background/gnome-wp-item.h	2006-01-29 03:52:03.000000000 +1300
++++ control-center-2.13.90-hacked/capplets/background/gnome-wp-item.h	2006-01-31 19:07:08.572908000 +1300
+@@ -62,7 +62,6 @@
+ 				 GHashTable * wallpapers,
+ 				 GnomeThumbnailFactory * thumbnails);
+ void gnome_wp_item_free (GnomeWPItem * item);
+-GnomeWPItem * gnome_wp_item_dup (GnomeWPItem * item);
+ GdkPixbuf * gnome_wp_item_get_thumbnail (GnomeWPItem * item,
+ 					 GnomeThumbnailFactory * thumbs);
+ void gnome_wp_item_update_description (GnomeWPItem * item);