Compiz

Merge lp://qastaging/~compiz-team/compiz/compiz.gtk-window-decorator-gsettings.cleanup-1 into lp://qastaging/compiz/0.9.8

  1. compiz.gtk-window-decorator-gsettings.cleanup-1
  2. Merge into 0.9.8
Proposed by Sam Spilsbury
Status: Superseded
Proposed branch: lp://qastaging/~compiz-team/compiz/compiz.gtk-window-decorator-gsettings.cleanup-1
Merge into: lp://qastaging/compiz/0.9.8
Prerequisite: lp://qastaging/~compiz-team/compiz/compiz.gtk-window-decorator-gsettings
Diff against target: 2323 lines (+792/-414)
33 files modified
gtk/window-decorator/CMakeLists.txt (+69/-69)
gtk/window-decorator/frames.c (+1/-2)
gtk/window-decorator/gwd-settings-interface.c (+19/-0)
gtk/window-decorator/gwd-settings-interface.h (+3/-2)
gtk/window-decorator/gwd-settings-notified-interface.c (+19/-0)
gtk/window-decorator/gwd-settings-notified-interface.h (+3/-2)
gtk/window-decorator/gwd-settings-notified.c (+28/-9)
gtk/window-decorator/gwd-settings-notified.h (+2/-1)
gtk/window-decorator/gwd-settings-storage-gconf.c (+65/-27)
gtk/window-decorator/gwd-settings-storage-gconf.h (+2/-1)
gtk/window-decorator/gwd-settings-storage-gsettings.c (+76/-40)
gtk/window-decorator/gwd-settings-storage-gsettings.h (+2/-1)
gtk/window-decorator/gwd-settings-storage-interface.c (+19/-0)
gtk/window-decorator/gwd-settings-storage-interface.h (+4/-3)
gtk/window-decorator/gwd-settings-writable-interface.c (+43/-24)
gtk/window-decorator/gwd-settings-writable-interface.h (+58/-50)
gtk/window-decorator/gwd-settings-xproperty-interface.c (+19/-0)
gtk/window-decorator/gwd-settings-xproperty-interface.h (+3/-2)
gtk/window-decorator/gwd-settings-xproperty-storage.c (+68/-33)
gtk/window-decorator/gwd-settings-xproperty-storage.h (+4/-1)
gtk/window-decorator/gwd-settings.c (+101/-78)
gtk/window-decorator/gwd-settings.h (+4/-5)
gtk/window-decorator/metacity.c (+2/-2)
gtk/window-decorator/tests/CMakeLists.txt (+58/-58)
gtk/window-decorator/tests/compiz_gwd_mock_settings.cpp (+19/-0)
gtk/window-decorator/tests/compiz_gwd_mock_settings_notified.cpp (+19/-0)
gtk/window-decorator/tests/compiz_gwd_mock_settings_notified.h (+2/-1)
gtk/window-decorator/tests/compiz_gwd_mock_settings_storage.cpp (+19/-0)
gtk/window-decorator/tests/compiz_gwd_mock_settings_storage.h (+2/-1)
gtk/window-decorator/tests/compiz_gwd_mock_settings_writable.cpp (+19/-0)
gtk/window-decorator/tests/compiz_gwd_mock_settings_writable.h (+2/-1)
gtk/window-decorator/tests/compiz_gwd_tests.h.in (+19/-0)
gtk/window-decorator/tests/test_gwd_settings.cpp (+19/-1)
To merge this branch: bzr merge lp://qastaging/~compiz-team/compiz/compiz.gtk-window-decorator-gsettings.cleanup-1
Reviewer Review Type Date Requested Status
Daniel van Vugt Approve
jenkins (community) continuous-integration Approve
Review via email: mp+123051@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2012-09-05.

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

Commit message

Implements some cleanup that was suggested on the merge for the original port to gsettings

1) aligns variables and functions
2) makes functions static where they should be
3) C89 compliance

Fixes (LP: #1042323)

Description of the change

This implements some cleanup that was suggested on the merge for the original port to gsettings

1) aligns variables and functions
2) makes functions static where they should be
3) C89 compliance

Fixes (LP: #1042323)

The FFe is now acked and this branch can be merged

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

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Daniel van Vugt (vanvugt) wrote : Posted in a previous version of this proposal

Copyrights changed to 2010?

review: Needs Fixing
Revision history for this message
Daniel van Vugt (vanvugt) wrote : Posted in a previous version of this proposal

I saw at least one C89 conformance issue remaining, but forget that. If and when we tell the compiler to care, it will reveal all such problems for us.

Please just fix the copyright year.

Revision history for this message
Sam Spilsbury (smspillaz) wrote : Posted in a previous version of this proposal

Thanks, I'll do that when I get home. We also need to merge this one into lp:~compiz-team/compiz/compiz.gtk-window-decorator.fix-metacity-cairo (for some reason it didn't get pushed up yesterday)

Revision history for this message
jenkins (martin-mrazik+qa) wrote : Posted in a previous version of this proposal

PASSED: Continuous integration, rev:3418
http://jenkins.qa.ubuntu.com/job/compiz-ci/33/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/33/console

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

PASSED: Continuous integration, rev:3418
http://jenkins.qa.ubuntu.com/job/compiz-ci/37/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/37/console

review: Approve (continuous-integration)
Revision history for this message
Daniel van Vugt (vanvugt) :
review: Approve
Revision history for this message
Unity Merger (unity-merger) wrote :

No proposals found for merge of lp:~compiz-team/compiz/compiz.gtk-window-decorator-gsettings into lp:compiz.

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