Merge lp://qastaging/~mhr3/unity/fix-856205 into lp://qastaging/unity/4.0
Proposed by
Michal Hruby
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://qastaging/~mhr3/unity/fix-856205 |
| Merge into: | lp://qastaging/unity/4.0 |
| Diff against target: |
14743 lines (+5547/-2849) (has conflicts) 200 files modified
CMakeLists.txt (+1/-1) UnityCore/DBusIndicators.cpp (+1/-1) UnityCore/GLibWrapper.cpp (+5/-0) UnityCore/GLibWrapper.h (+1/-0) com.canonical.Unity.gschema.xml (+0/-7) plugins/unityshell/src/AbstractIconRenderer.h (+1/-1) plugins/unityshell/src/AbstractLauncherIcon.h (+9/-1) plugins/unityshell/src/Autopilot.cpp (+1/-1) plugins/unityshell/src/BFBLauncherIcon.cpp (+8/-0) plugins/unityshell/src/BFBLauncherIcon.h (+8/-0) plugins/unityshell/src/BGHash.cpp (+14/-1) plugins/unityshell/src/BGHash.h (+3/-0) plugins/unityshell/src/BackgroundEffectHelper.h (+0/-1) plugins/unityshell/src/BamfLauncherIcon.cpp (+7/-1) plugins/unityshell/src/BamfLauncherIcon.h (+8/-0) plugins/unityshell/src/DashController.cpp (+44/-41) plugins/unityshell/src/DashController.h (+5/-5) plugins/unityshell/src/DashSearchBar.cpp (+3/-17) plugins/unityshell/src/DashSearchBar.h (+0/-1) plugins/unityshell/src/DashSearchBarSpinner.cpp (+7/-13) plugins/unityshell/src/DashSearchBarSpinner.h (+0/-1) plugins/unityshell/src/DashSettings.cpp (+108/-46) plugins/unityshell/src/DashSettings.h (+27/-26) plugins/unityshell/src/DashStyle.cpp (+454/-139) plugins/unityshell/src/DashStyle.h (+101/-58) plugins/unityshell/src/DashView.cpp (+62/-48) plugins/unityshell/src/DashView.h (+5/-1) plugins/unityshell/src/DebugDBusInterface.cpp (+54/-83) plugins/unityshell/src/DebugDBusInterface.h (+8/-8) plugins/unityshell/src/DesktopLauncherIcon.cpp (+8/-0) plugins/unityshell/src/DesktopLauncherIcon.h (+13/-0) plugins/unityshell/src/DeviceLauncherIcon.cpp (+66/-1) plugins/unityshell/src/DeviceLauncherIcon.h (+11/-2) plugins/unityshell/src/DeviceLauncherSection.cpp (+3/-0) plugins/unityshell/src/DeviceLauncherSection.h (+5/-1) plugins/unityshell/src/FilterBar.cpp (+5/-5) plugins/unityshell/src/FilterBar.h (+0/-1) plugins/unityshell/src/FilterBasicButton.cpp (+12/-15) plugins/unityshell/src/FilterBasicButton.h (+2/-4) plugins/unityshell/src/FilterExpanderLabel.cpp (+13/-6) plugins/unityshell/src/FilterExpanderLabel.h (+2/-3) plugins/unityshell/src/FilterGenreButton.cpp (+8/-10) plugins/unityshell/src/FilterGenreButton.h (+0/-1) plugins/unityshell/src/FilterGenreWidget.cpp (+10/-14) plugins/unityshell/src/FilterGenreWidget.h (+0/-1) plugins/unityshell/src/FilterMultiRangeButton.cpp (+26/-32) plugins/unityshell/src/FilterMultiRangeButton.h (+2/-4) plugins/unityshell/src/FilterMultiRangeWidget.cpp (+3/-7) plugins/unityshell/src/FilterMultiRangeWidget.h (+0/-1) plugins/unityshell/src/FilterRatingsButton.cpp (+28/-33) plugins/unityshell/src/FilterRatingsButton.h (+3/-4) plugins/unityshell/src/FilterRatingsWidget.cpp (+5/-10) plugins/unityshell/src/FilterRatingsWidget.h (+0/-1) plugins/unityshell/src/GeisAdapter.cpp (+4/-3) plugins/unityshell/src/HomeView.cpp (+4/-10) plugins/unityshell/src/HomeView.h (+0/-1) plugins/unityshell/src/IMTextEntry.cpp (+0/-1) plugins/unityshell/src/IconRenderer.cpp (+18/-18) plugins/unityshell/src/IconRenderer.h (+4/-4) plugins/unityshell/src/IconTexture.cpp (+0/-5) plugins/unityshell/src/IconTexture.h (+4/-1) plugins/unityshell/src/Introspectable.cpp (+1/-2) plugins/unityshell/src/Introspectable.h (+4/-1) plugins/unityshell/src/Launcher.cpp (+15/-14) plugins/unityshell/src/Launcher.h (+16/-14) plugins/unityshell/src/LauncherController.cpp (+305/-146) plugins/unityshell/src/LauncherController.h (+29/-64) plugins/unityshell/src/LauncherHideMachine.cpp (+1/-1) plugins/unityshell/src/LauncherHoverMachine.cpp (+1/-1) plugins/unityshell/src/LauncherIcon.cpp (+8/-2) plugins/unityshell/src/LauncherIcon.h (+11/-4) plugins/unityshell/src/LauncherModel.cpp (+8/-0) plugins/unityshell/src/LauncherModel.h (+11/-2) plugins/unityshell/src/LensBar.cpp (+0/-5) plugins/unityshell/src/LensBar.h (+0/-1) plugins/unityshell/src/LensView.cpp (+13/-13) plugins/unityshell/src/LensView.h (+0/-1) plugins/unityshell/src/MockLauncherIcon.h (+9/-1) plugins/unityshell/src/PanelController.cpp (+154/-108) plugins/unityshell/src/PanelController.h (+24/-31) plugins/unityshell/src/PanelIndicatorEntryView.cpp (+4/-7) plugins/unityshell/src/PanelIndicatorsView.cpp (+0/-10) plugins/unityshell/src/PanelIndicatorsView.h (+0/-1) plugins/unityshell/src/PanelMenuView.cpp (+7/-53) plugins/unityshell/src/PanelMenuView.h (+0/-1) plugins/unityshell/src/PanelStyle.cpp (+52/-46) plugins/unityshell/src/PanelStyle.h (+36/-27) plugins/unityshell/src/PanelTray.cpp (+1/-6) plugins/unityshell/src/PanelTray.h (+0/-1) plugins/unityshell/src/PanelView.cpp (+9/-15) plugins/unityshell/src/PanelView.h (+0/-3) plugins/unityshell/src/PlacesGroup.cpp (+23/-23) plugins/unityshell/src/PlacesGroup.h (+5/-1) plugins/unityshell/src/PlacesHomeView.cpp (+14/-16) plugins/unityshell/src/PlacesSimpleTile.cpp (+10/-8) plugins/unityshell/src/PlacesSimpleTile.h (+1/-0) plugins/unityshell/src/PlacesStyle.cpp (+0/-328) plugins/unityshell/src/PlacesStyle.h (+0/-119) plugins/unityshell/src/PlacesTile.cpp (+1/-7) plugins/unityshell/src/PlacesTile.h (+1/-1) plugins/unityshell/src/PreviewApplications.cpp (+3/-7) plugins/unityshell/src/PreviewApplications.h (+1/-2) plugins/unityshell/src/PreviewBase.cpp (+3/-7) plugins/unityshell/src/PreviewBase.h (+1/-2) plugins/unityshell/src/PreviewBasicButton.cpp (+10/-14) plugins/unityshell/src/PreviewBasicButton.h (+2/-3) plugins/unityshell/src/PreviewGeneric.cpp (+3/-7) plugins/unityshell/src/PreviewGeneric.h (+0/-1) plugins/unityshell/src/PreviewMusic.cpp (+1/-5) plugins/unityshell/src/PreviewMusic.h (+0/-1) plugins/unityshell/src/PreviewMusicTrack.cpp (+1/-5) plugins/unityshell/src/PreviewMusicTrack.h (+0/-1) plugins/unityshell/src/PreviewMusicTrackWidget.cpp (+1/-7) plugins/unityshell/src/PreviewMusicTrackWidget.h (+0/-1) plugins/unityshell/src/QuicklistMenuItem.cpp (+2/-14) plugins/unityshell/src/QuicklistMenuItem.h (+0/-4) plugins/unityshell/src/QuicklistMenuItemCheckmark.cpp (+0/-11) plugins/unityshell/src/QuicklistMenuItemCheckmark.h (+0/-2) plugins/unityshell/src/QuicklistMenuItemLabel.cpp (+0/-11) plugins/unityshell/src/QuicklistMenuItemLabel.h (+0/-2) plugins/unityshell/src/QuicklistMenuItemRadio.cpp (+0/-11) plugins/unityshell/src/QuicklistMenuItemRadio.h (+0/-4) plugins/unityshell/src/QuicklistMenuItemSeparator.cpp (+0/-12) plugins/unityshell/src/QuicklistMenuItemSeparator.h (+0/-2) plugins/unityshell/src/QuicklistView.cpp (+13/-57) plugins/unityshell/src/QuicklistView.h (+4/-4) plugins/unityshell/src/ResultRendererHorizontalTile.cpp (+18/-18) plugins/unityshell/src/ResultRendererTile.cpp (+31/-30) plugins/unityshell/src/ResultView.cpp (+9/-9) plugins/unityshell/src/ResultView.h (+3/-3) plugins/unityshell/src/ResultViewGrid.cpp (+13/-8) plugins/unityshell/src/ResultViewGrid.h (+3/-2) plugins/unityshell/src/SimpleLauncherIcon.cpp (+8/-0) plugins/unityshell/src/SimpleLauncherIcon.h (+8/-0) plugins/unityshell/src/SpacerLauncherIcon.cpp (+8/-3) plugins/unityshell/src/SpacerLauncherIcon.h (+8/-6) plugins/unityshell/src/StaticCairoText.cpp (+9/-15) plugins/unityshell/src/StaticCairoText.h (+3/-4) plugins/unityshell/src/SwitcherController.cpp (+65/-47) plugins/unityshell/src/SwitcherController.h (+30/-22) plugins/unityshell/src/SwitcherModel.cpp (+20/-3) plugins/unityshell/src/SwitcherModel.h (+8/-7) plugins/unityshell/src/SwitcherView.cpp (+4/-8) plugins/unityshell/src/SwitcherView.h (+14/-12) plugins/unityshell/src/Tooltip.cpp (+0/-9) plugins/unityshell/src/Tooltip.h (+0/-4) plugins/unityshell/src/TrashLauncherIcon.cpp (+5/-1) plugins/unityshell/src/TrashLauncherIcon.h (+5/-1) plugins/unityshell/src/WindowButtons.cpp (+42/-40) plugins/unityshell/src/nux-area-accessible.cpp (+8/-8) plugins/unityshell/src/nux-base-window-accessible.cpp (+24/-6) plugins/unityshell/src/nux-base-window-accessible.h (+3/-0) plugins/unityshell/src/nux-text-entry-accessible.cpp (+124/-0) plugins/unityshell/src/nux-text-entry-accessible.h (+57/-0) plugins/unityshell/src/nux-view-accessible.cpp (+2/-2) plugins/unityshell/src/unity-dash-view-accessible.cpp (+114/-0) plugins/unityshell/src/unity-dash-view-accessible.h (+57/-0) plugins/unityshell/src/unity-launcher-accessible.cpp (+5/-0) plugins/unityshell/src/unity-launcher-icon-accessible.cpp (+4/-0) plugins/unityshell/src/unity-places-group-accessible.cpp (+168/-0) plugins/unityshell/src/unity-places-group-accessible.h (+57/-0) plugins/unityshell/src/unity-places-simple-tile-accessible.cpp (+140/-0) plugins/unityshell/src/unity-places-simple-tile-accessible.h (+57/-0) plugins/unityshell/src/unity-places-view-accessible.cpp (+0/-114) plugins/unityshell/src/unity-places-view-accessible.h (+0/-57) plugins/unityshell/src/unity-quicklist-accessible.cpp (+182/-0) plugins/unityshell/src/unity-quicklist-accessible.h (+57/-0) plugins/unityshell/src/unity-quicklist-menu-accessible.cpp (+367/-0) plugins/unityshell/src/unity-quicklist-menu-accessible.h (+57/-0) plugins/unityshell/src/unity-quicklist-menu-item-accessible.cpp (+299/-0) plugins/unityshell/src/unity-quicklist-menu-item-accessible.h (+57/-0) plugins/unityshell/src/unity-result-accessible.cpp (+132/-0) plugins/unityshell/src/unity-result-accessible.h (+56/-0) plugins/unityshell/src/unity-root-accessible.cpp (+135/-36) plugins/unityshell/src/unity-root-accessible.h (+0/-3) plugins/unityshell/src/unity-rvgrid-accessible.cpp (+398/-0) plugins/unityshell/src/unity-rvgrid-accessible.h (+57/-0) plugins/unityshell/src/unity-sctext-accessible.cpp (+157/-0) plugins/unityshell/src/unity-sctext-accessible.h (+57/-0) plugins/unityshell/src/unity-search-bar-accessible.cpp (+40/-23) plugins/unityshell/src/unity-search-bar-accessible.h (+0/-4) plugins/unityshell/src/unity-util-accessible.cpp (+0/-11) plugins/unityshell/src/unity-util-accessible.h (+0/-1) plugins/unityshell/src/unitya11y.cpp (+39/-7) plugins/unityshell/src/unitya11ytests.cpp (+4/-0) plugins/unityshell/src/unityshell.cpp (+178/-191) plugins/unityshell/src/unityshell.h (+27/-34) plugins/unityshell/unityshell.xml.in (+11/-1) tests/CMakeLists.txt (+2/-8) tests/TestDashStyle.cpp (+42/-42) tests/TestFilterBar.cpp (+2/-6) tests/TestFilters.cpp (+1/-5) tests/TestLauncher.cpp (+6/-30) tests/TestPanel.cpp (+6/-0) tests/TestPreviewApplications.cpp (+1/-2) tests/TestPreviewGeneric.cpp (+1/-2) tests/TestPreviewMusic.cpp (+1/-2) tests/TestResultView.cpp (+1/-3) tests/TestSwitcher.cpp (+14/-13) tests/standalone_dash.cpp (+3/-4) Text conflict in plugins/unityshell/src/DashController.cpp Text conflict in plugins/unityshell/src/FilterBar.cpp Text conflict in plugins/unityshell/src/FilterExpanderLabel.cpp Text conflict in plugins/unityshell/src/FilterGenreWidget.cpp Text conflict in plugins/unityshell/src/LensView.cpp Text conflict in plugins/unityshell/src/PanelView.cpp Text conflict in plugins/unityshell/src/unityshell.cpp |
| To merge this branch: | bzr merge lp://qastaging/~mhr3/unity/fix-856205 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Mikkel Kamstrup Erlandsen (community) | Approve | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2011-11-24.
Description of the change
Fixes bug #856205 by delaying activation of the first item in the model. Note that this requires also change to lenses (because currently they emit the SearchFinished signal before updating the model).
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
I tested this quite thoroughly and it seems to work well. Code looks good too. Although there are some nitpicks:
i) in ResetSearchState() Why reinterpret_cast and not static_cast?
ii) in ResetSearchState() should we not g_source_remove (searching_