← Back to branch summary

~sil2100/compiz/quickfix_1141079_raring

« back to all changes in this revision

Viewing changes to compizconfig/libcompizconfig/include/ccs-fwd.h

  • Committer: Tarmac
  • Author(s): Sam Spilsbury, Brandon Schaefer
  • Date: 2013-02-22 05:32:31 UTC
  • mfrom: (3617.1.15 compiz.fix_1130679)
  • Revision ID: tarmac-20130222053231-dlp3151si62x4dw9
Fix startup issues

Amalgamated changes:

0. Re-set the setting parents correctly after an upgrade
1. Move the backend loading and config file handling code into separate objects, we need to inject them by interface in order to isolate CCSContextDefaultImpl for testing
2. Add the ccp plugin to "initialPlugins" rather than setting the option directly, that never worked.
3. Added some framework to force-import any profile available in the system config dirs and not reported as existing by the backing. This is so that we have a guaruntee that we will get its values
4. Bail out correctly when a schema couldn't be found

(LP: #1130679). Fixes: https://bugs.launchpad.net/bugs/1130679.

Approved by Brandon Schaefer, PS Jenkins bot, Łukasz Zemczak.

Show diffs side-by-side

added added

removed removed

Lines of Context:
compizconfig/libcompizconfig/include/ccs-fwd.h
33
33
typedef struct _CCSContext                   CCSContext;
34
34
typedef struct _CCSBackend                   CCSBackend;
35
35
typedef struct _CCSBackendInfo               CCSBackendInfo;
 
36
typedef struct _CCSBackendInterface          CCSBackendInterface;
 
37
typedef struct _CCSBackendLoader             CCSBackendLoader;
36
38
typedef struct _CCSDynamicBackend            CCSDynamicBackend;
 
39
typedef struct _CCSConfigFile                CCSConfigFile;
37
40
typedef struct _CCSIntegration               CCSIntegration;
38
41
typedef struct _CCSSettingValue              CCSSettingValue;
39
42
typedef struct _CCSIntegratedSettingInfo     CCSIntegratedSettingInfo;
42
45
typedef struct _CCSIntegratedSettingsStorage CCSIntegratedSettingsStorage;
43
46
typedef struct _CCSInterfaceTable            CCSInterfaceTable;
44
47
 
 
48
typedef CCSBackendInterface * (*BackendGetInfoProc) (void);
 
49
 
45
50
COMPIZCONFIG_END_DECLS
46
51
 
47
52
#endif