--- a/ChangeLog	Fri Jun 27 15:50:39 2003 +0000
+++ b/ChangeLog	Fri Jun 27 16:03:09 2003 +0000
@@ -1,3 +1,9 @@
+2003-06-27  Glynn Foster  <[email protected]>
+
+	* gnome-media.spec: Add new patch to build.
+	* patches/gnome-media-01-window-icon.diff: Fix the window icon
+	on the cddbslave properties capplet.
+
 2003-06-27  Glynn Foster  <[email protected]>
 
 	* magicdev.spec: Add new patch to build.

--- a/gnome-media.spec	Fri Jun 27 15:50:39 2003 +0000
+++ b/gnome-media.spec	Fri Jun 27 16:03:09 2003 +0000
@@ -2,11 +2,12 @@
 Summary:      GNOME Multimedia
 Group:        System/GUI/GNOME
 Version:      2.2.1.1
-Release:      3
+Release:      4
 Distribution: Mercury
 Vendor:       Sun Microsystems Inc
 License:      GPL
 Source:       http://ftp.gnome.org/pub/GNOME/sources/gnome-media/2.2/gnome-media-%{version}.tar.bz2
+Patch0:       gnome-media-01-window-icon.diff
 URL:          http://www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_docdir}
@@ -27,6 +28,7 @@
 
 %prep
 %setup -q
+%patch0
 
 %build
 CFLAGS="$RPM_OPT_FLAGS"			\

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-media-01-window-icon.diff	Fri Jun 27 16:03:09 2003 +0000
@@ -0,0 +1,24 @@
+--- gnome-media-2.2.1.1/cddb-slave2/cddb-slave-capplet.c	2003-01-08 17:36:18.000000000 +0000
++++ gnome-media-2.2.1.1-hacked/cddb-slave2/cddb-slave-capplet.c	2003-06-27 07:10:31.000000000 +0100
+@@ -850,6 +850,7 @@
+       char **argv)
+ {
+ 	GtkWidget *dialog_win;
++	char *window_icon;
+ 	
+ 	bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
+ 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+@@ -876,6 +877,13 @@
+   	g_signal_connect (G_OBJECT (dialog_win), "response",
+   			  G_CALLBACK (dialog_button_clicked_cb), changeset);
+ 
++	window_icon = gnome_program_locate_file (NULL, GNOME_FILE_DOMAIN_PIXMAP, 
++						 "gnome-cd.png", TRUE, NULL);
++	if (window_icon) {
++		gnome_window_icon_set_from_file (GTK_WINDOW (dialog_win), window_icon);
++		g_free (window_icon);
++	}
++
+ 	gtk_widget_show_all (dialog_win);
+ 
+ 	gtk_main ();