Compiz

Merge lp://staging/~muktupavels/compiz/remove-mate-integration into lp://staging/compiz/0.9.13

  1. remove-mate-integration
  2. Merge into 0.9.13
Proposed by Alberts Muktupāvels
Status: Merged
Approved by: Dmitry Shachnev
Approved revision: 4201
Merged at revision: 4207
Proposed branch: lp://staging/~muktupavels/compiz/remove-mate-integration
Merge into: lp://staging/compiz/0.9.13
Diff against target: 5297 lines (+0/-5174)
23 files modified
compizconfig/integration/CMakeLists.txt (+0/-1)
compizconfig/integration/mate/CMakeLists.txt (+0/-42)
compizconfig/integration/mate/gsettings/CMakeLists.txt (+0/-54)
compizconfig/integration/mate/gsettings/include/ccs_mate_integration_gsettings_integrated_setting.h (+0/-40)
compizconfig/integration/mate/gsettings/include/ccs_mate_integration_gsettings_integrated_setting_factory.h (+0/-46)
compizconfig/integration/mate/gsettings/include/ccs_mate_integration_gsettings_wrapper_factory.h (+0/-44)
compizconfig/integration/mate/gsettings/src/ccs_mate_integration_gsettings_integrated_setting.c (+0/-355)
compizconfig/integration/mate/gsettings/src/ccs_mate_integration_gsettings_integrated_setting_factory.c (+0/-261)
compizconfig/integration/mate/gsettings/src/ccs_mate_integration_gsettings_wrapper_factory.c (+0/-136)
compizconfig/integration/mate/gsettings/tests/CMakeLists.txt (+0/-30)
compizconfig/integration/mate/gsettings/tests/compizconfig_test_ccs_mate_gsettings_integrated_setting.cpp (+0/-443)
compizconfig/integration/mate/include/ccs_mate_fwd.h (+0/-13)
compizconfig/integration/mate/include/ccs_mate_integrated_setting.h (+0/-64)
compizconfig/integration/mate/include/ccs_mate_integration.h (+0/-46)
compizconfig/integration/mate/include/ccs_mate_integration_constants.h (+0/-217)
compizconfig/integration/mate/include/ccs_mate_integration_types.h (+0/-19)
compizconfig/integration/mate/src/ccs_mate_integrated_setting.c (+0/-161)
compizconfig/integration/mate/src/ccs_mate_integration.c (+0/-815)
compizconfig/integration/mate/src/ccs_mate_integration_constants.c (+0/-1099)
compizconfig/integration/mate/tests/CMakeLists.txt (+0/-46)
compizconfig/integration/mate/tests/compizconfig_ccs_mock_mate_integrated_setting_composition.c (+0/-220)
compizconfig/integration/mate/tests/compizconfig_ccs_mock_mate_integrated_setting_composition.h (+0/-41)
compizconfig/integration/mate/tests/compizconfig_test_ccs_mate_integration.cpp (+0/-981)
To merge this branch: bzr merge lp://staging/~muktupavels/compiz/remove-mate-integration
Reviewer Review Type Date Requested Status
Dmitry Shachnev Approve
Martin Wimpress  Pending
Review via email: mp+362761@code.staging.launchpad.net

Commit message

compizconfig: remove unused MATE integration

Description of the change

MATE integration is not used at all. Either this is unfinished work or someone did not understand what he was doing...

GNOME integration is built as static library that is used by gsettings backend. For example ccsGNOMEIntegrationBackendNew is called in compizconfig/gsettings/src/gsettings.c.

To post a comment you must log in.
Revision history for this message
Dmitry Shachnev (mitya57) wrote :

And there are almost no code changes compared to GNOME integration, it is mostly renaming functions from GNOME* to MATE*, removing some Unity-specific code, and removing the gschema.

Also it misses some fixes like the recent s/fullscreen/fullscreen-flash/ fix.

If someone wants to reintroduce this in the future, it is better to reuse existing code rather than duplicate it.

review: Approve
Revision history for this message
Alberts Muktupāvels (muktupavels) wrote :

I think there could be multiple options:

- duplicate also gsettings backend as gsettings-mate, but that does not sound like good thing to just add MATE integration.

- Link MATE integration with gsettings backend and choose integration based on current desktop environment.

- Change integration setting in configuration from boolean to string or enum - None, GNOME and MATE. And if backend supports integration (ini backend does not) then it could return list with valid integrations that user can choose from in ccsm. Of course default provided by config.

Third option in my opinion could be best thing and second might work, but does not sound that good. Anyway MATE configuration currently has integration = false and I am not going to do this work... If anyone decides to do this work this can be reverted if needed.

lp://staging/~muktupavels/compiz/remove-mate-integration updated
4201. By Alberts Muktupāvels

Merge with lp:compiz.

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