Merge lp:~rodrigo-moya/ubuntu/natty/libcanberra/no-gtk-quit-add into lp:~ubuntu-desktop/libcanberra/ubuntu

[Rodrigo Moya]

=== modified file 'debian/changelog'
--- debian/changelog	2011-01-12 15:04:05 +0000
+++ debian/changelog	2011-01-17 10:58:53 +0000
@@ -1,3 +1,10 @@
+libcanberra (0.26-1ubuntu7) UNRELEASED; urgency=low
+
+  * debian/patches/01-dont-use-gtk-quit-add.patch:
+    - Add patch to remove usage of deprecated gtk_quit_add function
+
+ -- Rodrigo Moya <[e-mail]>  Mon, 17 Jan 2011 11:46:50 +0100
+
 libcanberra (0.26-1ubuntu6) natty; urgency=low
 
   * debian/control: Switch gnome-session-canberra back to the GTK2 library, as

=== added file 'debian/patches/01-dont-use-gtk-quit-add.patch'
--- debian/patches/01-dont-use-gtk-quit-add.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/01-dont-use-gtk-quit-add.patch	2011-01-17 10:58:53 +0000
@@ -0,0 +1,22 @@
+diff --git a/src/canberra-gtk-module.c b/src/canberra-gtk-module.c
+index 90c583a..d50347d 100644
+--- a/src/canberra-gtk-module.c
++++ b/src/canberra-gtk-module.c
+@@ -932,7 +932,7 @@ static void connect_settings(void) {
+         connected = TRUE;
+ }
+ 
+-static gboolean quit_handler(gpointer data) {
++static gboolean quit_handler(void) {
+         dispatch_queue();
+         return FALSE;
+ }
+@@ -964,7 +964,7 @@ G_MODULE_EXPORT void gtk_module_init(gint *argc, gchar ***argv[]) {
+         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_atexit(quit_handler);
+ }
+ 
+ G_MODULE_EXPORT gchar* g_module_check_init(GModule *module);

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-11-04 09:34:59 +0000
+++ debian/patches/series	2011-01-17 10:58:53 +0000
@@ -1,1 +1,2 @@
+01-dont-use-gtk-quit-add.patch
 90-patch-theme-for-ubuntu.patch