Merge lp:~aacid/dconf-qt/unsubscribe_on_destruction into lp:~ubuntu-desktop/dconf-qt/ubuntu

[Albert Astals Cid]

Unsubscribe from dconf-dbus on ~QConf

Otherwise crashes will happen when dconf-dbus calls back and QConf has already been deleted

[Albert Astals Cid (aacid)]

Upstream commit requested at https://gitorious.org/dconf-qt/dconf-qt/merge_requests/2

[Albert Astals Cid (aacid)]

Upstream commit merged already :-)

[Didier Roche-Tolomelli (didrocks)]

excellent! Merging thanks :)

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-07-25 15:23:46 +0000
+++ debian/changelog	2012-03-14 16:41:32 +0000
@@ -2,6 +2,8 @@
 
   * debian/control:
     - create the upstream project on launchpad and change Vcs-Bzr
+  * debian/patches/03_unsubscribe_on_destruction.patch:
+    - unsubscribe from dconf-bus in ~QConf
 
  -- Didier Roche <[e-mail]>  Mon, 25 Jul 2011 17:23:24 +0200
 

=== added file 'debian/patches/03_unsubscribe_on_destruction.patch'
--- debian/patches/03_unsubscribe_on_destruction.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/03_unsubscribe_on_destruction.patch	2012-03-14 16:41:32 +0000
@@ -0,0 +1,16 @@
+diff --git a/lib/qconf.cpp b/lib/qconf.cpp
+index e743261..57af1d8 100644
+--- a/lib/qconf.cpp
++++ b/lib/qconf.cpp
+@@ -132,8 +132,10 @@ QConf::QConf()
+ }
+ 
+ QConf::~QConf() {
+-    if (priv->path != NULL)
++    if (priv->path != NULL) {
++        dconf_dbus_client_unsubscribe(dconfClient, qconf_notify, this);
+         delete priv->path;
++    }
+ 
+     delete priv;
+ }

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-07-25 09:02:32 +0000
+++ debian/patches/series	2012-03-14 16:41:32 +0000
@@ -1,2 +1,3 @@
 01_fix_pc_generation.patch
 02_link_again_dconf_dbus.patch
+03_unsubscribe_on_destruction.patch