lp:~compiz-team/compiz/compiz.fix_1130679

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:compiz/0.9.9 at revision 3619

Brandon Schaefer (community): Approve on 2013-02-22

PS Jenkins bot (community): Approve (continuous-integration) on 2013-02-21

Łukasz Zemczak: Approve (test-build) on 2013-02-21

Diff: 3164 lines (+1944/-498)

35 files modified

compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_backend.c (+5/-0)
compizconfig/gsettings/src/gsettings.c (+7/-0)
compizconfig/gsettings/tests/CMakeLists.txt (+2/-0)
compizconfig/gsettings/tests/test_gsettings_conformance.cpp (+9/-1)
compizconfig/libcompizconfig/include/ccs-backend.h (+0/-12)
compizconfig/libcompizconfig/include/ccs-fwd.h (+5/-0)
compizconfig/libcompizconfig/include/ccs.h (+19/-4)
compizconfig/libcompizconfig/src/CMakeLists.txt (+5/-0)
compizconfig/libcompizconfig/src/ccs-config-private.h (+7/-0)
compizconfig/libcompizconfig/src/ccs-private.h (+10/-15)
compizconfig/libcompizconfig/src/ccs_backend_loader.c (+245/-0)
compizconfig/libcompizconfig/src/ccs_backend_loader.h (+39/-0)
compizconfig/libcompizconfig/src/ccs_backend_loader_interface.c (+47/-0)
compizconfig/libcompizconfig/src/ccs_backend_loader_interface.h (+65/-0)
compizconfig/libcompizconfig/src/ccs_config_file.c (+373/-0)
compizconfig/libcompizconfig/src/ccs_config_file.h (+39/-0)
compizconfig/libcompizconfig/src/ccs_config_file_interface.c (+56/-0)
compizconfig/libcompizconfig/src/ccs_config_file_interface.h (+75/-0)
compizconfig/libcompizconfig/src/ccs_settings_upgrade_internal.c (+6/-0)
compizconfig/libcompizconfig/src/config.c (+1/-239)
compizconfig/libcompizconfig/src/ini.c (+1/-1)
compizconfig/libcompizconfig/src/iniparser.c (+8/-3)
compizconfig/libcompizconfig/src/log.c (+1/-1)
compizconfig/libcompizconfig/src/main.c (+216/-165)
compizconfig/libcompizconfig/tests/CMakeLists.txt (+6/-1)
compizconfig/libcompizconfig/tests/compizconfig_test_ccs_context.cpp (+270/-1)
compizconfig/libcompizconfig/tests/compizconfig_test_ccs_settings_upgrade_internal.cpp (+10/-1)
compizconfig/mocks/libcompizconfig/CMakeLists.txt (+20/-0)
compizconfig/mocks/libcompizconfig/compizconfig_ccs_backend_loader_mock.cpp (+103/-0)
compizconfig/mocks/libcompizconfig/compizconfig_ccs_backend_loader_mock.h (+77/-0)
compizconfig/mocks/libcompizconfig/compizconfig_ccs_config_file_mock.cpp (+105/-0)
compizconfig/mocks/libcompizconfig/compizconfig_ccs_config_file_mock.h (+92/-0)
compizconfig/mocks/libcompizconfig/compizconfig_ccs_context_mock.h (+8/-3)
debian/patches/ccp_plugin.patch (+12/-33)
src/main.cpp (+0/-18)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1130679: [2013/02/20] compiz/unity don't run, just loading cpp

Critical

Fix Released

Link a bug report

Related blueprints

3632. By Brandon Schaefer on 2013-02-21

* Init char*
* Check if the pointers contain info before freeing

3631. By Sam Spilsbury on 2013-02-21

Refresh ccp patch

3630. By Sam Spilsbury on 2013-02-21

Get rid of the initialPlugins-set-to-active_plugins code in CompManager::init.

It didn't even work anyways, options aren't available until after
CompScreen::init

3629. By Sam Spilsbury on 2013-02-21

const

3628. By Sam Spilsbury on 2013-02-21

Handle cases with preceeding paths better

3627. By Sam Spilsbury on 2013-02-21

Add "ccp" to initialPlugins - it will get added to the plugin list
automatically on updatePlugins, changing the setting manually doesn't
work anymore because the settings aren't even available at this point
in startup

3626. By Sam Spilsbury on 2013-02-21

A few almagamated changes

1. Allow us to open ini files we don't have write access to, just complain
about the fact that we can't lock them.
2. Append items to the scandir list correctly
3. Check for existing profiles on the backends before setting
the profile, as the backends may just go ahead and import the new profile
we want to check for if its already set upon calling getExistingProfiles
4. Pass an actual path to ccsImportFromFile
5. Make sure to load plugins up in ccsImportFromFile
6. Write out changed settings in ccsImportFromFile.

3625. By Sam Spilsbury on 2013-02-21

Make sure we don't have bad behaviour in other cases too

3624. By Sam Spilsbury on 2013-02-21

Make the test pass

3623. By Sam Spilsbury on 2013-02-21

Okay, we should be importing profiles available from the sysconfdir scandir () and not yet registered
in the backend