From 8b45211a8fd7d3187996a16a3fe18a3e6a85b591 Mon Sep 17 00:00:00 2001
From: "Owen W. Taylor" <otaylor@fishsoup.net>
Date: Mon, 14 Mar 2011 13:54:25 -0400
Subject: [PATCH] gnome-shell.modules: patch libcanberra to not use
 gtk_quit_add()

Add patch from the main GNOME 3 moduleset to make libcanberra
work properly with GTK+ 3.
---
 tools/build/gnome-shell.modules        |  4 +++-
 tools/build/libcanberra-quit-add.patch | 24 ++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 tools/build/libcanberra-quit-add.patch

diff --git a/tools/build/gnome-shell.modules b/tools/build/gnome-shell.modules
index 3f51fa2ac..6c8db0982 100644
--- a/tools/build/gnome-shell.modules
+++ b/tools/build/gnome-shell.modules
@@ -184,7 +184,9 @@
   <autotools id="libcanberra" autogen-sh="configure">
     <branch repo="0pointer.de" module="libcanberra/libcanberra-0.26.tar.gz" version="0.26"
             hash="sha256:4b5d8d2c2835133620adbc53745dd107b6e58b9a2963059e8f457143fee00982"
-            md5sum="ee2c66ada7c851a4e7b6eb1682285a24" size="463209" />
+            md5sum="ee2c66ada7c851a4e7b6eb1682285a24" size="463209">
+      <patch file="libcanberra-quit-add.patch" strip="1"/>
+    </branch>
     <dependencies>
       <dep package="gtk3"/>
     </dependencies>
diff --git a/tools/build/libcanberra-quit-add.patch b/tools/build/libcanberra-quit-add.patch
new file mode 100644
index 000000000..0094569ae
--- /dev/null
+++ b/tools/build/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);