← Back to branch summary

~gordallott/unity/rename-ubus-place-view-messages

~gordallott/unity/rename-ubus-place-view-messages

Viewing all changes in revision 1848.

Committer: Gord Allott
Date: 2012-01-31 10:59:11 UTC
mfrom: (1844.1.37 unity)
Revision ID: gord.allott@canonical.com-20120131105911-dskyq1bt1xjvjare

merge with trunk, fix lots of conflicts, sad day

files added:
manual-tests/Menus.txt

plugins/unityshell/src/Decaymulator.cpp

plugins/unityshell/src/Decaymulator.h

plugins/unityshell/src/LauncherOptions.cpp

plugins/unityshell/src/LauncherOptions.h

plugins/unityshell/src/PointerBarrier.cpp

plugins/unityshell/src/PointerBarrier.h

plugins/unityshell/src/UnityWindowStyle.cpp

plugins/unityshell/src/UnityWindowStyle.h

plugins/unityshell/src/UnityWindowView.cpp

plugins/unityshell/src/UnityWindowView.h

tests/test_launcher_model.cpp

files modified:
manual-tests/SuperTab.txt

plugins/unityshell/src/AbstractIconRenderer.h

plugins/unityshell/src/AbstractLauncherIcon.h

plugins/unityshell/src/BFBLauncherIcon.cpp

plugins/unityshell/src/BFBLauncherIcon.h

plugins/unityshell/src/BamfLauncherIcon.cpp

plugins/unityshell/src/BamfLauncherIcon.h

plugins/unityshell/src/DashController.cpp

plugins/unityshell/src/DashSettings.cpp

plugins/unityshell/src/DashView.cpp

plugins/unityshell/src/DashView.h

plugins/unityshell/src/DesktopLauncherIcon.cpp

plugins/unityshell/src/DesktopLauncherIcon.h

plugins/unityshell/src/DeviceLauncherIcon.cpp

plugins/unityshell/src/DeviceLauncherIcon.h

plugins/unityshell/src/DeviceLauncherSection.cpp

plugins/unityshell/src/DeviceLauncherSection.h

plugins/unityshell/src/IconLoader.cpp

plugins/unityshell/src/IconRenderer.cpp

plugins/unityshell/src/IconRenderer.h

plugins/unityshell/src/Introspectable.cpp

plugins/unityshell/src/Introspectable.h

plugins/unityshell/src/Launcher.cpp

plugins/unityshell/src/Launcher.h

plugins/unityshell/src/LauncherController.cpp

plugins/unityshell/src/LauncherController.h

plugins/unityshell/src/LauncherHideMachine.cpp

plugins/unityshell/src/LauncherHideMachine.h

plugins/unityshell/src/LauncherIcon.cpp

plugins/unityshell/src/LauncherIcon.h

plugins/unityshell/src/LauncherModel.cpp

plugins/unityshell/src/LauncherModel.h

plugins/unityshell/src/MockLauncherIcon.h

plugins/unityshell/src/OverlayRenderer.cpp

plugins/unityshell/src/OverlayRenderer.h

plugins/unityshell/src/PanelController.cpp

plugins/unityshell/src/PanelController.h

plugins/unityshell/src/PanelIndicatorsView.cpp

plugins/unityshell/src/PanelIndicatorsView.h

plugins/unityshell/src/PanelView.cpp

plugins/unityshell/src/PanelView.h

plugins/unityshell/src/PlacesSimpleTile.cpp

plugins/unityshell/src/PlacesSimpleTile.h

plugins/unityshell/src/PluginAdapter.cpp

plugins/unityshell/src/PluginAdapter.h

plugins/unityshell/src/ScreenEffectFramebufferObject.cpp

plugins/unityshell/src/ShortcutController.cpp

plugins/unityshell/src/ShortcutView.cpp

plugins/unityshell/src/ShortcutView.h

plugins/unityshell/src/SimpleLauncherIcon.cpp

plugins/unityshell/src/SimpleLauncherIcon.h

plugins/unityshell/src/SoftwareCenterLauncherIcon.cpp

plugins/unityshell/src/SoftwareCenterLauncherIcon.h

plugins/unityshell/src/SpacerLauncherIcon.cpp

plugins/unityshell/src/SpacerLauncherIcon.h

plugins/unityshell/src/SwitcherController.cpp

plugins/unityshell/src/SwitcherController.h

plugins/unityshell/src/SwitcherModel.cpp

plugins/unityshell/src/SwitcherView.cpp

plugins/unityshell/src/SwitcherView.h

plugins/unityshell/src/TimeUtil.h

plugins/unityshell/src/TrashLauncherIcon.cpp

plugins/unityshell/src/TrashLauncherIcon.h

plugins/unityshell/src/UBusMessages.h

plugins/unityshell/src/UScreen.cpp

plugins/unityshell/src/UScreen.h

plugins/unityshell/src/WindowButtons.cpp

plugins/unityshell/src/WindowManager.cpp

plugins/unityshell/src/WindowManager.h

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

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

plugins/unityshell/src/unitya11ytests.cpp

plugins/unityshell/src/unityshell.cpp

plugins/unityshell/src/unityshell.h

plugins/unityshell/unityshell.xml.in

services/CMakeLists.txt

services/panel-service.c

standalone-clients/TestScreenEffectFramebufferObject.cpp

tests/CMakeLists.txt

tests/autopilot/autopilot/emulators/X11.py

tests/autopilot/autopilot/emulators/unity.py

tests/autopilot/autopilot/tests/test_launcher.py

Show diffs side-by-side

added added

removed removed

manual-tests/Menus.txt

manual-tests/SuperTab.txt

plugins/unityshell/src/AbstractIconRenderer.h

plugins/unityshell/src/AbstractLauncherIcon.h

plugins/unityshell/src/BFBLauncherIcon.cpp

plugins/unityshell/src/BFBLauncherIcon.h

plugins/unityshell/src/BamfLauncherIcon.cpp

plugins/unityshell/src/BamfLauncherIcon.h

plugins/unityshell/src/DashController.cpp

plugins/unityshell/src/DashSettings.cpp

plugins/unityshell/src/DashView.cpp

plugins/unityshell/src/DashView.h

plugins/unityshell/src/Decaymulator.cpp

plugins/unityshell/src/Decaymulator.h

plugins/unityshell/src/DesktopLauncherIcon.cpp

plugins/unityshell/src/DesktopLauncherIcon.h

plugins/unityshell/src/DeviceLauncherIcon.cpp

plugins/unityshell/src/DeviceLauncherIcon.h

plugins/unityshell/src/DeviceLauncherSection.cpp

plugins/unityshell/src/DeviceLauncherSection.h

plugins/unityshell/src/IconLoader.cpp

plugins/unityshell/src/IconRenderer.cpp

plugins/unityshell/src/IconRenderer.h

plugins/unityshell/src/Introspectable.cpp

plugins/unityshell/src/Introspectable.h

plugins/unityshell/src/Launcher.cpp

plugins/unityshell/src/Launcher.h

plugins/unityshell/src/LauncherController.cpp

plugins/unityshell/src/LauncherController.h

plugins/unityshell/src/LauncherHideMachine.cpp

plugins/unityshell/src/LauncherHideMachine.h

plugins/unityshell/src/LauncherIcon.cpp

plugins/unityshell/src/LauncherIcon.h

plugins/unityshell/src/LauncherModel.cpp

plugins/unityshell/src/LauncherModel.h

plugins/unityshell/src/LauncherOptions.cpp

plugins/unityshell/src/LauncherOptions.h

plugins/unityshell/src/MockLauncherIcon.h

plugins/unityshell/src/OverlayRenderer.cpp

plugins/unityshell/src/OverlayRenderer.h

plugins/unityshell/src/PanelController.cpp

plugins/unityshell/src/PanelController.h

plugins/unityshell/src/PanelIndicatorsView.cpp

plugins/unityshell/src/PanelIndicatorsView.h

plugins/unityshell/src/PanelView.cpp

plugins/unityshell/src/PanelView.h

plugins/unityshell/src/PlacesSimpleTile.cpp

plugins/unityshell/src/PlacesSimpleTile.h

plugins/unityshell/src/PluginAdapter.cpp

plugins/unityshell/src/PluginAdapter.h

plugins/unityshell/src/PointerBarrier.cpp

plugins/unityshell/src/PointerBarrier.h

plugins/unityshell/src/ScreenEffectFramebufferObject.cpp

plugins/unityshell/src/ShortcutController.cpp

plugins/unityshell/src/ShortcutView.cpp

plugins/unityshell/src/ShortcutView.h

plugins/unityshell/src/SimpleLauncherIcon.cpp

plugins/unityshell/src/SimpleLauncherIcon.h

plugins/unityshell/src/SoftwareCenterLauncherIcon.cpp

plugins/unityshell/src/SoftwareCenterLauncherIcon.h

plugins/unityshell/src/SpacerLauncherIcon.cpp

plugins/unityshell/src/SpacerLauncherIcon.h

plugins/unityshell/src/SwitcherController.cpp

plugins/unityshell/src/SwitcherController.h

plugins/unityshell/src/SwitcherModel.cpp

plugins/unityshell/src/SwitcherView.cpp

plugins/unityshell/src/SwitcherView.h

plugins/unityshell/src/TimeUtil.h

plugins/unityshell/src/TrashLauncherIcon.cpp

plugins/unityshell/src/TrashLauncherIcon.h

plugins/unityshell/src/UBusMessages.h

plugins/unityshell/src/UScreen.cpp

plugins/unityshell/src/UScreen.h

plugins/unityshell/src/UnityWindowStyle.cpp

plugins/unityshell/src/UnityWindowStyle.h

plugins/unityshell/src/UnityWindowView.cpp

plugins/unityshell/src/UnityWindowView.h

plugins/unityshell/src/WindowButtons.cpp

plugins/unityshell/src/WindowManager.cpp

plugins/unityshell/src/WindowManager.h

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

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

plugins/unityshell/src/unitya11ytests.cpp

plugins/unityshell/src/unityshell.cpp

plugins/unityshell/src/unityshell.h

plugins/unityshell/unityshell.xml.in

services/CMakeLists.txt

services/panel-service.c

standalone-clients/TestScreenEffectFramebufferObject.cpp

tests/CMakeLists.txt

tests/autopilot/autopilot/emulators/X11.py

tests/autopilot/autopilot/emulators/unity.py

tests/autopilot/autopilot/tests/test_launcher.py

tests/test_launcher_model.cpp

Older »