Merge lp:~3v1n0/compiz/migration-script-gsettings-sync into lp:compiz/0.9.13

[Marco Trevisan (Treviño)]

Unity MigrationScript: sync gsettings on exit, and only use dconf on failure

[Andrea Azzarone (azzar1)]

+1

review: Approve

=== renamed file 'debian/00_remove_obsolete_plugins_in_unity_session_v1.py' => 'debian/00_remove_obsolete_plugins_in_unity_session_v2.py'
--- debian/00_remove_obsolete_plugins_in_unity_session_v1.py	2016-07-14 10:52:42 +0000
+++ debian/00_remove_obsolete_plugins_in_unity_session_v2.py	2016-07-26 09:21:51 +0000
@@ -45,8 +45,14 @@
         except ValueError:
             pass
 
-        # gsettings doesn't work directly, the key is somewhat reverted. Work one level under then: dconf!
-        # gsettings.set_strv("active-plugins", active_plugins)
-        from subprocess import Popen, PIPE, STDOUT
-        p = Popen(("dconf load "+core_profile_path).split(), stdout=PIPE, stdin=PIPE, stderr=STDOUT)
-        p.communicate(input=bytes("[/]\nactive-plugins={}".format(active_plugins), 'utf-8'))
+        gsettings.set_strv("active-plugins", active_plugins)
+        Gio.Settings.sync()
+
+        # Sometimes settings don't get written correctly, so in case we fallback to dconf
+        if core_settings.get_strv("active-plugins") != active_plugins:
+            try:
+                from subprocess import Popen, PIPE, STDOUT
+                p = Popen(("dconf load "+core_profile_path).split(), stdout=PIPE, stdin=PIPE, stderr=STDOUT)
+                p.communicate(input=bytes("[/]\nactive-plugins={}".format(active_plugins), 'utf-8'))
+            except:
+                pass

=== modified file 'debian/compiz-gnome.migrations'
--- debian/compiz-gnome.migrations	2016-07-14 10:52:42 +0000
+++ debian/compiz-gnome.migrations	2016-07-26 09:21:51 +0000
@@ -1,1 +1,1 @@
-debian/00_remove_obsolete_plugins_in_unity_session_v1.py
+debian/00_remove_obsolete_plugins_in_unity_session_v2.py