lp:~mc-return/compiz/compiz.merge-fix1178228-improved-ABI-logic

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:compiz/0.9.10 at revision 3689

PS Jenkins bot (community): Approve (continuous-integration) on 2013-05-10

Sam Spilsbury: Approve on 2013-05-10

MC Return: Needs Resubmitting on 2013-05-10

Diff: 1998 lines (+499/-547)

87 files modified

plugins/addhelper/src/addhelper.cpp (+5/-5)
plugins/animation/src/animation.cpp (+11/-11)
plugins/animationaddon/src/animationaddon.cpp (+12/-11)
plugins/annotate/src/annotate.cpp (+5/-5)
plugins/bench/src/bench.cpp (+5/-6)
plugins/bicubic/src/bicubic.cpp (+5/-7)
plugins/blur/src/blur.cpp (+5/-6)
plugins/ccp/src/ccp.cpp (+3/-3)
plugins/clone/src/clone.cpp (+5/-5)
plugins/colorfilter/src/colorfilter.cpp (+6/-10)
plugins/commands/src/commands.cpp (+3/-4)
plugins/compiztoolbox/src/compiztoolbox.cpp (+12/-11)
plugins/composite/src/composite.cpp (+9/-8)
plugins/copytex/src/copytex.cpp (+4/-4)
plugins/crashhandler/src/crashhandler.cpp (+3/-3)
plugins/cube/src/cube.cpp (+11/-11)
plugins/cubeaddon/src/cubeaddon.cpp (+6/-6)
plugins/dbus/src/dbus.cpp (+4/-3)
plugins/decor/src/decor.cpp (+3/-4)
plugins/expo/src/expo.cpp (+5/-7)
plugins/extrawm/src/extrawm.cpp (+8/-8)
plugins/ezoom/src/ezoom.cpp (+6/-6)
plugins/fade/src/fade.cpp (+6/-7)
plugins/fadedesktop/src/fadedesktop.cpp (+5/-5)
plugins/firepaint/src/firepaint.cpp (+5/-5)
plugins/freewins/src/freewins.cpp (+6/-8)
plugins/gears/src/gears.cpp (+5/-7)
plugins/gnomecompat/src/gnomecompat.cpp (+3/-3)
plugins/grid/src/grid.cpp (+3/-3)
plugins/group/src/init.cpp (+11/-11)
plugins/imgjpeg/src/imgjpeg.cpp (+3/-4)
plugins/imgpng/src/imgpng.cpp (+3/-4)
plugins/imgsvg/src/imgsvg.cpp (+7/-7)
plugins/inotify/src/inotify.cpp (+3/-4)
plugins/kde/src/kde.cpp (+3/-3)
plugins/kdecompat/src/kdecompat.cpp (+5/-5)
plugins/loginout/src/loginout.cpp (+5/-5)
plugins/mag/src/mag.cpp (+6/-9)
plugins/maximumize/src/maximumize.cpp (+3/-3)
plugins/mblur/src/mblur.cpp (+5/-5)
plugins/mousepoll/src/mousepoll.cpp (+9/-8)
plugins/move/src/move.cpp (+3/-3)
plugins/neg/src/neg.cpp (+5/-5)
plugins/notification/src/notification.cpp (+3/-3)
plugins/obs/src/obs.cpp (+5/-5)
plugins/opacify/src/opacify.cpp (+6/-9)
plugins/opengl/src/opengl.cpp (+10/-9)
plugins/place/src/place.cpp (+3/-6)
plugins/put/src/put.cpp (+5/-7)
plugins/reflex/src/reflex.cpp (+5/-7)
plugins/regex/src/regex.cpp (+3/-3)
plugins/resize/src/resize.cpp (+3/-6)
plugins/resizeinfo/src/resizeinfo.cpp (+5/-5)
plugins/ring/src/ring.cpp (+10/-10)
plugins/rotate/src/rotate.cpp (+6/-7)
plugins/scale/src/scale.cpp (+12/-10)
plugins/scaleaddon/src/scaleaddon.cpp (+11/-11)
plugins/scalefilter/src/scalefilter.cpp (+4/-6)
plugins/screenshot/src/screenshot.cpp (+6/-6)
plugins/session/src/session.cpp (+3/-3)
plugins/shelf/src/shelf.cpp (+6/-8)
plugins/shift/src/shift.cpp (+10/-10)
plugins/showdesktop/src/showdesktop.cpp (+5/-7)
plugins/showmouse/src/showmouse.cpp (+6/-6)
plugins/showrepaint/src/showrepaint.cpp (+5/-6)
plugins/snap/src/snap.cpp (+3/-4)
plugins/splash/src/splash.cpp (+5/-5)
plugins/stackswitch/src/stackswitch.cpp (+11/-11)
plugins/staticswitcher/src/staticswitcher.cpp (+6/-7)
plugins/switcher/src/switcher.cpp (+6/-7)
plugins/td/src/3d.cpp (+6/-6)
plugins/text/src/text.cpp (+10/-8)
plugins/thumbnail/src/thumbnail.cpp (+7/-10)
plugins/titleinfo/src/titleinfo.cpp (+3/-3)
plugins/trailfocus/src/trailfocus.cpp (+5/-7)
plugins/trip/src/trip.cpp (+5/-5)
plugins/vpswitch/src/vpswitch.cpp (+3/-3)
plugins/wall/src/wall.cpp (+6/-10)
plugins/wallpaper/src/wallpaper.cpp (+5/-7)
plugins/water/src/water.cpp (+11/-8)
plugins/widget/src/widget.cpp (+5/-7)
plugins/winrules/src/winrules.cpp (+3/-4)
plugins/wizard/src/wizard.cpp (+6/-6)
plugins/wobbly/src/wobbly.cpp (+5/-6)
plugins/workarounds/src/workarounds.cpp (+6/-6)
plugins/workspacenames/src/workspacenames.cpp (+7/-6)
tests/xorg-gtest/plugins/testhelper/src/testhelper.cpp (+3/-3)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1066547: [GLES] Water Effect plug-in: The plug-in now needs OpenGL->Framebuffer object option to be enabled to work, but the user is not informed about that	Low	Fix Released
Bug #1178228: Compiz plugin's ABI check logic could be improved and made faster	Low	Fix Released

Link a bug report

Related blueprints

3690. By MC Return on 2013-05-10

Merged latest lp:compiz and resolved conflicts

3689. By MC Return on 2013-05-09

Use the original missing hardware support handling in the water plugin

3688. By MC Return on 2013-05-09

Improved ABI logic consistently for all plugins

3687. By MC Return on 2013-05-09

Opacity, Brightness and Saturation (obs) .xml cleanup:

Better plugin description.
Improved setting names and tooltips.

Approved by PS Jenkins bot, Sam Spilsbury.

3686. By Christopher Townsend on 2013-05-08

Fixed issue where minimizing an unredirect full screen window would repaint the full screen window after minimizing it even though it isn't really there.
. Fixes: https://bugs.launchpad.net/bugs/1053895.

Approved by PS Jenkins bot, Sam Spilsbury.

3685. By MC Return on 2013-05-06

*Shift Window Switcher, new features:

Implemented new option to adjust the vertical offset of the text placement
and fixed vertical placement calculation for top and bottom positions.
The default offset is 50 pixels now.
Removed hardcoded and redundant float border.

Use 256x256 pixels resolution for icon textures, instead of 96x96.
Minor indentation fixes.

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

Approved by PS Jenkins bot, Sam Spilsbury.

3684. By MC Return on 2013-04-28

Ring Switcher .xml cleanup:

Better description of the "Ring Switcher".
Uppercase for titles.
More precise names for the tabs.
Improved tooltip wording and descriptions.
Changed the order of options in "General Options" tab:
"Ring Windows" and "Overlay Icon" options are now on top.

No settings have been changed.

Approved by PS Jenkins bot, Sam Spilsbury.

3683. By MC Return on 2013-04-28

Stack Window Switcher (stackswitch):

Declaration and assignment of local variables in one line.
Merged if condition checks.
Use prefix de- and increments.
Removed redundant brackets.
Fixed indentation.

Note:
stackswitch is still excluded from compilation, because
it has not been ported to the new GLES-compatible modern
post-r3320 Compiz codebase yet, so this cannot really be
tested at the moment (except in Compiz pre-r3320).

Nevertheless this MP is needed to reduce the diff size
for the GLES port of this plugin, which will follow soon.

Approved by PS Jenkins bot, Sam Spilsbury.

3682. By MC Return on 2013-04-28

Show Desktop .xml cleanup:

Improved plugin description.
Renamed "Misc. Options" tab to "General"
Improved tooltips.

Approved by PS Jenkins bot, Sam Spilsbury.

3681. By Sam Spilsbury on 2013-04-28

Set libcompizconfig_libdir before the modules get a chance to see it.
(LP: #1173799). Fixes: https://bugs.launchpad.net/bugs/1173799.

Approved by PS Jenkins bot, MC Return.