Merge lp:~aacid/dconf/fix_g_slist_remove into lp:~ubuntu-desktop/dconf/ubuntu

[Albert Astals Cid]

Call g_slist_remove_link instead of g_slist_remove since we are passing the GSList* to remove not the data to remove

Call g_slist_remove_link instead of g_slist_remove since we are passing the GSList* to remove not the data to remove

This fixes a crash because calling g_slist_remove will fail and thus next time the list is iterated the data will still be there and bad things will happen

[Albert Astals Cid (aacid)]

Upstream bug reported at https://bugzilla.gnome.org/show_bug.cgi?id=672162

[Albert Astals Cid (aacid)]

Upstream has commited the patch

=== added file 'debian/patches/fix_g_slist_remove.patch'
--- debian/patches/fix_g_slist_remove.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix_g_slist_remove.patch	2012-03-15 16:16:23 +0000
@@ -0,0 +1,13 @@
+diff --git a/dbus-1/dconf-dbus-1.c b/dbus-1/dconf-dbus-1.c
+index a1fd98a..50dc0f8 100644
+--- a/dbus-1/dconf-dbus-1.c
++++ b/dbus-1/dconf-dbus-1.c
+@@ -597,7 +597,7 @@ dconf_dbus_client_unsubscribe (DConfDBusClient *dcdbc,
+ 
+       if (watch->notify == notify && watch->user_data == user_data)
+         {
+-          *ptr = g_slist_remove (*ptr, *ptr);
++          *ptr = g_slist_remove_link (*ptr, *ptr);
+ 
+           dconf_engine_unwatch (dcdbc->engine, watch->name, &dcem);
+           dconf_dbus_client_send (dcdbc, &dcem, NULL, NULL);

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-03-23 04:10:03 +0000
+++ debian/patches/series	2012-03-15 16:16:23 +0000
@@ -2,3 +2,4 @@
 foreign-automake.patch
 remove-ACLOCAL_AMFLAGS.patch
 use-gtk2.patch
+fix_g_slist_remove.patch