lp:~aacid/unity/do_not_reuse_menus_on_order_change_for_6

Branch merges

Propose for merging

Merged into lp:unity/6.0 at revision 2771

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

Diff: 662 lines (+471/-6)

11 files modified

UnityCore/DBusIndicators.cpp (+28/-5)
UnityCore/DBusIndicators.h (+4/-0)
UnityCore/Indicator.cpp (+15/-0)
UnityCore/Indicator.h (+1/-0)
tests/CMakeLists.txt (+4/-1)
tests/test_dbus_indicators.cpp (+99/-0)
tests/test_indicator.cpp (+3/-0)
tests/test_service_main.c (+4/-0)
tests/test_service_panel.c (+253/-0)
tests/test_service_panel.h (+46/-0)
tests/test_utils.h (+14/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1062283: Unity panel does not show the kate menus in the correct order

Medium

Fix Released

Link a bug report

Related blueprints

2768. By Albert Astals Cid on 2012-10-09

Do not reuse the menu entries if their order changes

Since the indicators api only have "add" and "remove" signals, if we reuse an entry that is not in the correct order it will case the menus or whatever this indicator represents to be in the wrong order

2767. By Didier Roche on 2012-10-08

Ok, no need for the changed strings after all, Seb reuploaded the template file with the additional string and launchpad kept the 12.04 string, so we can revert it to that one.
The incoming langpack export will then repick the previous 12.04 translation.

The POTFILES.in addition from the previous merge is still needed for next upload to not remove the string from the template and so export. So only revert the string change here. Fixes: https://bugs.launchpad.net/bugs/1062921. Approved by Łukasz Zemczak.

2766. By Didier Roche on 2012-10-08

Fix untranslated Workspace Switcher in the panel.
Got back to 12.04 string to not add any string break to Quantal.

Similar to rev 1062921 (LP: #1062921). Fixes: https://bugs.launchpad.net/bugs/1062921. Approved by Łukasz Zemczak.

2765. By Łukasz Zemczak on 2012-10-04

Release\ 6.8.0

2764. By Marco Trevisan (Treviño) on 2012-10-04

UnityWindow: add PixmapTexture struct: never separate a binded texture to its pixmap

Or it will lead to crashes. Now we cache both the GLTexture and the binded XPixmap, so
that we delete both together and there won't be crashes.

Texutures binded to Pixmaps should not be alive when the binded pixmap has been
destroyed. So, now we have a new PixmapTexture struct that keeps both the data
structures alive.
We now use a smart pointer of PixmapTexture to cache both the temporary decorations,
inside a CairoContext, and the ones at class level.. Fixes: https://bugs.launchpad.net/bugs/1061396. Approved by Neil J. Patel.

2763. By Andrea Azzarone on 2012-10-04

Revert rev 2753.
Use clip region to fix dash/launcher separator drawing bug.. Fixes: https://bugs.launchpad.net/bugs/1061081. Approved by Łukasz Zemczak.

2762. By Nicolas d'Offay on 2012-10-04

Fixed flickering bug.. Fixes: https://bugs.launchpad.net/bugs/1060532. Approved by Łukasz Zemczak, Nick Dedekind.

2761. By Michal Hruby on 2012-10-04

Attempt to reconnect to DBus proxies if the initial connection fails. Fixes: https://bugs.launchpad.net/bugs/1058619. Approved by Łukasz Zemczak, Gord Allott.

2760. By Andrea Azzarone on 2012-10-03

Fix rendering flaw in search entry. (LP: #1059562). Fixes: https://bugs.launchpad.net/bugs/1059562. Approved by Neil J. Patel.

2759. By Nick Dedekind on 2012-10-03

Fixed dash filter redraw issue (LP: #1059607). Fixes: https://bugs.launchpad.net/bugs/1059607. Approved by Neil J. Patel.