← Back to branch summary

~sethj/ubuntu/wily/unity/fix-for-1445595

~sethj/ubuntu/wily/unity/fix-for-1445595

Viewing all changes in revision 2791.11.104.

Committer: Manuel de la Pena
Date: 2013-03-19 16:36:22 UTC
mfrom: (3008.2.76 libunity-7.0-breakage)
mto: (2791.18.6 error-preview) (3008.2.83 libunity-7.0-breakage)
mto: This revision was merged to the branch mainline in revision 3325.
Revision ID: manuel@canonical.com-20130319163622-afmu1c0ajp6esd4i

Merged with lp:~unity-team/unity/libunity-7.0-breakage

files added:
UnityCore/GSettingsScopes.cpp

UnityCore/GSettingsScopes.h

UnityCore/MiscUtils.h

UnityCore/PreviewPlayer.cpp

UnityCore/PreviewPlayer.h

UnityCore/Scope.cpp

UnityCore/Scope.h

UnityCore/ScopeData.cpp

UnityCore/ScopeData.h

UnityCore/ScopeProxy.cpp

UnityCore/ScopeProxy.h

UnityCore/ScopeProxyInterface.h

UnityCore/Scopes.cpp

UnityCore/Scopes.h

dash/ApplicationStarter.h

dash/ApplicationStarterImp.cpp

dash/ApplicationStarterImp.h

tests/autopilot/unity/tests/launcher/test_scroll.py

tests/mock-lenses.h

tests/test_dash_view.cpp

tests/test_lensview.cpp

tests/test_searchbar.cpp

files removed:
UnityCore/SeriesPreview.cpp

UnityCore/SeriesPreview.h

tests/test_lensview.cpp

tests/test_searchbar.cpp

files renamed:
dash/LensBar.cpp => dash/ScopeBar.cpp

dash/LensBar.h => dash/ScopeBar.h

dash/LensBarIcon.cpp => dash/ScopeBarIcon.cpp

dash/LensBarIcon.h => dash/ScopeBarIcon.h

dash/LensView.cpp => dash/ScopeView.cpp

dash/LensView.h => dash/ScopeView.h

files modified:
CMakeLists.txt

UnityCore/CMakeLists.txt

UnityCore/Categories.cpp

UnityCore/Category.cpp

UnityCore/Category.h

UnityCore/FilesystemLenses.cpp

UnityCore/FilesystemLenses.h

UnityCore/Filter.cpp

UnityCore/Filter.h

UnityCore/Filters.cpp

UnityCore/GLibWrapper.cpp

UnityCore/GLibWrapper.h

UnityCore/HomeLens.cpp

UnityCore/HomeLens.h

UnityCore/Lenses.h

UnityCore/Model-inl.h

UnityCore/Model.h

UnityCore/ModelRowAdaptor.cpp

UnityCore/ModelRowAdaptor.h

UnityCore/MusicPreview.cpp

UnityCore/MusicPreview.h

UnityCore/Preview.cpp

UnityCore/Preview.h

UnityCore/Result.cpp

UnityCore/Result.h

UnityCore/ResultIterator.cpp

UnityCore/Results.cpp

UnityCore/Track.cpp

UnityCore/Track.h

UnityCore/Tracks.cpp

UnityCore/Variant.cpp

UnityCore/Variant.h

com.canonical.Unity.gschema.xml

dash/CMakeLists.txt

dash/CoverflowResultView.cpp

dash/CoverflowResultView.h

dash/DashController.cpp

dash/DashView.cpp

dash/DashView.h

dash/DashViewPrivate.cpp

dash/DashViewPrivate.h

dash/FilterBar.cpp

dash/FilterBar.h

dash/FilterRatingsButton.cpp

dash/PlacesGroup.cpp

dash/PlacesGroup.h

dash/PreviewStateMachine.cpp

dash/PreviewStateMachine.h

dash/ResultRenderer.cpp

dash/ResultRenderer.h

dash/ResultRendererTile.cpp

dash/ResultRendererTile.h

dash/ResultView.cpp

dash/ResultView.h

dash/ResultViewGrid.cpp

dash/ResultViewGrid.h

dash/StandaloneDash.cpp

dash/previews/DBusTestRunner.h

dash/previews/LensDBusTestRunner.h

dash/previews/MusicPreview.cpp

dash/previews/MusicPreview.h

dash/previews/Preview.cpp

dash/previews/StandaloneMusicPreview.cpp

dash/previews/Track.cpp

dash/previews/Track.h

dash/previews/Tracks.cpp

dash/previews/Tracks.h

debian/changelog

debian/control

hud/HudController.cpp

launcher/AbstractLauncherIcon.h

launcher/ApplicationLauncherIcon.cpp

launcher/BFBLauncherIcon.cpp

launcher/BFBLauncherIcon.h

launcher/DeviceLauncherSection.cpp

launcher/FileManagerOpener.h

launcher/FileManagerOpenerImp.cpp

launcher/FileManagerOpenerImp.h

launcher/Launcher.cpp

launcher/Launcher.h

launcher/LauncherController.cpp

launcher/LauncherEntryRemote.cpp

launcher/LauncherEntryRemote.h

launcher/LauncherIcon.cpp

launcher/QuicklistMenuItem.cpp

launcher/SwitcherController.cpp

launcher/TooltipManager.cpp

launcher/TooltipManager.h

launcher/TrashLauncherIcon.cpp

launcher/TrashLauncherIcon.h

launcher/Volume.h

launcher/VolumeImp.cpp

launcher/VolumeImp.h

launcher/VolumeLauncherIcon.cpp

panel/PanelMenuView.cpp

plugins/unityshell/src/unity-launcher-icon-accessible.cpp

plugins/unityshell/src/unityshell.cpp

po/POTFILES.in

tests/CMakeLists.txt

tests/autopilot/unity/emulators/launcher.py

tests/autopilot/unity/tests/test_dash.py

tests/test_application_launcher_icon.cpp

tests/test_categories.cpp

tests/test_glib_variant.cpp

tests/test_gnome_session_manager.cpp

tests/test_home_lens.cpp

tests/test_mock_devices.h

tests/test_model_iterator.cpp

tests/test_previews.cpp

tests/test_quicklist_menu_item.cpp

tests/test_result_renderer.cpp

tests/test_service_main.cpp

tests/test_service_model.cpp

tests/test_service_model.h

tests/test_tooltip_manager.cpp

tests/test_trash_launcher_icon.cpp

tests/test_volume_imp.cpp

tests/test_volume_launcher_icon.cpp

unity-shared/CoverArt.cpp

unity-shared/DashStyle.cpp

unity-shared/DashStyle.h

unity-shared/PluginAdapter.cpp

unity-shared/RatingsButton.cpp

unity-shared/SearchBar.cpp

unity-shared/SearchBar.h

unity-shared/StandaloneWindowManager.cpp

unity-shared/StaticCairoText.cpp

unity-shared/WindowButtons.cpp

Show diffs side-by-side

added added

removed removed

UnityCore/CMakeLists.txt

UnityCore/Categories.cpp

UnityCore/Category.cpp

UnityCore/Category.h

UnityCore/FilesystemLenses.cpp

UnityCore/FilesystemLenses.h

UnityCore/Filter.cpp

UnityCore/Filter.h

UnityCore/Filters.cpp

UnityCore/GLibWrapper.cpp

UnityCore/GLibWrapper.h

UnityCore/GSettingsScopes.cpp

UnityCore/GSettingsScopes.h

UnityCore/HomeLens.cpp

UnityCore/HomeLens.h

UnityCore/Lenses.h

UnityCore/MiscUtils.h

UnityCore/Model-inl.h

UnityCore/Model.h

UnityCore/ModelRowAdaptor.cpp

UnityCore/ModelRowAdaptor.h

UnityCore/MusicPreview.cpp

UnityCore/MusicPreview.h

UnityCore/Preview.cpp

UnityCore/Preview.h

UnityCore/PreviewPlayer.cpp

UnityCore/PreviewPlayer.h

UnityCore/Result.cpp

UnityCore/Result.h

UnityCore/ResultIterator.cpp

UnityCore/Results.cpp

UnityCore/Scope.cpp

UnityCore/Scope.h

UnityCore/ScopeData.cpp

UnityCore/ScopeData.h

UnityCore/ScopeProxy.cpp

UnityCore/ScopeProxy.h

UnityCore/ScopeProxyInterface.h

UnityCore/Scopes.cpp

UnityCore/Scopes.h

UnityCore/SeriesPreview.cpp

UnityCore/SeriesPreview.h

UnityCore/Track.cpp

UnityCore/Track.h

UnityCore/Tracks.cpp

UnityCore/Variant.cpp

UnityCore/Variant.h

com.canonical.Unity.gschema.xml

dash/ApplicationStarter.h

dash/ApplicationStarterImp.cpp

dash/ApplicationStarterImp.h

dash/CMakeLists.txt

dash/CoverflowResultView.cpp

dash/CoverflowResultView.h

dash/DashController.cpp

dash/DashView.cpp

dash/DashView.h

dash/DashViewPrivate.cpp

dash/DashViewPrivate.h

dash/FilterBar.cpp

dash/FilterBar.h

dash/FilterRatingsButton.cpp

dash/PlacesGroup.cpp

dash/PlacesGroup.h

dash/PreviewStateMachine.cpp

dash/PreviewStateMachine.h

dash/ResultRenderer.cpp

dash/ResultRenderer.h

dash/ResultRendererTile.cpp

dash/ResultRendererTile.h

dash/ResultView.cpp

dash/ResultView.h

dash/ResultViewGrid.cpp

dash/ResultViewGrid.h

dash/ScopeBar.cpp

dash/ScopeBar.h

dash/ScopeBarIcon.cpp

dash/ScopeBarIcon.h

dash/ScopeView.cpp

dash/ScopeView.h

dash/StandaloneDash.cpp

dash/previews/DBusTestRunner.h

dash/previews/LensDBusTestRunner.h

dash/previews/MusicPreview.cpp

dash/previews/MusicPreview.h

dash/previews/Preview.cpp

dash/previews/StandaloneMusicPreview.cpp

dash/previews/Track.cpp

dash/previews/Track.h

dash/previews/Tracks.cpp

dash/previews/Tracks.h

debian/changelog

hud/HudController.cpp

launcher/AbstractLauncherIcon.h

launcher/ApplicationLauncherIcon.cpp

launcher/BFBLauncherIcon.cpp

launcher/BFBLauncherIcon.h

launcher/DeviceLauncherSection.cpp

launcher/FileManagerOpener.h

launcher/FileManagerOpenerImp.cpp

launcher/FileManagerOpenerImp.h

launcher/Launcher.cpp

launcher/Launcher.h

launcher/LauncherController.cpp

launcher/LauncherEntryRemote.cpp

launcher/LauncherEntryRemote.h

launcher/LauncherIcon.cpp

launcher/QuicklistMenuItem.cpp

launcher/SwitcherController.cpp

launcher/TooltipManager.cpp

launcher/TooltipManager.h

launcher/TrashLauncherIcon.cpp

launcher/TrashLauncherIcon.h

launcher/Volume.h

launcher/VolumeImp.cpp

launcher/VolumeImp.h

launcher/VolumeLauncherIcon.cpp

panel/PanelMenuView.cpp

plugins/unityshell/src/unity-launcher-icon-accessible.cpp

plugins/unityshell/src/unityshell.cpp

tests/CMakeLists.txt

tests/autopilot/unity/emulators/launcher.py

tests/autopilot/unity/tests/launcher/test_scroll.py

tests/autopilot/unity/tests/test_dash.py

tests/mock-lenses.h

tests/test_application_launcher_icon.cpp

tests/test_categories.cpp

tests/test_dash_view.cpp

tests/test_glib_variant.cpp

tests/test_gnome_session_manager.cpp

tests/test_home_lens.cpp

tests/test_lensview.cpp

tests/test_lensview.cpp

tests/test_mock_devices.h

tests/test_model_iterator.cpp

tests/test_previews.cpp

tests/test_quicklist_menu_item.cpp

tests/test_result_renderer.cpp

tests/test_searchbar.cpp

tests/test_searchbar.cpp

tests/test_service_main.cpp

tests/test_service_model.cpp

tests/test_service_model.h

tests/test_trash_launcher_icon.cpp

tests/test_volume_imp.cpp

tests/test_volume_launcher_icon.cpp

unity-shared/CoverArt.cpp

unity-shared/DashStyle.cpp

unity-shared/DashStyle.h

unity-shared/PluginAdapter.cpp

unity-shared/RatingsButton.cpp

unity-shared/SearchBar.cpp

unity-shared/SearchBar.h

unity-shared/StandaloneWindowManager.cpp

unity-shared/StaticCairoText.cpp

unity-shared/WindowButtons.cpp

Older »