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.
This commit is contained in:
Owen W. Taylor 2011-03-14 13:54:25 -04:00
parent f079501cff
commit 8b45211a8f
2 changed files with 27 additions and 1 deletions

View File

@ -184,7 +184,9 @@
<autotools id="libcanberra" autogen-sh="configure"> <autotools id="libcanberra" autogen-sh="configure">
<branch repo="0pointer.de" module="libcanberra/libcanberra-0.26.tar.gz" version="0.26" <branch repo="0pointer.de" module="libcanberra/libcanberra-0.26.tar.gz" version="0.26"
hash="sha256:4b5d8d2c2835133620adbc53745dd107b6e58b9a2963059e8f457143fee00982" hash="sha256:4b5d8d2c2835133620adbc53745dd107b6e58b9a2963059e8f457143fee00982"
md5sum="ee2c66ada7c851a4e7b6eb1682285a24" size="463209" /> md5sum="ee2c66ada7c851a4e7b6eb1682285a24" size="463209">
<patch file="libcanberra-quit-add.patch" strip="1"/>
</branch>
<dependencies> <dependencies>
<dep package="gtk3"/> <dep package="gtk3"/>
</dependencies> </dependencies>

View File

@ -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);