Merge lp:~seb128/compiz/update-apport-hook into lp:compiz/0.9.12

[Sebastien Bacher]

Update the apport hook, get the gsettings config not the gconf one

Update the apport hook, get the gsettings config not the gconf one

Note that it depends on the fix from https://code.launchpad.net/~seb128/apport/relocatable-gsettings-schemas to work

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3989
http://jenkins.qa.ubuntu.com/job/compiz-ci/110/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-xenial-amd64-ci/1/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-xenial-armhf-ci/1
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-xenial-i386-ci/1/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/compiz-ci/110/rebuild

review: Needs Fixing (continuous-integration)

[Marco Trevisan (Treviño) (3v1n0)]

Thanks!

review: Approve

=== modified file 'debian/source_compiz.py'
--- debian/source_compiz.py	2012-07-02 15:26:04 +0000
+++ debian/source_compiz.py	2015-11-27 15:30:39 +0000
@@ -13,15 +13,12 @@
         report.add_hooks_info(ui, srcpackage='xorg')
         return
 
-    
-    # ok, add maximum interesting info without too much spam
-    report['CompizPlugins'] = command_output(['gconftool-2',
-        '--get', '/apps/compiz-1/general/screen0/options/active_plugins'])
-    # User configuration
-    report['GconfCompiz'] = command_output(['gconftool-2', '-R', '/apps/compiz-1'])
+    # get the current profiles, gsettings returns the string quoted so strip those before using
+    current_profile = command_output(['gsettings', 'get', 'org.compiz', 'current-profile']).strip("'")
+    attach_gsettings_schema(report, 'org.compiz.core:/org/compiz/profiles/%s/plugins/core/' % current_profile)
 
     unity_bug = False
-    if ui and "unity" in report['CompizPlugins'] and report['SourcePackage'] != "unity":
+    if ui and "unity" in report['GsettingsChanges'] and report['SourcePackage'] != "unity":
         if ui.yesno("Thanks for reporting this bug. It seems you have unity running. Is the issue you are reporting is related to unity itself rather than compiz?"):
             unity_bug = True