lp:~mc-return/unity/unity.merge-fix1067534

Branch merges

Merged into lp:unity at revision 2857

PS Jenkins bot: Needs Fixing (continuous-integration) on 2012-10-17

Marco Trevisan (Treviño): Approve on 2012-10-17

Omer Akram (community): Approve on 2012-10-17

Diff: 12 lines (+1/-1)

1 file modified

plugins/unityshell/unityshell.xml.in (+1/-1)

api

Propose for merging

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1067534: "Show desktop" plug-in actually works with Unity when ensured that it is loaded after unityshell

Low

Fix Released

Link a bug report

Related blueprints

2846. By MC Return on 2012-10-16

Unity actually provides the feature "fadetodesktop".
This change is needed, because unityshell just collides with the Compiz "Fade to Desktop" (fadedesktop) plug-in, but works with "Show Desktop" (showdesktop) if showdesktop is started after unityshell.

2845. By Nick Dedekind on 2012-10-16

Removed source manager instance from SoftwareCenterLauncherIcon in favour of LauncherIcon instance.. Fixes: https://bugs.launchpad.net/bugs/1052582. Approved by Marco Trevisan (Treviño).

2844. By Michal Hruby on 2012-10-16

Ensure categories with non-personal results can show up before empty categories with personal results. Fixes: https://bugs.launchpad.net/bugs/1067327. Approved by Pawel Stolowski.

2843. By MC Return on 2012-10-16

Minor refactoring of the unityshell Compiz plug-in, replacing the "Experimental" tab with "Launcher" and "Dash" tabs.. Fixes: https://bugs.launchpad.net/bugs/1067113. Approved by Brandon Schaefer.

2842. By Christopher Lee on 2012-10-15

Disabled test that exposes a Show Desktop bug that causes all following tests to fail.. Approved by Thomi Richards.

2841. By Brandon Schaefer on 2012-10-15

Fix reference counting problem which leads to memory leaks and a crash in MT grab handles.. Fixes: https://bugs.launchpad.net/bugs/1046201. Approved by Marco Trevisan (Treviño), Łukasz Zemczak.

2840. By Andrea Azzarone on 2012-10-15

Unregister gdbus object in the dtor. Fix bug 1047760. Fixes: https://bugs.launchpad.net/bugs/1047760. Approved by Marco Trevisan (Treviño).

2839. By MC Return on 2012-10-15

Fixed/unified all xml.in headers.

Problem: Editors like gedit and others will not recognize *.xml.in files as xml, so if opened there is no syntax highlighting making those files harder to read.
This commit fixes this by adding <?xml version="1.0" encoding="UTF-8"?> to all *.xml.in files in lp:unity.. Fixes: https://bugs.launchpad.net/bugs/1066823. Approved by Marco Trevisan (Treviño).

2838. By Michal Hruby on 2012-10-15

Rewrite UBus. Approved by Marco Trevisan (Treviño), Andrea Azzarone.

2837. By MC Return on 2012-10-15

Added <feature>showdesktop</feature> to unityshell.xml.in, because the feature showdesktop is provided by unityshell.
Now it will be impossible to enable the Compiz "Show Desktop" and "Fade to Desktop" plug-ins together with Unity, but they will work normally without Unity.
CCSM will show a dialogue to the user if he tries to enable showdesktop or fadetodesktop if Unity runs, explaining the situation and allowing the user to choose.. Fixes: https://bugs.launchpad.net/bugs/1006429, https://bugs.launchpad.net/bugs/1006434, https://bugs.launchpad.net/bugs/1063171. Approved by Didier Roche.