← Back to branch summary

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

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

« back to all changes in this revision

Viewing changes to plugins/unityshell/src/compizminimizedwindowhandler.h

Committer: Daniel van Vugt
Date: 2012-10-11 01:44:15 UTC
mfrom: (2826 trunk)
mto: This revision was merged to the branch mainline in revision 2847.
Revision ID: daniel.van.vugt@canonical.com-20121011014415-jvudq1d7bn1z268j

Merge latest lp:unity and fix a conflict

files added:
plugins/unityshell/src/glow_texture.h

plugins/unityshell/src/unityshell_glow.cpp

plugins/unityshell/src/unityshell_glow.h

tests/test_dbus_indicators.cpp

tests/test_places_group.cpp

tests/test_service_panel.c

tests/test_service_panel.h

unity-shared/DashStyleInterface.h

unity-shared/KeyboardUtil.h

unity-shared/StandaloneWindowManager.h

unity-shared/WindowManager.cpp

unity-shared/WindowManager.h

files renamed:
launcher/BamfLauncherIcon.cpp => launcher/ApplicationLauncherIcon.cpp

launcher/BamfLauncherIcon.h => launcher/ApplicationLauncherIcon.h

tests/test_bamf_launcher_icon.cpp => tests/test_application_launcher_icon.cpp

unity-shared/PluginAdapterCompiz.cpp => unity-shared/PluginAdapter.cpp

unity-shared/PluginAdapterStandalone.cpp => unity-shared/StandaloneWindowManager.cpp

unity-shared/KeyboardUtil.cpp => unity-shared/XKeyboardUtil.cpp

unity-shared/KeyboardUtil.h => unity-shared/XKeyboardUtil.h

unity-shared/WindowManager.cpp => unity-shared/XWindowManager.cpp

unity-shared/WindowManager.h => unity-shared/XWindowManager.h

files modified:
CMakeLists.txt

UnityCore/DBusIndicators.cpp

UnityCore/DBusIndicators.h

UnityCore/DesktopUtilities.cpp

UnityCore/GLibDBusProxy.cpp

UnityCore/HomeLens.cpp

UnityCore/Indicator.cpp

UnityCore/Indicator.h

dash/CoverflowResultView.cpp

dash/CoverflowResultView.h

dash/DashController.cpp

dash/DashView.cpp

dash/DashView.h

dash/LensView.cpp

dash/LensView.h

dash/PlacesGroup.cpp

dash/PlacesGroup.h

dash/PreviewStateMachine.cpp

dash/ResultView.cpp

dash/ResultView.h

dash/ResultViewGrid.cpp

dash/ResultViewGrid.h

dash/StandaloneDash.cpp

dash/previews/ActionButton.cpp

dash/previews/PreviewContainer.cpp

dash/previews/SocialPreviewContent.cpp

dash/previews/SocialPreviewContent.h

hud/HudController.cpp

launcher/AbstractLauncherIcon.h

launcher/CMakeLists.txt

launcher/CairoBaseWindow.cpp

launcher/CairoBaseWindow.h

launcher/DNDCollectionWindow.cpp

launcher/DNDCollectionWindow.h

launcher/DesktopLauncherIcon.cpp

launcher/DeviceLauncherSection.h

launcher/ExpoLauncherIcon.cpp

launcher/Launcher.cpp

launcher/Launcher.h

launcher/LauncherController.cpp

launcher/LauncherControllerPrivate.h

launcher/LauncherDragWindow.cpp

launcher/LauncherIcon.cpp

launcher/LauncherModel.cpp

launcher/LauncherModel.h

launcher/LayoutSystem.cpp

launcher/LayoutSystem.h

launcher/QuicklistView.cpp

launcher/SimpleLauncherIcon.cpp

launcher/SoftwareCenterLauncherIcon.cpp

launcher/SoftwareCenterLauncherIcon.h

launcher/SwitcherController.cpp

launcher/SwitcherController.h

launcher/SwitcherModel.cpp

launcher/SwitcherModel.h

launcher/SwitcherView.cpp

launcher/SwitcherView.h

launcher/Tooltip.cpp

launcher/TrashLauncherIcon.cpp

launcher/VolumeImp.cpp

manual-tests/Dash.txt

manual-tests/Panel.txt

manual-tests/Preview.txt

panel/CMakeLists.txt

panel/PanelController.cpp

panel/PanelIndicatorEntryView.cpp

panel/PanelMenuView.cpp

panel/PanelMenuView.h

panel/PanelView.cpp

panel/WindowButtons.cpp

plugins/unityshell/resources/album_missing_preview.png

plugins/unityshell/src/WindowGestureTarget.cpp

plugins/unityshell/src/compizminimizedwindowhandler.h

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

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

plugins/unityshell/src/unityshell.cpp

plugins/unityshell/src/unityshell.h

plugins/unityshell/unityshell.xml.in

po/POTFILES.in

services/panel-indicator-entry-accessible.c

shortcuts/ShortcutController.cpp

tests/CMakeLists.txt

tests/autopilot/unity/emulators/icons.py

tests/autopilot/unity/emulators/launcher.py

tests/autopilot/unity/tests/__init__.py

tests/autopilot/unity/tests/launcher/test_icon_behavior.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/xim/test_gcin.py

tests/gmockvolume.c

tests/gmockvolume.h

tests/test-gestures/CMakeLists.txt

tests/test-gestures/PluginAdapterMock.cpp

tests/test-gestures/PluginAdapterMock.h

tests/test_desktop_launcher_icon.cpp

tests/test_desktop_utilities.cpp

tests/test_device_launcher_section.cpp

tests/test_expo_launcher_icon.cpp

tests/test_glib_source.cpp

tests/test_indicator.cpp

tests/test_keyboard_util.cpp

tests/test_launcher.cpp

tests/test_launcher_controller.cpp

tests/test_launcher_drag_window.cpp

tests/test_launcher_model.cpp

tests/test_main.cpp

tests/test_service_main.c

tests/test_switcher_controller.cpp

tests/test_utils.h

tests/test_volume_imp.cpp

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

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

unity-shared/BackgroundEffectHelper.cpp

unity-shared/CMakeLists.txt

unity-shared/CoverArt.cpp

unity-shared/DashStyle.cpp

unity-shared/DashStyle.h

unity-shared/IconLoader.cpp

unity-shared/IntrospectableWrappers.cpp

unity-shared/IntrospectableWrappers.h

unity-shared/OverlayRenderer.cpp

unity-shared/OverlayRenderer.h

unity-shared/PluginAdapter.h

unity-shared/SearchBar.cpp

unity-shared/StaticCairoText.cpp

unity-shared/StaticCairoText.h

unity-shared/UBusMessages.h

unity-shared/UnitySettings.cpp

unity-shared/UnitySettings.h

unity-shared/UnityWindowView.cpp

unity-shared/UnityWindowView.h

unity-standalone/StandaloneUnity.cpp

Show diffs side-by-side

added added

removed removed

plugins/unityshell/src/compizminimizedwindowhandler.h

154

154

{

155

155

CompWindow *win = screen->findWindow (w);

156

156

157

if (win)

157

if (win && win->isMapped())

158

158

{

159

159

Window *w = Window::get (win);

160

160

if (!w->mMinimizeHandler)

235

235

{

236

236

CompWindow *win = screen->findWindow (w);

237

237

238

if (win)

238

if (win && win->isMapped())

239

239

{

240

240

Window *w = Window::get (win);

241

241

if (w && w->mMinimizeHandler)

Older »