Merge lp:~compiz-team/compiz/compiz.fix_1041535 into lp:compiz/0.9.8

Proposed by Sam Spilsbury on 2012-09-24
Status: Superseded
Proposed branch: lp:~compiz-team/compiz/compiz.fix_1041535
Merge into: lp:compiz/0.9.8
Prerequisite: lp:~compiz-team/compiz/compiz.tests_1042537.3
Diff against target: 150 lines (+41/-23) (has conflicts)
8 files modified
plugins/composite/CMakeLists.txt (+5/-4)
plugins/decor/CMakeLists.txt (+4/-2)
plugins/expo/CMakeLists.txt (+4/-3)
plugins/grid/CMakeLists.txt (+5/-4)
plugins/opengl/CMakeLists.txt (+7/-0)
plugins/place/CMakeLists.txt (+8/-6)
plugins/resize/CMakeLists.txt (+4/-2)
plugins/wall/CMakeLists.txt (+4/-2)
Text conflict in plugins/opengl/CMakeLists.txt
To merge this branch: bzr merge lp:~compiz-team/compiz/compiz.fix_1041535
Reviewer Review Type Date Requested Status
jenkins (community) continuous-integration 2012-09-24 Needs Fixing on 2012-09-24
Daniel van Vugt 2012-09-24 Pending
Review via email: mp+125986@code.launchpad.net

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

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

Commit message

Check the returned value for NULL as the integration backend may fail. If the integration backend fails, it should fail properly

Increased test coverage on CCSGSettingsIntegratedSetting and CCSGNOMEIntegration. Added mocks where appropriate, split out the matcher used in the previous branch.

Description of the change

Increased test coverage on CCSGSettingsIntegratedSetting and CCSGNOMEIntegration. Added mocks where appropriate, split out the matcher used in the previous branch and added the following tests:

        Start 238: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesReturnNull/0
238/582 Test #238: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesReturnNull/0 ...................... Passed 0.02 sec
        Start 239: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesReturnNull/1
239/582 Test #239: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesReturnNull/1 ...................... Passed 0.01 sec
        Start 240: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesReturnNull/2
240/582 Test #240: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesReturnNull/2 ...................... Passed 0.01 sec
        Start 241: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesReturnNull/3
241/582 Test #241: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesReturnNull/3 ...................... Passed 0.01 sec
        Start 242: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesReturnNull/4
242/582 Test #242: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesReturnNull/4 ...................... Passed 0.01 sec
        Start 243: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesReturnNull/5
243/582 Test #243: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesReturnNull/5 ...................... Passed 0.01 sec
        Start 244: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesReturnNull/6
244/582 Test #244: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesReturnNull/6 ...................... Passed 0.01 sec
        Start 245: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesReturnNull/7
245/582 Test #245: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesReturnNull/7 ...................... Passed 0.01 sec
        Start 246: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesReturnNull/8
246/582 Test #246: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesReturnNull/8 ...................... Passed 0.01 sec
        Start 247: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesReturnNull/9
247/582 Test #247: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesReturnNull/9 ...................... Passed 0.01 sec
        Start 248: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesReturnNull/10
248/582 Test #248: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesReturnNull/10 ..................... Passed 0.01 sec
        Start 249: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesReturnNull/11
249/582 Test #249: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesReturnNull/11 ..................... Passed 0.01 sec
        Start 250: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesReturnNull/12
250/582 Test #250: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesReturnNull/12 ..................... Passed 0.01 sec
        Start 251: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesReturnNull/13
251/582 Test #251: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesReturnNull/13 ..................... Passed 0.01 sec
        Start 252: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesReturnNull/14
252/582 Test #252: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesReturnNull/14 ..................... Passed 0.01 sec
        Start 253: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesReturnNull/15
253/582 Test #253: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesReturnNull/15 ..................... Passed 0.01 sec
        Start 254: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/0
254/582 Test #254: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/0 .................... Passed 0.01 sec
        Start 255: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/1
255/582 Test #255: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/1 .................... Passed 0.01 sec
        Start 256: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/2
256/582 Test #256: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/2 .................... Passed 0.01 sec
        Start 257: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/3
257/582 Test #257: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/3 .................... Passed 0.01 sec
        Start 258: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/4
258/582 Test #258: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/4 .................... Passed 0.01 sec
        Start 259: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/5
259/582 Test #259: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/5 .................... Passed 0.01 sec
        Start 260: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/6
260/582 Test #260: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/6 .................... Passed 0.01 sec
        Start 261: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/7
261/582 Test #261: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/7 .................... Passed 0.01 sec
        Start 262: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/8
262/582 Test #262: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/8 .................... Passed 0.01 sec
        Start 263: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/9
263/582 Test #263: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/9 .................... Passed 0.01 sec
        Start 264: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/10
264/582 Test #264: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/10 ................... Passed 0.01 sec
        Start 265: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/11
265/582 Test #265: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/11 ................... Passed 0.01 sec
        Start 266: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/12
266/582 Test #266: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/12 ................... Passed 0.01 sec
        Start 267: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/13
267/582 Test #267: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/13 ................... Passed 0.01 sec
        Start 268: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/14
268/582 Test #268: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/14 ................... Passed 0.01 sec
        Start 269: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/15
269/582 Test #269: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/15 ................... Passed 0.01 sec
        Start 270: CCSGNOMEIntegrationTest.TestConstructComposition
270/582 Test #270: CCSGNOMEIntegrationTest.TestConstructComposition ............................................................................................................ Passed 0.01 sec
        Start 271: CCSGNOMEIntegrationTestReadIntegrated.TestReadInSpecialOptionCurrentViewport
271/582 Test #271: CCSGNOMEIntegrationTestReadIntegrated.TestReadInSpecialOptionCurrentViewport ................................................................................ Passed 0.01 sec
        Start 272: CCSGNOMEIntegrationTestReadIntegrated.TestReadInSpecialOptionFullscreenVisualBell
272/582 Test #272: CCSGNOMEIntegrationTestReadIntegrated.TestReadInSpecialOptionFullscreenVisualBell ........................................................................... Passed 0.01 sec
        Start 273: CCSGNOMEIntegrationTestReadIntegrated.TestReadInSpecialOptionClickToFocus
273/582 Test #273: CCSGNOMEIntegrationTestReadIntegrated.TestReadInSpecialOptionClickToFocus ................................................................................... Passed 0.01 sec
        Start 274: CCSGNOMEIntegrationTestWithMocks.TestConstructGNOMEIntegration
274/582 Test #274: CCSGNOMEIntegrationTestWithMocks.TestConstructGNOMEIntegration .............................................................................................. Passed 0.01 sec
        Start 275: CCSGNOMEIntegrationTestWithMocksReadIntegratedMouseButtonModifiers.TestReadInSpecialOptionMoveInitiateButton
275/582 Test #275: CCSGNOMEIntegrationTestWithMocksReadIntegratedMouseButtonModifiers.TestReadInSpecialOptionMoveInitiateButton ................................................ Passed 0.01 sec
        Start 276: CCSGNOMEIntegrationTestWithMocksReadIntegratedMouseButtonModifiers.TestReadInSpecialOptionResizeInitiateButton
276/582 Test #276: CCSGNOMEIntegrationTestWithMocksReadIntegratedMouseButtonModifiers.TestReadInSpecialOptionResizeInitiateButton .............................................. Passed 0.01 sec
        Start 277: CCSGNOMEIntegrationTestWithMocksWriteIntegratedMouseButtonModifiers.TestWriteMouseButtonModifier
277/582 Test #277: CCSGNOMEIntegrationTestWithMocksWriteIntegratedMouseButtonModifiers.TestWriteMouseButtonModifier ............................................................ Passed 0.01 sec
        Start 278: CCSGNOMEIntegrationTestWriteIntegrated.TestWriteCurrentViewport
278/582 Test #278: CCSGNOMEIntegrationTestWriteIntegrated.TestWriteCurrentViewport ............................................................................................. Passed 0.01 sec
        Start 279: CCSGNOMEIntegrationTestWriteIntegrated.TestWriteFullscreenVisualBell
279/582 Test #279: CCSGNOMEIntegrationTestWriteIntegrated.TestWriteFullscreenVisualBell ........................................................................................ Passed 0.01 sec
        Start 280: CCSGNOMEIntegrationTestWriteIntegrated.TestWriteClickToFocus
280/582 Test #280: CCSGNOMEIntegrationTestWriteIntegrated.TestWriteClickToFocus ................................................................................................

In order to make this work bug 1049169 was mostly fixed too (there are other memleaks so lets leave it open).

To post a comment you must log in.
jenkins (martin-mrazik+qa) wrote : Posted in a previous version of this proposal
review: Needs Fixing (continuous-integration)
jenkins (martin-mrazik+qa) wrote : Posted in a previous version of this proposal
review: Needs Fixing (continuous-integration)
Daniel van Vugt (vanvugt) wrote : Posted in a previous version of this proposal

There's no explicit mention of fixing bug 1041535. Does it?

If so, please claim bug 1041535 and mark it in progress.

review: Needs Information
Martin Mrazik (mrazik) wrote : Posted in a previous version of this proposal

This is the jenkins error:
patching file plugins/expo/src/wall_offset/tests/test-expo-wall-offset.cpp
patching file plugins/expo/CMakeLists.txt
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- rejects in file plugins/expo/CMakeLists.txt
patching file plugins/expo/src/windows_on_viewport/CMakeLists.txt
patching file plugins/expo/src/windows_on_viewport/include/windows-on-viewport.h
patching file plugins/expo/src/windows_on_viewport/src/windows-on-viewport.cpp
patching file plugins/expo/src/windows_on_viewport/tests/CMakeLists.txt
patching file plugins/expo/src/windows_on_viewport/tests/test-windows-on-viewport.cpp
patching file plugins/expo/src/client-list-generator.h
patching file plugins/expo/src/viewport-member-window.h
Patch 100_expo_layout.patch does not apply (enforce with -f)
dh_quilt_patch: quilt --quiltrc /dev/null push -a || test $? = 2 returned exit code 1
make[1]: *** [override_dh_quilt_patch] Error 1
make[1]: Leaving directory `/tmp/buildd/compiz-0.9.8.2+bzr3377'
make: *** [build] Error 2
dpkg-buildpackage: error: debian/rules build gave erro

Daniel van Vugt (vanvugt) wrote : Posted in a previous version of this proposal

Please add a check for NULL inside ccsStringToModifiers so we can declare bug 1041535 fixed.

review: Needs Fixing
Sam Spilsbury (smspillaz) wrote : Posted in a previous version of this proposal

> This is the jenkins error:
> patching file plugins/expo/src/wall_offset/tests/test-expo-wall-offset.cpp
> patching file plugins/expo/CMakeLists.txt
> Hunk #1 FAILED at 1.
> 1 out of 1 hunk FAILED -- rejects in file plugins/expo/CMakeLists.txt
> patching file plugins/expo/src/windows_on_viewport/CMakeLists.txt
> patching file plugins/expo/src/windows_on_viewport/include/windows-on-
> viewport.h
> patching file plugins/expo/src/windows_on_viewport/src/windows-on-viewport.cpp
> patching file plugins/expo/src/windows_on_viewport/tests/CMakeLists.txt
> patching file plugins/expo/src/windows_on_viewport/tests/test-windows-on-
> viewport.cpp
> patching file plugins/expo/src/client-list-generator.h
> patching file plugins/expo/src/viewport-member-window.h
> Patch 100_expo_layout.patch does not apply (enforce with -f)
> dh_quilt_patch: quilt --quiltrc /dev/null push -a || test $? = 2 returned exit
> code 1
> make[1]: *** [override_dh_quilt_patch] Error 1
> make[1]: Leaving directory `/tmp/buildd/compiz-0.9.8.2+bzr3377'
> make: *** [build] Error 2
> dpkg-buildpackage: error: debian/rules build gave erro

Hmm, this branch doesn't touch the expo plugin, so that error is suprising. However, maybe trunk has broken CI. I'll look into it.

Sam Spilsbury (smspillaz) wrote :

Null check added:

1392 === modified file 'compizconfig/integration/gnome/gconf/src/ccs_gnome_integration_gconf_integrated_setting.c'
1393 --- compizconfig/integration/gnome/gconf/src/ccs_gnome_integration_gconf_integrated_setting.c 2012-08-17 07:33:02 +0000
1394 +++ compizconfig/integration/gnome/gconf/src/ccs_gnome_integration_gconf_integrated_setting.c 2012-09-24 03:58:20 +0000
1395 @@ -63,7 +63,8 @@
1396 {
1397 ccsError ("NULL encountered while reading GConf setting");
1398 free (gnomeKeyPath);
1399 - return v;
1400 + free (v);
1401 + return NULL;
1402 }
1403
1404 if (err)
1405 @@ -71,7 +72,8 @@
1406 ccsError ("%s", err->message);
1407 g_error_free (err);
1408 free (gnomeKeyPath);
1409 - return v;
1410 + free (v);
1411 + return NULL;
1412 }
1413
1414 switch (type)
1415 @@ -80,6 +82,8 @@
1416 if (gconfValue->type != GCONF_VALUE_INT)
1417 {
1418 ccsError ("Expected integer value");
1419 + free (v);
1420 + v = NULL;
1421 break;
1422 }
1423
1424 @@ -89,6 +93,8 @@
1425 if (gconfValue->type != GCONF_VALUE_BOOL)
1426 {
1427 ccsError ("Expected boolean value");
1428 + free (v);
1429 + v = NULL;
1430 break;
1431 }
1432
1433 @@ -99,6 +105,8 @@
1434 if (gconfValue->type != GCONF_VALUE_STRING)
1435 {
1436 ccsError ("Expected string value");
1437 + free (v);
1438 + v = NULL;
1439 break;
1440 }
1441
1442 @@ -220,10 +228,17 @@
1443 ccsGConfIntegratedSettingFree ((CCSIntegratedSetting *) info);
1444 }
1445
1446 +void
1447 +ccsGConfGNOMEIntegratedSettingInfoFree (CCSGNOMEIntegratedSettingInfo *info)
1448 +{
1449 + ccsGConfIntegratedSettingFree ((CCSIntegratedSetting *) info);
1450 +}
1451 +
1452 const CCSGNOMEIntegratedSettingInfoInterface ccsGConfGNOMEIntegratedSettingInfoInterface =
1453 {
1454 ccsGConfIntegratedSettingGetSpecialOptionType,
1455 - ccsGConfIntegratedSettingGetGNOMEName
1456 + ccsGConfIntegratedSettingGetGNOMEName,
1457 + ccsGConfGNOMEIntegratedSettingInfoFree
1458 };
1459

(Apologies for the noise, most of the changes are just cleaning up tests and getting the integration code under test)

Sam Spilsbury (smspillaz) wrote :

That too:

@@ -132,9 +132,12 @@
     CCSSettingType type = TypeString;
     CCSSettingValue *v = ccsIntegratedSettingReadValue (mouseButtonModifierSetting, type);

- modMask = ccsStringToModifiers (v->value.asString);
+ if (v)
+ {
+ modMask = ccsStringToModifiers (v->value.asString);

- ccsFreeSettingValueWithType (v, type);
+ ccsFreeSettingValueWithType (v, type);
+ }

     return modMask;
 }

jenkins (martin-mrazik+qa) wrote :
review: Needs Fixing (continuous-integration)

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/composite/CMakeLists.txt'
2--- plugins/composite/CMakeLists.txt 2012-06-24 09:00:27 +0000
3+++ plugins/composite/CMakeLists.txt 2012-09-24 11:46:51 +0000
4@@ -2,9 +2,10 @@
5
6 include (CompizPlugin)
7
8-include_directories (${CMAKE_CURRENT_SOURCE_DIR}/src/pixmapbinding/include)
9-link_directories (${CMAKE_CURRENT_BINARY_DIR}/src/pixmapbinding)
10+if (NOT COMPIZ_DISABLE_PLUGIN_COMPOSITE)
11+ include_directories (${CMAKE_CURRENT_SOURCE_DIR}/src/pixmapbinding/include)
12+ link_directories (${CMAKE_CURRENT_BINARY_DIR}/src/pixmapbinding)
13+ add_subdirectory (src/pixmapbinding)
14+endif (NOT COMPIZ_DISABLE_PLUGIN_COMPOSITE)
15
16 compiz_plugin (composite LIBRARIES compiz_composite_pixmapbinding)
17-
18-add_subdirectory (src/pixmapbinding)
19
20=== modified file 'plugins/decor/CMakeLists.txt'
21--- plugins/decor/CMakeLists.txt 2012-06-24 09:00:27 +0000
22+++ plugins/decor/CMakeLists.txt 2012-09-24 11:46:51 +0000
23@@ -8,8 +8,10 @@
24
25 compiz_plugin(decor PLUGINDEPS composite opengl LIBRARIES decoration compiz_decor_clip_groups compiz_decor_pixmap_requests)
26
27-add_subdirectory (src/clip-groups)
28-add_subdirectory (src/pixmap-requests)
29+if (NOT COMPIZ_DISABLE_PLUGIN_DECOR)
30+ add_subdirectory (src/clip-groups)
31+ add_subdirectory (src/pixmap-requests)
32+endif (NOT COMPIZ_DISABLE_PLUGIN_DECOR)
33
34 if (COMPIZ_BUILD_WITH_RPATH AND NOT COMPIZ_DISABLE_PLUGIN_DECOR)
35
36
37=== modified file 'plugins/expo/CMakeLists.txt'
38--- plugins/expo/CMakeLists.txt 2012-08-14 01:48:45 +0000
39+++ plugins/expo/CMakeLists.txt 2012-09-24 11:46:51 +0000
40@@ -1,7 +1,8 @@
41 find_package (Compiz REQUIRED)
42 include (CompizPlugin)
43
44-add_subdirectory (src/click_threshold)
45-include_directories (src/click_threshold/include)
46-
47+if (NOT COMPIZ_DISABLE_PLUGIN_EXPO)
48+ add_subdirectory (src/click_threshold)
49+ include_directories (src/click_threshold/include)
50+endif (NOT COMPIZ_DISABLE_PLUGIN_EXPO)
51 compiz_plugin (expo PLUGINDEPS composite opengl LIBRARIES compiz_expo_click_threshold)
52
53=== modified file 'plugins/grid/CMakeLists.txt'
54--- plugins/grid/CMakeLists.txt 2012-08-01 00:42:38 +0000
55+++ plugins/grid/CMakeLists.txt 2012-09-24 11:46:51 +0000
56@@ -4,9 +4,10 @@
57
58 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
59
60-include_directories (src/grabhandler/include)
61-link_directories (${CMAKE_CURRENT_BINARY_DIR}/src/grabhandler)
62+if (NOT COMPIZ_DISABLE_PLUGIN_GRID)
63+ include_directories (src/grabhandler/include)
64+ link_directories (${CMAKE_CURRENT_BINARY_DIR}/src/grabhandler)
65+ add_subdirectory (src/grabhandler)
66+endif (NOT COMPIZ_DISABLE_PLUGIN_GRID)
67
68 compiz_plugin (grid PLUGINDEPS composite opengl LIBRARIES compiz_grid_grabhandler)
69-
70-add_subdirectory (src/grabhandler)
71
72=== modified file 'plugins/opengl/CMakeLists.txt'
73--- plugins/opengl/CMakeLists.txt 2012-09-17 13:48:33 +0000
74+++ plugins/opengl/CMakeLists.txt 2012-09-24 11:46:51 +0000
75@@ -8,11 +8,18 @@
76 compiz_opengl_glx_tfp_bind
77 )
78
79+<<<<<<< TREE
80 add_subdirectory (src/doublebuffer)
81 add_subdirectory (src/fsregion)
82 add_subdirectory (src/glxtfpbind)
83
84 include_directories (src/glxtfpbind/include)
85+=======
86+if (NOT COMPIZ_DISABLE_PLUGIN_OPENGL)
87+ add_subdirectory (src/doublebuffer)
88+ add_subdirectory (src/fsregion)
89+endif (NOT COMPIZ_DISABLE_PLUGIN_OPENGL)
90+>>>>>>> MERGE-SOURCE
91
92 if (USE_GLES)
93 compiz_plugin(opengl PLUGINDEPS composite CFLAGSADD "-DUSE_GLES -std=c++0x" LIBRARIES ${OPENGLES2_LIBRARIES} ${INTERNAL_LIBRARIES} dl INCDIRS ${OPENGLES2_INCLUDE_DIR})
94
95=== modified file 'plugins/place/CMakeLists.txt'
96--- plugins/place/CMakeLists.txt 2012-02-02 17:01:15 +0000
97+++ plugins/place/CMakeLists.txt 2012-09-24 11:46:51 +0000
98@@ -2,12 +2,14 @@
99
100 include (CompizPlugin)
101
102-include_directories (${CMAKE_CURRENT_SOURCE_DIR}/src/constrain-to-workarea/include/)
103-include_directories (${CMAKE_CURRENT_SOURCE_DIR}/src/screen-size-change/include/)
104-include_directories (${CMAKE_CURRENT_SOURCE_DIR}/src/smart/include/)
105+if (NOT COMPIZ_DISABLE_PLUGIN_PLACE)
106+ include_directories (${CMAKE_CURRENT_SOURCE_DIR}/src/constrain-to-workarea/include/)
107+ include_directories (${CMAKE_CURRENT_SOURCE_DIR}/src/screen-size-change/include/)
108+ include_directories (${CMAKE_CURRENT_SOURCE_DIR}/src/smart/include/)
109
110-add_subdirectory (src/constrain-to-workarea)
111-add_subdirectory (src/screen-size-change)
112-add_subdirectory (src/smart)
113+ add_subdirectory (src/constrain-to-workarea)
114+ add_subdirectory (src/screen-size-change)
115+ add_subdirectory (src/smart)
116+endif (NOT COMPIZ_DISABLE_PLUGIN_PLACE)
117
118 compiz_plugin (place LIBRARIES compiz_place_constrain_to_workarea compiz_place_screen_size_change compiz_place_smart)
119
120=== modified file 'plugins/resize/CMakeLists.txt'
121--- plugins/resize/CMakeLists.txt 2012-08-15 21:16:17 +0000
122+++ plugins/resize/CMakeLists.txt 2012-09-24 11:46:51 +0000
123@@ -2,7 +2,9 @@
124
125 include (CompizPlugin)
126
127-add_subdirectory (src/logic)
128-include_directories (src/logic/include)
129+if (NOT COMPIZ_DISABLE_PLUGIN_RESIZE)
130+ add_subdirectory (src/logic)
131+ include_directories (src/logic/include)
132+endif (NOT COMPIZ_DISABLE_PLUGIN_RESIZE)
133
134 compiz_plugin(resize PLUGINDEPS composite opengl LIBRARIES resize_logic)
135
136=== modified file 'plugins/wall/CMakeLists.txt'
137--- plugins/wall/CMakeLists.txt 2012-05-21 06:43:20 +0000
138+++ plugins/wall/CMakeLists.txt 2012-09-24 11:46:51 +0000
139@@ -3,7 +3,9 @@
140 include (CompizPlugin)
141 include (CompizDefaults)
142
143-add_subdirectory (src/offset_movement)
144-include_directories (src/offset_movement/include)
145+if (NOT COMPIZ_DISABLE_PLUGIN_WALL)
146+ add_subdirectory (src/offset_movement)
147+ include_directories (src/offset_movement/include)
148+endif (NOT COMPIZ_DISABLE_PLUGIN_WALL)
149
150 compiz_plugin (wall PLUGINDEPS composite opengl mousepoll PKGDEPS cairo cairo-xlib-xrender LIBRARIES compiz_wall_offset_movement dl)

Subscribers

People subscribed via source and target branches