lp://qastaging/~unity-team/unity/trusty-1066971
Created by
Stephen M. Webb
and last modified
- Get this branch:
- bzr branch lp://qastaging/~unity-team/unity/trusty-1066971
Members of
Unity Team
can upload to this branch. Log in for directions.
Branch merges
Propose for merging
No branches
dependent on this one.
Rejected
for merging
into
lp://qastaging/unity/7.2
- Unity Team: Pending requested
-
Diff: 765 lines (+232/-150)16 files modifieddebian/changelog (+8/-0)
hud/HudIconTextureSource.cpp (+0/-5)
hud/HudIconTextureSource.h (+0/-1)
launcher/Launcher.cpp (+1/-1)
launcher/LauncherIcon.cpp (+117/-104)
launcher/LauncherIcon.h (+12/-8)
launcher/MockLauncherIcon.h (+0/-5)
launcher/SwitcherView.cpp (+2/-0)
panel/PanelIndicatorEntryView.cpp (+1/-1)
tests/CMakeLists.txt (+1/-1)
tests/test_main_xless.cpp (+4/-5)
unity-shared/DecorationStyle.cpp (+2/-2)
unity-shared/IconRenderer.cpp (+35/-9)
unity-shared/IconTextureSource.cpp (+37/-1)
unity-shared/IconTextureSource.h (+10/-4)
unity-shared/TextInput.cpp (+2/-3)
Branch information
Recent revisions
- 3808. By Stephen M. Webb
-
make the Launcher icon count badge width depend on the text value width
and scaling (lp: #1353070) (lp: #1354498) (lp: #796527) (lp: #1066971)
(lp: #1361713) - 3802. By Stephen M. Webb
-
Prepare fixes for upstream micro-release 7.2.3. Fixes: 1283415, 1292391, 1306211, 1312107, 1320051, 1320071, 1324114, 1339629, 1340171, 1340394, 1340477, 1340992, 1340996, 1342208, 1342731, 1347735
- 3801. By Marco Trevisan (Treviño)
-
* SECURITY UPDATE: more screen locking fixes (LP: #1349128)
- debian/patches/ lp1349128. patch: flush after ungrabbing the keyboard
in unity-shared/PluginAdapter. cpp, add GrabScreen() function that
retries to lockscreen/LockScreenContr oller.cpp,
lockscreen/LockScreenShiel d.cpp, lockscreen/ LockScreenShiel d.h.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://qastaging/unity