lp:~mkhu/compiz/compiz.fix_1067246

Branch merges

Propose for merging

No branches dependent on this one.

Superseded for merging into lp:compiz/0.9.10

Sam Spilsbury: Needs Fixing on 2013-05-20

Diff: 76 lines (+1/-54)

2 files modified

src/logmessage/CMakeLists.txt (+1/-3)
src/logmessage/include/core/logmessage.h (+0/-51)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1067246: Duplicate files: include/core/logmessage.h == src/logmessage/include/core/logmessage.h

Low

Fix Released

Link a bug report

Related blueprints

3719. By Micheal Hsu on 2013-05-20

remove redundant logmessage.h file

3718. By MC Return on 2013-05-18

ccp code cleanup:

Declare variables if you need them, do not declare them if you return.
Declare CCSSettingValue *val; outside the foreach loop.
Use prefix instead of postfix increments.
Merged if condition checks.
Declaration and assignment of variables in one line.
Removed redundant brackets.
Added and removed newlines.
Fixed indentation.

Approved by PS Jenkins bot, Sam Spilsbury.

3717. By MC Return on 2013-05-18

Text plugin code cleanup:

Do not declare variables you do not need if you return anyway.
Use prefix instead of postfix increments.
Merged if condition checks.
Declaration and assignment of variables in one line.
Added and removed newlines.
Removed redundant brackets.
Fixed indentation.

Approved by PS Jenkins bot, Sam Spilsbury.

3716. By Sami Jaktholm on 2013-05-18

Grid: Check that composite and opengl ABIs are COMPIZ_COMPOSITE_ABI and
      COMPIZ_OPENGL_ABI instead of CORE_ABIVERSION. Fixes: https://bugs.launchpad.net/bugs/1181461.

Approved by PS Jenkins bot, Sam Spilsbury.

3715. By MC Return on 2013-05-17

Titleinfo, minor code cleanup:

Declaration and assignment of local variables in one line.
Removed redundant brackets.
Added and removed newlines.
Fixed indentation.

Approved by PS Jenkins bot, Sam Spilsbury.

3714. By MC Return on 2013-05-17

Annotate plugin, code cleanup:

Use prefix instead of postfix increment.
Declaration and assignment of local variables in one line.
Removed redundant brackets.
Added and removed newlines if appropriate.
Fixed indentation.

Annotate plugin, fixes:

Use GL_LINE_LOOP to draw the rectangle outline as glRecti is not supported on GLES.
Simplified the coordinate calculation as the offset is not really needed here.

Approved by PS Jenkins bot, Sam Spilsbury.

3713. By MC Return on 2013-05-17

Mousepoll code cleanup:

Removed the unused variables MP_OPTION_MOUSE_POLL_INTERVAL
and MP_OPTION_NUM.
Declaration and assignment of variables in one line.
Added and removed newlines.
Removed redundant brackets.
Fixed indentation.

Approved by PS Jenkins bot, Sam Spilsbury.

3712. By Micheal Hsu on 2013-05-16

gtk-window-decorator: destroy action menu when any of the (close, min, max) buttons on the title bar is pressed. Fixes: https://bugs.launchpad.net/bugs/1101648.

Approved by PS Jenkins bot, Sam Spilsbury.

3711. By MC Return on 2013-05-16

EZoom plugin, code improvements:

Bail out of functions ASAP, do not calculate stuff you might not need.

Replaced: if (zoom_level == 1.0f && zooms.at (out).newZoom == 1.0f)
with: if (zoom_level == zooms.at (out).newZoom)
because we always want to get out of here if the target level is the same
as current zoom level, not only in the case both are 1.0f.

EZoom plugin, code cleanup:

Assignment and declaration of variables in one line, if possible.
Added and removed some newlines.
Merged if condition checks.
Indentation fixes.

Approved by PS Jenkins bot, Sam Spilsbury.

3710. By MC Return on 2013-05-16

Wallpaper .xml.in cleanup:

Better plugin description.
Improved option names.
Better wording of tooltips.
Removed redundant newlines.

Wallpaper code cleanup:

Use prefix instead of postfix increments.
Declaration and assignment of variables in one line.
Added some newlines to improve readability.
Removed redundant brackets.
Fixed indentation.

Approved by PS Jenkins bot, Sam Spilsbury.