Merge lp:~didrocks/unity/ignore_gconf_change_on_destruction into lp:unity

[Didier Roche-Tolomelli]

unregister gconf notify events on destruction (LP: #762120)

=== modified file 'src/PlacesHomeView.cpp'
--- src/PlacesHomeView.cpp	2011-04-20 12:27:19 +0000
+++ src/PlacesHomeView.cpp	2011-04-26 12:45:20 +0000
@@ -119,21 +119,21 @@
                         MEDIA_DIR,
                         GCONF_CLIENT_PRELOAD_NONE,
                         NULL);
-  gconf_client_notify_add(_client,
-                          BROWSER_DIR"/exec", 
-                          (GConfClientNotifyFunc)OnKeyChanged,
-                          this,
-                          NULL, NULL);
-  gconf_client_notify_add(_client,
-                          MAIL_DIR"/command",
-                          (GConfClientNotifyFunc)OnKeyChanged,
-                          this,
-                          NULL, NULL);
-  gconf_client_notify_add(_client,
-                          MEDIA_DIR"/exec",
-                          (GConfClientNotifyFunc)OnKeyChanged,
-                          this,
-                          NULL, NULL);
+  _browser_gconf_notify = gconf_client_notify_add(_client,
+                                                  BROWSER_DIR"/exec", 
+                                                  (GConfClientNotifyFunc)OnKeyChanged,
+                                                  this,
+                                                  NULL, NULL);
+  _mail_gconf_notify =  gconf_client_notify_add(_client,
+                                                MAIL_DIR"/command",
+                                                (GConfClientNotifyFunc)OnKeyChanged,
+                                                this,
+                                                NULL, NULL);
+  _media_gconf_notify = gconf_client_notify_add(_client,
+                                                MEDIA_DIR"/exec",
+                                                (GConfClientNotifyFunc)OnKeyChanged,
+                                                this,
+                                                NULL, NULL);
                           
   _last_activate_time.tv_sec = 0;
   _last_activate_time.tv_nsec = 0;
@@ -179,6 +179,16 @@
 
   if (_ubus_handle != 0)
     ubus_server_unregister_interest (ubus_server_get_default (), _ubus_handle);
+    
+  if (_browser_gconf_notify)
+    gconf_client_notify_remove (_client, _browser_gconf_notify);
+  if (_mail_gconf_notify)
+    gconf_client_notify_remove (_client, _mail_gconf_notify);
+  if (_media_gconf_notify)
+    gconf_client_notify_remove (_client, _media_gconf_notify);
+  gconf_client_remove_dir (_client, BROWSER_DIR, NULL);
+  gconf_client_remove_dir (_client, MAIL_DIR, NULL);
+  gconf_client_remove_dir (_client, MEDIA_DIR, NULL);
 }
 
 void

=== modified file 'src/PlacesHomeView.h'
--- src/PlacesHomeView.h	2011-04-20 12:27:19 +0000
+++ src/PlacesHomeView.h	2011-04-26 12:45:20 +0000
@@ -72,6 +72,9 @@
   struct timespec _last_activate_time;
 
   guint _ubus_handle;
+  guint _browser_gconf_notify;
+  guint _mail_gconf_notify;
+  guint _media_gconf_notify;
 };