diff -Nru unity-7.2.0+14.04.20140402/com.canonical.Unity.gschema.xml unity-7.2.0+14.04.20140403/com.canonical.Unity.gschema.xml --- unity-7.2.0+14.04.20140402/com.canonical.Unity.gschema.xml 2014-04-02 11:02:40.000000000 +0000 +++ unity-7.2.0+14.04.20140403/com.canonical.Unity.gschema.xml 2014-04-03 11:09:33.000000000 +0000 @@ -94,9 +94,7 @@ 'application://libreoffice-calc.desktop', 'application://libreoffice-impress.desktop', 'application://ubuntu-software-center.desktop', - 'application://ubuntuone-installer.desktop', 'application://ubuntu-amazon-default.desktop', - 'application://UbuntuOneMusiconeubuntucom.desktop', 'application://unity-control-center.desktop', 'unity://running-apps', 'unity://expo-icon', diff -Nru unity-7.2.0+14.04.20140402/debian/changelog unity-7.2.0+14.04.20140403/debian/changelog --- unity-7.2.0+14.04.20140402/debian/changelog 2014-04-03 13:48:14.000000000 +0000 +++ unity-7.2.0+14.04.20140403/debian/changelog 2014-04-03 13:48:14.000000000 +0000 @@ -1,3 +1,24 @@ +unity (7.2.0+14.04.20140403-0ubuntu1) trusty; urgency=low + + [ Stephen M. Webb ] + * remove libsyncindicator from services/panel-service.c + + [ Dimitri John Ledkov ] + * Drop U1 default shortcuts & indicator-sync recommendation. (LP: + #1300916) (LP: #1300916) + + [ Marco Trevisan (Treviño) ] + * Launcher: hide the launcher window when in auto-hide mode if it's + not presented (LP: #1301394) + * ApplicationLauncherIcon: recompute pips when the screen geometry + changes (LP: #1024101) + * UnityScreen: reset decoration::DataPool on destruction, otherwise we + won't have a valid screen ptr (LP: #1291243) + * DecorationsGrabEdge: Only perform tookit actions on right-click (LP: + #1301459) + + -- Ubuntu daily release Thu, 03 Apr 2014 11:10:36 +0000 + unity (7.2.0+14.04.20140402-0ubuntu1) trusty; urgency=medium [ Stephen M. Webb ] diff -Nru unity-7.2.0+14.04.20140402/debian/control unity-7.2.0+14.04.20140403/debian/control --- unity-7.2.0+14.04.20140402/debian/control 2014-04-03 13:48:14.000000000 +0000 +++ unity-7.2.0+14.04.20140403/debian/control 2014-04-03 13:48:14.000000000 +0000 @@ -92,7 +92,6 @@ indicator-printers, indicator-power, indicator-session, - indicator-sync, telepathy-indicator, hud, Breaks: unity-lens-applications (<< 5.12.0-0ubuntu2), diff -Nru unity-7.2.0+14.04.20140402/decorations/DecorationsDataPool.cpp unity-7.2.0+14.04.20140403/decorations/DecorationsDataPool.cpp --- unity-7.2.0+14.04.20140402/decorations/DecorationsDataPool.cpp 2014-04-02 11:02:40.000000000 +0000 +++ unity-7.2.0+14.04.20140403/decorations/DecorationsDataPool.cpp 2014-04-03 11:10:13.000000000 +0000 @@ -32,11 +32,11 @@ namespace { DECLARE_LOGGER(logger, "unity.decoration.datapool"); +static DataPool::Ptr instance_; const std::string PLUGIN_NAME = "unityshell"; const int BUTTONS_SIZE = 16; const int BUTTONS_PADDING = 1; const cu::SimpleTexture::Ptr EMPTY_BUTTON; -Display* dpy = nullptr; unsigned EdgeTypeToCursorShape(Edge::Type type) { @@ -67,7 +67,6 @@ DataPool::DataPool() { - dpy = screen->dpy(); SetupCursors(); SetupTextures(); @@ -81,18 +80,28 @@ DataPool::~DataPool() { + auto* dpy = screen->dpy(); for (auto cursor : edge_cursors_) XFreeCursor(dpy, cursor); } DataPool::Ptr const& DataPool::Get() { - static DataPool::Ptr data_pool(new DataPool()); - return data_pool; + if (instance_) + return instance_; + + instance_.reset(new DataPool); + return instance_; +} + +void DataPool::Reset() +{ + instance_.reset(); } void DataPool::SetupCursors() { + auto* dpy = screen->dpy(); for (unsigned c = 0; c < edge_cursors_.size(); ++c) edge_cursors_[c] = XCreateFontCursor(dpy, EdgeTypeToCursorShape(Edge::Type(c))); } diff -Nru unity-7.2.0+14.04.20140402/decorations/DecorationsDataPool.h unity-7.2.0+14.04.20140403/decorations/DecorationsDataPool.h --- unity-7.2.0+14.04.20140402/decorations/DecorationsDataPool.h 2014-04-02 11:02:40.000000000 +0000 +++ unity-7.2.0+14.04.20140403/decorations/DecorationsDataPool.h 2014-04-03 11:10:13.000000000 +0000 @@ -35,6 +35,7 @@ typedef std::shared_ptr Ptr; static DataPool::Ptr const& Get(); + static void Reset(); virtual ~DataPool(); Cursor EdgeCursor(Edge::Type) const; diff -Nru unity-7.2.0+14.04.20140402/decorations/DecorationsGrabEdge.cpp unity-7.2.0+14.04.20140403/decorations/DecorationsGrabEdge.cpp --- unity-7.2.0+14.04.20140402/decorations/DecorationsGrabEdge.cpp 2014-04-02 11:02:40.000000000 +0000 +++ unity-7.2.0+14.04.20140403/decorations/DecorationsGrabEdge.cpp 2014-04-03 11:10:23.000000000 +0000 @@ -35,10 +35,13 @@ void GrabEdge::ButtonDownEvent(CompPoint const& p, unsigned button, Time timestamp) { - if (button == 3) - screen->toolkitAction(Atoms::toolkitActionWindowMenu, timestamp, win_->id(), button, p.x(), p.y()); - else if (button != 1) + if (button != 1) + { + if (button == 3) + screen->toolkitAction(Atoms::toolkitActionWindowMenu, timestamp, win_->id(), button, p.x(), p.y()); + return; + } if (!IsMaximizable() && !always_wait_grab_timeout_) { diff -Nru unity-7.2.0+14.04.20140402/launcher/ApplicationLauncherIcon.cpp unity-7.2.0+14.04.20140403/launcher/ApplicationLauncherIcon.cpp --- unity-7.2.0+14.04.20140402/launcher/ApplicationLauncherIcon.cpp 2014-04-02 11:02:40.000000000 +0000 +++ unity-7.2.0+14.04.20140403/launcher/ApplicationLauncherIcon.cpp 2014-04-03 11:10:02.000000000 +0000 @@ -34,6 +34,7 @@ #include "unity-shared/DesktopApplicationManager.h" #include "unity-shared/GnomeFileManager.h" #include "unity-shared/UBusMessages.h" +#include "unity-shared/UScreen.h" #include #include @@ -87,6 +88,7 @@ wm.window_moved.connect(sigc::mem_fun(this, &ApplicationLauncherIcon::OnWindowMoved)); wm.screen_viewport_switch_ended.connect(sigc::mem_fun(this, &ApplicationLauncherIcon::EnsureWindowState)); wm.terminate_expo.connect(sigc::mem_fun(this, &ApplicationLauncherIcon::EnsureWindowState)); + UScreen::GetDefault()->changed.connect(sigc::hide(sigc::hide(sigc::mem_fun(this, &ApplicationLauncherIcon::EnsureWindowState)))); EnsureWindowState(); } diff -Nru unity-7.2.0+14.04.20140402/launcher/Launcher.cpp unity-7.2.0+14.04.20140403/launcher/Launcher.cpp --- unity-7.2.0+14.04.20140402/launcher/Launcher.cpp 2014-04-02 11:02:40.000000000 +0000 +++ unity-7.2.0+14.04.20140403/launcher/Launcher.cpp 2014-04-03 11:09:53.000000000 +0000 @@ -1101,6 +1101,9 @@ postreveal_mousemove_delta_x_ = 0; postreveal_mousemove_delta_y_ = 0; + if (!hide_launcher) + parent_->ShowWindow(true); + if (nux::GetWindowThread()->IsEmbeddedWindow()) parent_->EnableInputWindow(!hide_launcher, launcher::window_title, false, false); @@ -1672,6 +1675,9 @@ RenderArgs(args, bkg_box, &launcher_alpha, geo_absolute); bkg_box.width -= RIGHT_LINE_WIDTH.CP(cv_); + if (options()->hide_mode != LAUNCHER_HIDE_NEVER && bkg_box.x + bkg_box.width <= 0) + parent_->ShowWindow(false); + nux::Color clear_colour = nux::Color(0x00000000); // clear region @@ -1691,6 +1697,7 @@ GfxContext.PushClippingRectangle(nux::Geometry(base.x, bkg_box.y, base.width, bkg_box.height)); float reveal_progress = hide_machine_.reveal_progress; + if ((reveal_progress > 0 || last_reveal_progress_ > 0) && launcher_pressure_effect_.IsValid()) { if (std::abs(last_reveal_progress_ - reveal_progress) <= .1f) diff -Nru unity-7.2.0+14.04.20140402/plugins/unityshell/src/unityshell.cpp unity-7.2.0+14.04.20140403/plugins/unityshell/src/unityshell.cpp --- unity-7.2.0+14.04.20140402/plugins/unityshell/src/unityshell.cpp 2014-04-02 11:03:33.000000000 +0000 +++ unity-7.2.0+14.04.20140403/plugins/unityshell/src/unityshell.cpp 2014-04-03 11:10:13.000000000 +0000 @@ -466,6 +466,7 @@ unity_a11y_finalize(); QuicklistManager::Destroy(); + decoration::DataPool::Reset(); reset_glib_logging(); } diff -Nru unity-7.2.0+14.04.20140402/services/panel-service.c unity-7.2.0+14.04.20140403/services/panel-service.c --- unity-7.2.0+14.04.20140402/services/panel-service.c 2014-04-02 11:02:40.000000000 +0000 +++ unity-7.2.0+14.04.20140403/services/panel-service.c 2014-04-03 11:09:43.000000000 +0000 @@ -115,7 +115,6 @@ {"libapplication.so", NULL}, /* indicator-application" */ {"floating-indicators", NULL}, /* position-less NG indicators */ {"libprintersmenu.so", NULL}, /* indicator-printers */ - {"libsyncindicator.so", NULL}, /* indicator-sync */ {"libapplication.so", "gsd-keyboard-xkb"}, /* keyboard layout selector */ {"libmessaging.so", NULL}, /* indicator-messages */ {"libpower.so", NULL}, /* indicator-power */