lp:~brandontschaefer/unity/lp.1239381-fix-7.0

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:unity/7.1

Christopher Townsend: Pending requested 2014-01-07

Diff: 875 lines (+447/-2) (has conflicts)

20 files modified

dash/ResultRendererTile.cpp (+54/-1)
dash/previews/MusicPreview.cpp (+57/-0)
dash/previews/MusicPreview.h (+6/-0)
debian/changelog (+72/-0)
launcher/ApplicationLauncherIcon.cpp (+11/-0)
launcher/ApplicationLauncherIcon.h (+5/-0)
launcher/LauncherIcon.h (+9/-0)
launcher/SwitcherController.cpp (+12/-1)
plugins/unityshell/src/unityshell.cpp (+45/-0)
services/panel-service.c (+20/-0)
tests/mock-application.h (+14/-0)
tests/test_application_launcher_icon.cpp (+26/-0)
tests/test_switcher_controller.cpp (+18/-0)
tests/test_switcher_controller.h (+15/-0)
tests/test_switcher_controller_class.cpp (+29/-0)
unity-shared/IconRenderer.cpp (+9/-0)
unity-shared/IconTextureSource.cpp (+18/-0)
unity-shared/IconTextureSource.h (+7/-0)
unity-shared/PreviewStyle.cpp (+16/-0)
unity-shared/StandaloneWindowManager.h (+4/-0)

api

Superseded for merging into lp:unity/7.0

Christopher Townsend: Disapprove on 2014-01-07

Diff: 78 lines (+54/-1)

1 file modified

dash/ResultRendererTile.cpp (+54/-1)

api

Superseded for merging into lp:unity

Unity Team: Pending requested 2014-01-06

Diff: 1120 lines (+570/-2) (has conflicts)

23 files modified

dash/ResultRendererTile.cpp (+54/-0)
dash/previews/MusicPreview.cpp (+82/-0)
dash/previews/MusicPreview.h (+6/-0)
debian/changelog (+72/-0)
launcher/AbstractLauncherIcon.h (+14/-0)
launcher/ApplicationLauncherIcon.cpp (+11/-0)
launcher/ApplicationLauncherIcon.h (+5/-0)
launcher/LauncherIcon.h (+9/-0)
launcher/SwitcherController.cpp (+12/-1)
plugins/unityshell/src/unityshell.cpp (+49/-0)
services/panel-service.c (+20/-0)
tests/mock-application.h (+14/-0)
tests/test_application_launcher_icon.cpp (+26/-0)
tests/test_switcher_controller.cpp (+15/-0)
tests/test_switcher_controller.h (+20/-0)
tests/test_switcher_controller_class.cpp (+31/-1)
unity-shared/BackgroundEffectHelper.cpp (+66/-0)
unity-shared/BackgroundEffectHelper.h (+10/-0)
unity-shared/IconRenderer.cpp (+9/-0)
unity-shared/IconTextureSource.cpp (+18/-0)
unity-shared/IconTextureSource.h (+7/-0)
unity-shared/PreviewStyle.cpp (+16/-0)
unity-shared/StandaloneWindowManager.h (+4/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1239381: Unity crashes when entering a term including "emu" in the home lens

Critical

Fix Released

Link a bug report

Related blueprints

3323. By Brandon Schaefer on 2014-01-06

* Backport ResultRenderTile workaround where it was crashing in pango based
  on the type of text recived.

3322. By Andrea Azzarone on 2013-08-13

Cherrypick lp:unity rev 3443.

Approved by Stephen M. Webb, PS Jenkins bot.

3321. By PS Jenkins bot on 2013-06-19

Releasing 7.0.0daily13.06.19~13.04-0ubuntu1 to ubuntu.

Approved by PS Jenkins bot.

3320. By Łukasz Zemczak on 2013-06-17

Revert changelog entry that never went into ubuntu #nochangelog

3319. By PS Jenkins bot on 2013-05-31

Releasing 7.0.0daily13.05.31~13.04-0ubuntu1 to ubuntu.

Approved by PS Jenkins bot.

3318. By William Hua on 2013-05-30

Revert 3196 to fix menu highlighting issues with LibreOffice.

Revision 3196 prevents LibreOffice's menu items from highlighting.
See Launchpad bug #1153350. Fixes: https://bugs.launchpad.net/bugs/1153350.

Approved by PS Jenkins bot, Andrea Azzarone, Marco Trevisan (Treviño).

3317. By Marco Trevisan (Treviño) on 2013-05-30

SwitcherController: use proper long long types for WindowActiveNumber

Otherwise an overflow can cause bad window selection after long uptime. Fixes: https://bugs.launchpad.net/bugs/1181367.

Approved by PS Jenkins bot, Andrea Azzarone, Brandon Schaefer.

3316. By Christopher Townsend on 2013-05-14

Fixes issue where minimizing a full screen window would not draw the Launcher and Panel after minimization. This is a backport of lp:unity revno. 3320. Fixes: https://bugs.launchpad.net/bugs/1064155.

Approved by Brandon Schaefer, PS Jenkins bot.

3315. By PS Jenkins bot on 2013-05-08

Releasing 7.0.0daily13.05.08~13.04-0ubuntu1 to ubuntu.

Approved by PS Jenkins bot.

3314. By Andrea Azzarone on 2013-04-26

Disable detail view for webapp icons. Fixes: https://bugs.launchpad.net/bugs/1169340.

Approved by PS Jenkins bot, Marco Trevisan (Treviño).