Compiz

Merge lp://qastaging/~compiz-team/compiz/compiz.fix_1050796 into lp://qastaging/compiz/0.9.8

  1. compiz.fix_1050796
  2. Merge into 0.9.8
Proposed by Sam Spilsbury
Status: Superseded
Proposed branch: lp://qastaging/~compiz-team/compiz/compiz.fix_1050796
Merge into: lp://qastaging/compiz/0.9.8
Prerequisite: lp://qastaging/~compiz-team/compiz/compiz.fix_1042041
Diff against target: 991 lines (+463/-160)
12 files modified
compizconfig/integration/gnome/gsettings/include/ccs_gnome_integration_gsettings_integrated_setting.h (+11/-0)
compizconfig/integration/gnome/gsettings/include/ccs_gnome_integration_gsettings_integrated_setting_factory.h (+11/-0)
compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml (+0/-21)
compizconfig/integration/gnome/gsettings/src/ccs_gnome_integration_gsettings_integrated_setting.c (+26/-2)
compizconfig/integration/gnome/gsettings/src/ccs_gnome_integration_gsettings_integrated_setting_factory.c (+37/-1)
compizconfig/integration/gnome/include/ccs_gnome_integration_constants.h (+2/-0)
compizconfig/integration/gnome/src/ccs_gnome_integration.c (+97/-30)
compizconfig/integration/gnome/src/ccs_gnome_integration_constants.c (+13/-9)
compizconfig/integration/gnome/tests/compizconfig_ccs_mock_gnome_integrated_setting_composition.c (+0/-2)
compizconfig/integration/gnome/tests/compizconfig_test_ccs_gnome_integration.cpp (+194/-48)
compizconfig/libcompizconfig/include/ccs.h (+6/-0)
compizconfig/libcompizconfig/src/main.c (+66/-47)
To merge this branch: bzr merge lp://qastaging/~compiz-team/compiz/compiz.fix_1050796
Reviewer Review Type Date Requested Status
jenkins (community) continuous-integration Needs Fixing
Daniel van Vugt Approve
Review via email: mp+126153@code.qastaging.launchpad.net

This proposal has been superseded by a proposal from 2012-09-25.

Commit message

Remove some options from org.compiz.integrated and integrate them properly - adding special cases for options where upstream gnome forgot to change the key type.
(LP: #1050796)

Description of the change

Remove some options from org.compiz.integrated and integrate them properly - adding special cases for options where upstream gnome forgot to change the key type.

To post a comment you must log in.
Revision history for this message
jenkins (martin-mrazik+qa) wrote :

FAILED: Continuous integration, rev:3389
http://jenkins.qa.ubuntu.com/job/compiz-ci/110/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/110/console

review: Needs Fixing (continuous-integration)
Revision history for this message
jenkins (martin-mrazik+qa) wrote :

FAILED: Continuous integration, rev:3390
http://jenkins.qa.ubuntu.com/job/compiz-ci/114/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/114/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Looks and works fine to me.

A couple of potential issues in ccsCopyValue:
  1. This is not C: 872 + if (!value)
  2. Unreachable code: 918 + return NULL;

But when and if those become a problem, the compiler will tell you.

review: Approve
Revision history for this message
Unity Merger (unity-merger) wrote :

The prerequisite lp:~compiz-team/compiz/compiz.fix_1042041 has not yet been merged into lp:compiz.

Revision history for this message
jenkins (martin-mrazik+qa) wrote :

FAILED: Continuous integration, rev:3391
http://jenkins.qa.ubuntu.com/job/compiz-ci/119/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/119/console

review: Needs Fixing (continuous-integration)

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches