From db77fbf77311a70bfecfbf422e6690b77f6b51ed Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Dec 18 2009 15:45:31 +0000
Subject: Avoid warning messages from the OSD code


---

diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec
index 03d0000..b47e0de 100644
--- a/gnome-settings-daemon.spec
+++ b/gnome-settings-daemon.spec
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
 Version:	2.28.1
-Release:	9%{?dist}
+Release:	10%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -50,6 +50,9 @@ Patch7: iconleak.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=604651
 Patch8: survive-xmm.patch
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=604918
+Patch9: osd-spam.patch
+
 %description
 A daemon to share settings from GNOME to other applications. It also
 handles global keybindings, as well as a number of desktop-wide settings.
@@ -76,6 +79,7 @@ developing applications that use %{name}.
 %patch6 -p1 -b .screen-change
 %patch7 -p1 -b .iconleak
 %patch8 -p1 -b .survive-xmm
+%patch9 -p1 -b .osd-spam
 
 %build
 %configure --enable-static=no --enable-profiling --disable-esd
@@ -187,6 +191,9 @@ fi
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Fri Dec 18 2009 Matthias Clasen <mclasen@redhat.com> 2.28.1-10
+- Avoid warning messages from the OSD code
+
 * Tue Dec 15 2009 Matthias Clasen <mclasen@redhat.com> 2.28.1-9
 - Survive when running without XKB (#547780)
 
diff --git a/osd-spam.patch b/osd-spam.patch
new file mode 100644
index 0000000..0db6dff
--- /dev/null
+++ b/osd-spam.patch
@@ -0,0 +1,13 @@
+diff -up gnome-settings-daemon-2.28.1/plugins/media-keys/gsd-media-keys-window.c.spam gnome-settings-daemon-2.28.1/plugins/media-keys/gsd-media-keys-window.c
+--- gnome-settings-daemon-2.28.1/plugins/media-keys/gsd-media-keys-window.c.spam	2009-12-18 10:32:07.722360259 -0500
++++ gnome-settings-daemon-2.28.1/plugins/media-keys/gsd-media-keys-window.c	2009-12-18 10:33:00.923109059 -0500
+@@ -134,6 +134,9 @@ add_hide_timeout (GsdMediaKeysWindow *wi
+ static void
+ update_window (GsdMediaKeysWindow *window)
+ {
++        if (!gtk_widget_is_drawable (GTK_WIDGET (window)))
++                return;
++
+         remove_hide_timeout (window);
+         add_hide_timeout (window);
+