[libcanberra] Rebuild

[Matthias Clasen]

commit 17a18f95f4061200d35bc926ef6c997ec30f074a
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Fri Jan 7 22:51:01 2011 -0500

    Rebuild

 libcanberra-quit-add.patch |   24 ++++++++++++++++++++++++
 libcanberra.spec           |    9 ++++++++-
 2 files changed, 32 insertions(+), 1 deletions(-)
---
diff --git a/libcanberra-quit-add.patch b/libcanberra-quit-add.patch
new file mode 100644
index 0000000..0094569
--- /dev/null
+++ b/libcanberra-quit-add.patch
@@ -0,0 +1,24 @@
+diff -up libcanberra-0.26/src/canberra-gtk-module.c.quit-add libcanberra-0.26/src/canberra-gtk-module.c
+--- libcanberra-0.26/src/canberra-gtk-module.c.quit-add	2011-01-07 22:48:49.388992626 -0500
++++ libcanberra-0.26/src/canberra-gtk-module.c	2011-01-07 22:49:02.339995153 -0500
+@@ -932,11 +932,6 @@ static void connect_settings(void) {
+         connected = TRUE;
+ }
+ 
+-static gboolean quit_handler(gpointer data) {
+-        dispatch_queue();
+-        return FALSE;
+-}
+-
+ G_MODULE_EXPORT void gtk_module_init(gint *argc, gchar ***argv[]) {
+ 
+         /* This is the same quark libgnomeui uses! */
+@@ -963,8 +958,6 @@ G_MODULE_EXPORT void gtk_module_init(gin
+         install_hook(GTK_TYPE_WIDGET, "drag-drop", &signal_id_widget_drag_drop);
+         install_hook(GTK_TYPE_WIDGET, "drag-failed", &signal_id_widget_drag_failed);
+         install_hook(GTK_TYPE_EXPANDER, "activate", &signal_id_expander_activate);
+-
+-        gtk_quit_add(1, quit_handler, NULL);
+ }
+ 
+ G_MODULE_EXPORT gchar* g_module_check_init(GModule *module);
diff --git a/libcanberra.spec b/libcanberra.spec
index e1194a7..2251024 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,9 +1,12 @@
 Name: libcanberra
 Version: 0.26
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz
+
+Patch0: libcanberra-quit-add.patch
+
 License: LGPLv2+
 Url: http://git.0pointer.de/?p=libcanberra.git;a=summary
 BuildRequires: gtk2-devel
@@ -77,6 +80,7 @@ Development Files for libcanberra Client Development
 
 %prep
 %setup -q
+%patch0 -p1 -b .quit-add
 
 %build
 %configure --disable-static --enable-pulse --enable-alsa --enable-null --enable-gstreamer --disable-oss --with-builtin=dso
@@ -137,6 +141,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Fri Jan  7 2011 Matthias Clasen <mclasen at redhat.com> 0.26-5
+- Rebuild against newer gtk
+
 * Fri Dec 3 2010 Matthias Clasen <mclasen at redhat.com> 0.26-4
 - Rebuild against new gtk