← Back to branch summary

~bilalakhtar/unity/sd-card-stop-device-960910

~bilalakhtar/unity/sd-card-stop-device-960910

Viewing all changes in revision 2543.

Committer: Bilal Akhtar
Date: 2012-08-21 17:50:55 UTC
mfrom: (2540.2.61 unity)
Revision ID: bilalakhtar@ubuntu.com-20120821175055-2nyk2ne624tcd247

Merge from trunk and resolve conflicts

files added:
UnityCore/ResultIterator.cpp

UnityCore/ResultIterator.h

dash/CoverflowResultView.cpp

dash/CoverflowResultView.h

dash/PreviewStateMachine.cpp

dash/PreviewStateMachine.h

dash/previews

dash/previews/ActionButton.cpp

dash/previews/ActionButton.h

dash/previews/ApplicationPreview.cpp

dash/previews/ApplicationPreview.h

dash/previews/CMakeLists.txt

dash/previews/DBusTestRunner.h

dash/previews/GenericPreview.cpp

dash/previews/GenericPreview.h

dash/previews/LensDBusTestRunner.h

dash/previews/MoviePreview.cpp

dash/previews/MoviePreview.h

dash/previews/MusicPreview.cpp

dash/previews/MusicPreview.h

dash/previews/Preview.cpp

dash/previews/Preview.h

dash/previews/PreviewContainer.cpp

dash/previews/PreviewContainer.h

dash/previews/PreviewInfoHintWidget.cpp

dash/previews/PreviewInfoHintWidget.h

dash/previews/PreviewNavigator.cpp

dash/previews/PreviewNavigator.h

dash/previews/PreviewRatingsWidget.cpp

dash/previews/PreviewRatingsWidget.h

dash/previews/Skype.png

dash/previews/StandaloneApplicationPreview.cpp

dash/previews/StandaloneMoviePreview.cpp

dash/previews/StandaloneMusicPreview.cpp

dash/previews/Track.cpp

dash/previews/Track.h

dash/previews/Tracks.cpp

dash/previews/Tracks.h

manual-tests/Flowview.txt

plugins/unityshell/resources/preview_next.svg

plugins/unityshell/resources/preview_pause.svg

plugins/unityshell/resources/preview_play.svg

plugins/unityshell/resources/preview_previous.svg

plugins/unityshell/src/CompoundGestureRecognizer.cpp

plugins/unityshell/src/CompoundGestureRecognizer.h

plugins/unityshell/src/GesturalWindowSwitcher.cpp

plugins/unityshell/src/GesturalWindowSwitcher.h

tests/test-gestures/GesturalWindowSwitcherMock.h

tests/test-gestures/SwitcherControllerMock.h

tests/test-gestures/compiz_mock/core/timer.h

tests/test-gestures/sed_script_switcher

tests/test-gestures/test_compound_gesture_recognizer.cpp

tests/test-gestures/test_gestural_window_switcher.cpp

tests/test_bfb_launcher_icon.cpp

tests/test_model_iterator.cpp

tests/test_previews_application.cpp

tests/test_previews_generic.cpp

tests/test_previews_movie.cpp

tests/test_previews_music.cpp

tests/test_quicklist_menu_item.cpp

tests/test_quicklist_view.cpp

tests/test_thumbnail_generator.cpp

tools/convert-files

tools/convert-files/compiz-profile-active-unity.convert

tools/convert-files/compiz-profile-unity.convert

unity-shared/CoverArt.cpp

unity-shared/CoverArt.h

unity-shared/DefaultThumbnailProvider.cpp

unity-shared/DefaultThumbnailProvider.h

unity-shared/PlacesVScrollBar.cpp

unity-shared/PlacesVScrollBar.h

unity-shared/PreviewStyle.cpp

unity-shared/PreviewStyle.h

unity-shared/RatingsButton.cpp

unity-shared/RatingsButton.h

unity-shared/TextureThumbnailProvider.cpp

unity-shared/TextureThumbnailProvider.h

unity-shared/ThumbnailGenerator.cpp

unity-shared/ThumbnailGenerator.h

unity-shared/UserThumbnailProvider.cpp

unity-shared/UserThumbnailProvider.h

files removed:
dash/PlacesVScrollBar.cpp

dash/PlacesVScrollBar.h

manual-tests/HighlightedBFB.txt

tests/unit/TestQuicklistMenuitems.cpp

files modified:
AUTHORS

CMakeLists.txt

ChangeLog

UnityCore/CMakeLists.txt

UnityCore/GLibSignal-inl.h

UnityCore/GLibSignal.cpp

UnityCore/GLibSignal.h

UnityCore/HomeLens.cpp

UnityCore/HomeLens.h

UnityCore/Indicator.cpp

UnityCore/Lens.cpp

UnityCore/Lens.h

UnityCore/Model-inl.h

UnityCore/Model.h

UnityCore/Preview.cpp

UnityCore/Preview.h

UnityCore/Results.cpp

UnityCore/Results.h

dash/CMakeLists.txt

dash/DashController.cpp

dash/DashView.cpp

dash/DashView.h

dash/LensBar.cpp

dash/LensView.cpp *

dash/LensView.h

dash/PlacesGroup.cpp *

dash/PlacesGroup.h

dash/ResultView.cpp

dash/ResultView.h

dash/ResultViewGrid.cpp

dash/ResultViewGrid.h

dash/StandaloneDash.cpp

hud/HudIcon.cpp

hud/HudIcon.h

hud/HudView.cpp

launcher/AbstractLauncherIcon.h

launcher/BFBLauncherIcon.cpp

launcher/BFBLauncherIcon.h

launcher/BamfLauncherIcon.cpp

launcher/BamfLauncherIcon.h

launcher/DesktopLauncherIcon.cpp

launcher/DeviceLauncherIcon.cpp

launcher/DeviceLauncherIcon.h

launcher/FavoriteStoreGSettings.cpp

launcher/HudLauncherIcon.cpp

launcher/HudLauncherIcon.h

launcher/Launcher.cpp

launcher/Launcher.h

launcher/LauncherController.cpp

launcher/LauncherHideMachine.cpp

launcher/LauncherHideMachine.h

launcher/LauncherIcon.cpp

launcher/LauncherIcon.h

launcher/LauncherModel.cpp

launcher/LauncherOptions.cpp

launcher/MockLauncherIcon.h

launcher/QuicklistMenuItem.cpp

launcher/QuicklistMenuItem.h

launcher/QuicklistMenuItemCheckmark.cpp

launcher/QuicklistMenuItemCheckmark.h

launcher/QuicklistMenuItemLabel.cpp

launcher/QuicklistMenuItemLabel.h

launcher/QuicklistMenuItemRadio.cpp

launcher/QuicklistMenuItemRadio.h

launcher/QuicklistMenuItemSeparator.cpp

launcher/QuicklistMenuItemSeparator.h

launcher/QuicklistView.cpp

launcher/QuicklistView.h

launcher/SimpleLauncherIcon.cpp

launcher/SimpleLauncherIcon.h

launcher/SingleMonitorLauncherIcon.cpp

launcher/SingleMonitorLauncherIcon.h

launcher/SoftwareCenterLauncherIcon.cpp

launcher/SpacerLauncherIcon.cpp

launcher/StandaloneLauncher.cpp

launcher/StandaloneSwitcher.cpp

launcher/SwitcherController.cpp

launcher/SwitcherController.h

launcher/SwitcherModel.cpp

launcher/SwitcherView.cpp

launcher/SwitcherView.h

launcher/TrashLauncherIcon.cpp

launcher/TrashLauncherIcon.h

manual-tests/Hud.txt

manual-tests/Launcher.txt

panel/PanelController.cpp

panel/StandalonePanel.cpp

plugins/networkarearegion/src/networkarearegion.cpp

plugins/unityshell/src/ScreenEffectFramebufferObject.cpp

plugins/unityshell/src/UnityGestureBroker.cpp

plugins/unityshell/src/UnityGestureBroker.h

plugins/unityshell/src/UnityGestureTarget.cpp

plugins/unityshell/src/WindowGestureTarget.cpp

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

plugins/unityshell/src/unity-quicklist-menu-item-accessible.cpp

plugins/unityshell/src/unity-rvgrid-accessible.cpp

plugins/unityshell/src/unitya11ytests.cpp

plugins/unityshell/src/unityshell.cpp

plugins/unityshell/src/unityshell.h

plugins/unityshell/unityshell.xml.in

services/panel-service.c

shortcuts/StandaloneShortcuts.cpp

tests/CMakeLists.txt

tests/autopilot/unity/emulators/dash.py

tests/autopilot/unity/emulators/launcher.py

tests/autopilot/unity/tests/launcher/test_icon_behavior.py

tests/autopilot/unity/tests/launcher/test_reveal.py

tests/autopilot/unity/tests/test_dash.py

tests/autopilot/unity/tests/test_hud.py

tests/autopilot/unity/tests/test_ibus.py

tests/autopilot/unity/tests/test_panel.py

tests/autopilot/unity/tests/test_quicklist.py

tests/autopilot/unity/tests/test_shortcut_hint.py

tests/autopilot/unity/tests/test_switcher.py

tests/test-gestures/CMakeLists.txt

tests/test-gestures/NuxMock.h

tests/test-gestures/sed_script_broker

tests/test-gestures/test_gestures_main.cpp

tests/test-gestures/unityshell_mock.h

tests/test_favorite_store_gsettings.cpp

tests/test_glib_signals.cpp

tests/test_home_lens.cpp

tests/test_icon_loader.cpp

tests/test_launcher.cpp

tests/test_launcher_controller.cpp

tests/test_lens.cpp

tests/test_results.cpp

tests/test_service_lens.c

tests/test_service_model.c

tests/test_single_monitor_launcher_icon.cpp

tests/unit/TestMain.cpp

unity-shared/BGHash.cpp

unity-shared/BGHash.h

unity-shared/CMakeLists.txt

unity-shared/DashStyle.cpp *

unity-shared/DashStyle.h *

unity-shared/FontSettings.cpp

unity-shared/IconLoader.cpp

unity-shared/IconRenderer.cpp

unity-shared/IconTexture.cpp

unity-shared/IconTexture.h

unity-shared/PluginAdapter.h

unity-shared/PluginAdapterCompiz.cpp

unity-shared/PluginAdapterStandalone.cpp

unity-shared/SearchBar.cpp

unity-shared/StaticCairoText.cpp

unity-shared/StaticCairoText.h

unity-shared/UBusMessages.h

unity-shared/WindowManager.cpp

unity-shared/WindowManager.h

Show diffs side-by-side

added added

removed removed

UnityCore/CMakeLists.txt

UnityCore/GLibSignal-inl.h

UnityCore/GLibSignal.cpp

UnityCore/GLibSignal.h

UnityCore/HomeLens.cpp

UnityCore/HomeLens.h

UnityCore/Indicator.cpp

UnityCore/Lens.cpp

UnityCore/Lens.h

UnityCore/Model-inl.h

UnityCore/Model.h

UnityCore/Preview.cpp

UnityCore/Preview.h

UnityCore/ResultIterator.cpp

UnityCore/ResultIterator.h

UnityCore/Results.cpp

UnityCore/Results.h

dash/CMakeLists.txt

dash/CoverflowResultView.cpp

dash/CoverflowResultView.h

dash/DashController.cpp

dash/DashView.cpp

dash/DashView.h

dash/LensBar.cpp

dash/LensView.cpp

dash/LensView.h

dash/PlacesGroup.cpp

dash/PlacesGroup.h

dash/PlacesVScrollBar.cpp

dash/PlacesVScrollBar.h

dash/PreviewStateMachine.cpp

dash/PreviewStateMachine.h

dash/ResultView.cpp

dash/ResultView.h

dash/ResultViewGrid.cpp

dash/ResultViewGrid.h

dash/StandaloneDash.cpp

dash/previews/ActionButton.cpp

dash/previews/ActionButton.h

dash/previews/ApplicationPreview.cpp

dash/previews/ApplicationPreview.h

dash/previews/CMakeLists.txt

dash/previews/DBusTestRunner.h

dash/previews/GenericPreview.cpp

dash/previews/GenericPreview.h

dash/previews/LensDBusTestRunner.h

dash/previews/MoviePreview.cpp

dash/previews/MoviePreview.h

dash/previews/MusicPreview.cpp

dash/previews/MusicPreview.h

dash/previews/Preview.cpp

dash/previews/Preview.h

dash/previews/PreviewContainer.cpp

dash/previews/PreviewContainer.h

dash/previews/PreviewInfoHintWidget.cpp

dash/previews/PreviewInfoHintWidget.h

dash/previews/PreviewNavigator.cpp

dash/previews/PreviewNavigator.h

dash/previews/PreviewRatingsWidget.cpp

dash/previews/PreviewRatingsWidget.h

dash/previews/Skype.png

dash/previews/StandaloneApplicationPreview.cpp

dash/previews/StandaloneMoviePreview.cpp

dash/previews/StandaloneMusicPreview.cpp

dash/previews/Track.cpp

dash/previews/Track.h

dash/previews/Tracks.cpp

dash/previews/Tracks.h

hud/HudIcon.cpp

hud/HudView.cpp

launcher/AbstractLauncherIcon.h

launcher/BFBLauncherIcon.cpp

launcher/BFBLauncherIcon.h

launcher/BamfLauncherIcon.cpp

launcher/BamfLauncherIcon.h

launcher/DesktopLauncherIcon.cpp

launcher/DeviceLauncherIcon.cpp

launcher/DeviceLauncherIcon.h

launcher/FavoriteStoreGSettings.cpp

launcher/HudLauncherIcon.cpp

launcher/HudLauncherIcon.h

launcher/Launcher.cpp

launcher/Launcher.h

launcher/LauncherController.cpp

launcher/LauncherHideMachine.cpp

launcher/LauncherHideMachine.h

launcher/LauncherIcon.cpp

launcher/LauncherIcon.h

launcher/LauncherModel.cpp

launcher/LauncherOptions.cpp

launcher/MockLauncherIcon.h

launcher/QuicklistMenuItem.cpp

launcher/QuicklistMenuItem.h

launcher/QuicklistMenuItemCheckmark.cpp

launcher/QuicklistMenuItemCheckmark.h

launcher/QuicklistMenuItemLabel.cpp

launcher/QuicklistMenuItemLabel.h

launcher/QuicklistMenuItemRadio.cpp

launcher/QuicklistMenuItemRadio.h

launcher/QuicklistMenuItemSeparator.cpp

launcher/QuicklistMenuItemSeparator.h

launcher/QuicklistView.cpp

launcher/QuicklistView.h

launcher/SimpleLauncherIcon.cpp

launcher/SimpleLauncherIcon.h

launcher/SingleMonitorLauncherIcon.cpp

launcher/SingleMonitorLauncherIcon.h

launcher/SoftwareCenterLauncherIcon.cpp

launcher/SpacerLauncherIcon.cpp

launcher/StandaloneLauncher.cpp

launcher/StandaloneSwitcher.cpp

launcher/SwitcherController.cpp

launcher/SwitcherController.h

launcher/SwitcherModel.cpp

launcher/SwitcherView.cpp

launcher/SwitcherView.h

launcher/TrashLauncherIcon.cpp

launcher/TrashLauncherIcon.h

manual-tests/Flowview.txt

manual-tests/HighlightedBFB.txt

manual-tests/Hud.txt

manual-tests/Launcher.txt

panel/PanelController.cpp

panel/StandalonePanel.cpp

plugins/networkarearegion/src/networkarearegion.cpp

plugins/unityshell/resources/preview_next.svg

plugins/unityshell/resources/preview_pause.svg

plugins/unityshell/resources/preview_play.svg

plugins/unityshell/resources/preview_previous.svg

plugins/unityshell/src/CompoundGestureRecognizer.cpp

plugins/unityshell/src/CompoundGestureRecognizer.h

plugins/unityshell/src/GesturalWindowSwitcher.cpp

plugins/unityshell/src/GesturalWindowSwitcher.h

plugins/unityshell/src/ScreenEffectFramebufferObject.cpp

plugins/unityshell/src/UnityGestureBroker.cpp

plugins/unityshell/src/UnityGestureBroker.h

plugins/unityshell/src/UnityGestureTarget.cpp

plugins/unityshell/src/WindowGestureTarget.cpp

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

plugins/unityshell/src/unity-rvgrid-accessible.cpp

plugins/unityshell/src/unitya11ytests.cpp

plugins/unityshell/src/unityshell.cpp

plugins/unityshell/src/unityshell.h

plugins/unityshell/unityshell.xml.in

services/panel-service.c

shortcuts/StandaloneShortcuts.cpp

tests/CMakeLists.txt

tests/autopilot/unity/emulators/dash.py

tests/autopilot/unity/emulators/launcher.py

tests/autopilot/unity/tests/launcher/test_icon_behavior.py

tests/autopilot/unity/tests/launcher/test_reveal.py

tests/autopilot/unity/tests/test_dash.py

tests/autopilot/unity/tests/test_hud.py

tests/autopilot/unity/tests/test_ibus.py

tests/autopilot/unity/tests/test_panel.py

tests/autopilot/unity/tests/test_quicklist.py

tests/autopilot/unity/tests/test_shortcut_hint.py

tests/autopilot/unity/tests/test_switcher.py

tests/test-gestures/CMakeLists.txt

tests/test-gestures/GesturalWindowSwitcherMock.h

tests/test-gestures/NuxMock.h

tests/test-gestures/SwitcherControllerMock.h

tests/test-gestures/compiz_mock/core/timer.h

tests/test-gestures/sed_script_broker

tests/test-gestures/sed_script_switcher

tests/test-gestures/test_compound_gesture_recognizer.cpp

tests/test-gestures/test_gestural_window_switcher.cpp

tests/test-gestures/test_gestures_main.cpp

tests/test-gestures/unityshell_mock.h

tests/test_bfb_launcher_icon.cpp

tests/test_favorite_store_gsettings.cpp

tests/test_glib_signals.cpp

tests/test_home_lens.cpp

tests/test_icon_loader.cpp

tests/test_launcher.cpp

tests/test_launcher_controller.cpp

tests/test_lens.cpp

tests/test_model_iterator.cpp

tests/test_previews_application.cpp

tests/test_previews_generic.cpp

tests/test_previews_movie.cpp

tests/test_previews_music.cpp

tests/test_quicklist_menu_item.cpp

tests/test_quicklist_view.cpp

tests/test_results.cpp

tests/test_service_lens.c

tests/test_service_model.c

tests/test_single_monitor_launcher_icon.cpp

tests/test_thumbnail_generator.cpp

tests/unit/TestMain.cpp

tests/unit/TestQuicklistMenuitems.cpp

tools/convert-files/

tools/convert-files/compiz-profile-active-unity.convert

tools/convert-files/compiz-profile-unity.convert

unity-shared/BGHash.cpp

unity-shared/BGHash.h

unity-shared/CMakeLists.txt

unity-shared/CoverArt.cpp

unity-shared/CoverArt.h

unity-shared/DashStyle.cpp

unity-shared/DefaultThumbnailProvider.cpp

unity-shared/DefaultThumbnailProvider.h

unity-shared/FontSettings.cpp

unity-shared/IconLoader.cpp

unity-shared/IconRenderer.cpp

unity-shared/IconTexture.cpp

unity-shared/IconTexture.h

unity-shared/PlacesVScrollBar.cpp

unity-shared/PlacesVScrollBar.h

unity-shared/PluginAdapter.h

unity-shared/PluginAdapterCompiz.cpp

unity-shared/PluginAdapterStandalone.cpp

unity-shared/PreviewStyle.cpp

unity-shared/PreviewStyle.h

unity-shared/RatingsButton.cpp

unity-shared/RatingsButton.h

unity-shared/SearchBar.cpp

unity-shared/StaticCairoText.cpp

unity-shared/StaticCairoText.h

unity-shared/TextureThumbnailProvider.cpp

unity-shared/TextureThumbnailProvider.h

unity-shared/ThumbnailGenerator.cpp

unity-shared/ThumbnailGenerator.h

unity-shared/UBusMessages.h

unity-shared/UserThumbnailProvider.cpp

unity-shared/UserThumbnailProvider.h

unity-shared/WindowManager.cpp

unity-shared/WindowManager.h

Older »