Merge lp:~brandontschaefer/unity/lp.1353167-fix into lp:unity

[Brandon Schaefer]

Make sure we check if the Quicklist or Alt+F1 key nav is open (so we can close them)

Bore checking if something as a WM grab. As we cant open the hud is in Quicklist or KeyNav anymore.

Fixes AP test unity.tests.test_quicklist.QuicklistActionTests.test_quicklist_closes_when_hud_opens fails.

It was failing because now with the lockscreen we want to make sure if the WM has any type of grab we don't allow the HUD to come up. This was being checked before the check to see if the Quicklist was open (so we can close it, to allow the hud to come up). Just more the check before the WM grab check and all is well.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3847
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~brandontschaefer/unity/lp.1353167-fix/+merge/229708/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-ci/1043/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/130
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/130
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/130

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1043/rebuild

review: Needs Fixing (continuous-integration)

[Marco Trevisan (Treviño) (3v1n0)]

+1

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3847
http://jenkins.qa.ubuntu.com/job/unity-ci/1047/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/134
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/134
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/134

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1047/rebuild

review: Approve (continuous-integration)

=== modified file 'UnityCore/CheckOptionFilter.cpp'
--- UnityCore/CheckOptionFilter.cpp	2013-03-19 18:22:11 +0000
+++ UnityCore/CheckOptionFilter.cpp	2014-08-05 23:16:51 +0000
@@ -19,13 +19,10 @@
 
 #include "CheckOptionFilter.h"
 
-#include <NuxCore/Logger.h>
-
 namespace unity
 {
 namespace dash
 {
-DECLARE_LOGGER(logger, "unity.dash.filter.checkoption");
 
 CheckOptionFilter::CheckOptionFilter(DeeModel* model, DeeModelIter* iter)
 : Filter(model, iter)

=== modified file 'UnityCore/Filter.cpp'
--- UnityCore/Filter.cpp	2013-03-19 14:05:51 +0000
+++ UnityCore/Filter.cpp	2014-08-05 23:16:51 +0000
@@ -20,8 +20,6 @@
 #include "Filter.h"
 #include "Filters.h"
 
-#include <NuxCore/Logger.h>
-
 #include "CheckOptionFilter.h"
 #include "MultiRangeFilter.h"
 #include "RadioOptionFilter.h"
@@ -32,7 +30,6 @@
 {
 namespace dash
 {
-DECLARE_LOGGER(logger, "unity.dash.filter");
 
 using unity::glib::Signal;
 

=== modified file 'UnityCore/MultiRangeFilter.cpp'
--- UnityCore/MultiRangeFilter.cpp	2013-03-19 18:22:11 +0000
+++ UnityCore/MultiRangeFilter.cpp	2014-08-05 23:16:51 +0000
@@ -19,13 +19,10 @@
 
 #include "MultiRangeFilter.h"
 
-#include <NuxCore/Logger.h>
-
 namespace unity
 {
 namespace dash
 {
-DECLARE_LOGGER(logger, "unity.dash.filter.multirange");
 
 MultiRangeFilter::MultiRangeFilter(DeeModel* model, DeeModelIter* iter)
 : Filter(model, iter)

=== modified file 'UnityCore/MusicPreview.cpp'
--- UnityCore/MusicPreview.cpp	2013-03-22 18:59:14 +0000
+++ UnityCore/MusicPreview.cpp	2014-08-05 23:16:51 +0000
@@ -29,7 +29,6 @@
 {
 namespace dash
 {
-DECLARE_LOGGER(logger, "unity.dash.musicpreview");
 
 class MusicPreview::Impl
 {

=== modified file 'UnityCore/RadioOptionFilter.cpp'
--- UnityCore/RadioOptionFilter.cpp	2013-03-19 18:22:11 +0000
+++ UnityCore/RadioOptionFilter.cpp	2014-08-05 23:16:51 +0000
@@ -19,13 +19,10 @@
 
 #include "RadioOptionFilter.h"
 
-#include <NuxCore/Logger.h>
-
 namespace unity
 {
 namespace dash
 {
-DECLARE_LOGGER(logger, "unity.dash.filter.radiooption");
 
 RadioOptionFilter::RadioOptionFilter(DeeModel* model, DeeModelIter* iter)
 : Filter(model, iter)

=== modified file 'UnityCore/Scope.cpp'
--- UnityCore/Scope.cpp	2013-11-01 07:24:38 +0000
+++ UnityCore/Scope.cpp	2014-08-05 23:16:51 +0000
@@ -32,6 +32,12 @@
 {
 DECLARE_LOGGER(logger, "unity.dash.scope");
 
+GQuark
+g_scope_error_quark (void)
+{
+  return g_quark_from_static_string ("g-scope-error-quark");
+}
+
 class Scope::Impl
 {
 public:

=== modified file 'UnityCore/Scope.h'
--- UnityCore/Scope.h	2013-09-26 14:21:18 +0000
+++ UnityCore/Scope.h	2014-08-05 23:16:51 +0000
@@ -31,9 +31,8 @@
 namespace dash
 {
 
-namespace
-{
 #define G_SCOPE_ERROR g_scope_error_quark ()
+
 typedef enum
 {
   G_SCOPE_ERROR_NO_ACTIVATION_HANDLER  = (1 << 0),
@@ -41,11 +40,7 @@
 } GScopeError;
 
 GQuark
-g_scope_error_quark (void)
-{
-  return g_quark_from_static_string ("g-scope-error-quark");
-}
-}
+g_scope_error_quark (void);
 
 class Scope : public sigc::trackable, boost::noncopyable
 {

=== modified file 'dash/ScopeBar.cpp'
--- dash/ScopeBar.cpp	2014-07-09 11:18:45 +0000
+++ dash/ScopeBar.cpp	2014-08-05 23:16:51 +0000
@@ -18,7 +18,6 @@
 
 #include <glib/gstdio.h>
 #include "ScopeBar.h"
-#include <NuxCore/Logger.h>
 #include "config.h"
 #include <Nux/HLayout.h>
 #include <Nux/LayeredLayout.h>
@@ -33,7 +32,6 @@
 {
 namespace dash
 {
-DECLARE_LOGGER(logger, "unity.dash.scopebar");
 namespace
 {
 // according to Q design the inner area of the scopebar should be 40px

=== modified file 'dash/previews/ActionButton.cpp'
--- dash/previews/ActionButton.cpp	2014-07-09 11:17:35 +0000
+++ dash/previews/ActionButton.cpp	2014-08-05 23:16:51 +0000
@@ -21,7 +21,6 @@
 
 #include "unity-shared/DashStyle.h"
 #include "ActionButton.h"
-#include <NuxCore/Logger.h>
 #include <Nux/HLayout.h>
 #include "unity-shared/IconTexture.h"
 #include "unity-shared/StaticCairoText.h"
@@ -38,7 +37,6 @@
 
 namespace dash
 {
-DECLARE_LOGGER(logger, "unity.dash.preview.action");
 
 ActionButton::ActionButton(std::string const& action_hint, std::string const& label, std::string const& icon_hint, NUX_FILE_LINE_DECL)
   : nux::AbstractButton(NUX_FILE_LINE_PARAM)

=== modified file 'dash/previews/PreviewContainer.cpp'
--- dash/previews/PreviewContainer.cpp	2014-07-10 19:30:17 +0000
+++ dash/previews/PreviewContainer.cpp	2014-08-05 23:16:51 +0000
@@ -21,7 +21,6 @@
  */
 
 #include "PreviewContainer.h"
-#include <NuxCore/Logger.h>
 #include <Nux/HLayout.h>
 
 #include "unity-shared/IntrospectableWrappers.h"
@@ -39,7 +38,6 @@
 {
 namespace previews
 {
-DECLARE_LOGGER(logger, "unity.dash.preview.container");
 
 Navigation operator&(const Navigation lhs, const Navigation rhs)
 {

=== modified file 'dash/previews/PreviewInfoHintWidget.cpp'
--- dash/previews/PreviewInfoHintWidget.cpp	2014-07-05 16:25:03 +0000
+++ dash/previews/PreviewInfoHintWidget.cpp	2014-08-05 23:16:51 +0000
@@ -26,7 +26,6 @@
 
 #include "PreviewInfoHintWidget.h"
 #include "unity-shared/IntrospectableWrappers.h"
-#include <NuxCore/Logger.h>
 #include <Nux/HLayout.h>
 #include <Nux/VLayout.h>
 #include <unity-shared/StaticCairoText.h>
@@ -39,7 +38,6 @@
 {
 namespace previews
 {
-DECLARE_LOGGER(logger, "unity.dash.preview.infohintwidget");
 namespace
 {
 const RawPixel LAYOUT_SPACING = 12_em;

=== modified file 'dash/previews/PreviewNavigator.cpp'
--- dash/previews/PreviewNavigator.cpp	2014-07-05 17:44:50 +0000
+++ dash/previews/PreviewNavigator.cpp	2014-08-05 23:16:51 +0000
@@ -22,7 +22,6 @@
 
 
 #include "PreviewNavigator.h"
-#include <NuxCore/Logger.h>
 #include <Nux/HLayout.h>
 #include <Nux/VLayout.h>
 #include <unity-shared/IconTexture.h>
@@ -34,7 +33,6 @@
 {
 namespace previews
 {
-DECLARE_LOGGER(logger, "unity.dash.preview.navigator");
 
 NUX_IMPLEMENT_OBJECT_TYPE(PreviewNavigator);
 

=== modified file 'dash/previews/SocialPreviewComments.cpp'
--- dash/previews/SocialPreviewComments.cpp	2014-07-05 16:17:08 +0000
+++ dash/previews/SocialPreviewComments.cpp	2014-08-05 23:16:51 +0000
@@ -23,7 +23,6 @@
 #include "unity-shared/DashStyle.h"
 #include "unity-shared/PreviewStyle.h"
 #include <UnityCore/SocialPreview.h>
-#include <NuxCore/Logger.h>
 #include <Nux/Layout.h>
 #include <Nux/VLayout.h>
 #include <Nux/HLayout.h>
@@ -36,7 +35,6 @@
 {
 namespace previews
 {
-DECLARE_LOGGER(logger, "unity.dash.preview.social.comments");
 
 namespace
 {

=== modified file 'dash/previews/SocialPreviewContent.cpp'
--- dash/previews/SocialPreviewContent.cpp	2014-07-05 16:14:33 +0000
+++ dash/previews/SocialPreviewContent.cpp	2014-08-05 23:16:51 +0000
@@ -23,7 +23,6 @@
 
 #include "unity-shared/DashStyle.h"
 #include "unity-shared/PreviewStyle.h"
-#include <NuxCore/Logger.h>
 #include <Nux/Layout.h>
 
 #include "SocialPreviewContent.h"
@@ -34,7 +33,6 @@
 {
 namespace previews
 {
-DECLARE_LOGGER(logger, "unity.dash.previews.social.content");
 
 namespace
 {

=== modified file 'dash/previews/Track.cpp'
--- dash/previews/Track.cpp	2014-07-07 22:16:43 +0000
+++ dash/previews/Track.cpp	2014-08-05 23:16:51 +0000
@@ -22,7 +22,6 @@
 
 #include "Track.h"
 #include "unity-shared/IntrospectableWrappers.h"
-#include <NuxCore/Logger.h>
 #include <Nux/HLayout.h>
 #include <Nux/LayeredLayout.h>
 #include <unity-shared/StaticCairoText.h>
@@ -37,7 +36,6 @@
 namespace previews
 {
 
-DECLARE_LOGGER(logger, "unity.dash.preview.music.track");
 namespace
 {
 const RawPixel LAYOUT_SPACING = 6_em;

=== modified file 'decorations/DecoratedWindow.cpp'
--- decorations/DecoratedWindow.cpp	2014-04-02 12:26:14 +0000
+++ decorations/DecoratedWindow.cpp	2014-08-05 23:16:51 +0000
@@ -17,7 +17,6 @@
  * Authored by: Marco Trevisan <[e-mail]>
  */
 
-#include <NuxCore/Logger.h>
 #include "DecorationsPriv.h"
 #include "DecorationsForceQuitDialog.h"
 #include "DecorationsEdgeBorders.h"
@@ -35,7 +34,6 @@
 {
 namespace
 {
-DECLARE_LOGGER(logger, "unity.decoration.window");
 const std::string MENUS_PANEL_NAME = "WindowLIM";
 }
 

=== modified file 'decorations/DecorationsInputMixer.cpp'
--- decorations/DecorationsInputMixer.cpp	2014-02-14 18:42:38 +0000
+++ decorations/DecorationsInputMixer.cpp	2014-08-05 23:16:51 +0000
@@ -17,17 +17,12 @@
  * Authored by: Marco Trevisan <[e-mail]>
  */
 
-#include <NuxCore/Logger.h>
 #include "DecorationsInputMixer.h"
 
 namespace unity
 {
 namespace decoration
 {
-namespace
-{
-DECLARE_LOGGER(logger, "unity.decorations.inputmixer");
-}
 
 InputMixer::InputMixer()
   : mouse_down_(false)

=== modified file 'decorations/DecorationsManager.cpp'
--- decorations/DecorationsManager.cpp	2014-04-02 09:04:37 +0000
+++ decorations/DecorationsManager.cpp	2014-08-05 23:16:51 +0000
@@ -20,7 +20,6 @@
 #include "DecorationsPriv.h"
 
 #include <core/atoms.h>
-#include <NuxCore/Logger.h>
 #include <NuxGraphics/CairoGraphics.h>
 #include <UnityCore/DBusIndicators.h>
 #include <X11/Xatom.h>
@@ -34,8 +33,6 @@
 
 namespace
 {
-DECLARE_LOGGER(logger, "unity.decoration.manager");
-
 namespace atom
 {
 Atom _NET_REQUEST_FRAME_EXTENTS = 0;

=== modified file 'hud/HudButton.cpp'
--- hud/HudButton.cpp	2014-07-11 02:06:59 +0000
+++ hud/HudButton.cpp	2014-08-05 23:16:51 +0000
@@ -27,7 +27,6 @@
 
 #include <Nux/Nux.h>
 #include <Nux/HLayout.h>
-#include <NuxCore/Logger.h>
 #include <NuxGraphics/CairoGraphics.h>
 #include <NuxGraphics/NuxGraphics.h>
 #include <UnityCore/GLibWrapper.h>
@@ -45,7 +44,6 @@
 
 namespace
 {
-DECLARE_LOGGER(logger, "unity.hud.button");
 const RawPixel HLAYOUT_LEFT_PADDING = 46_em;
 const RawPixel HEIGHT = 42_em;
 const char* const button_font = "Ubuntu 13"; // 17px = 13

=== modified file 'launcher/LauncherHideMachine.cpp'
--- launcher/LauncherHideMachine.cpp	2013-11-14 03:00:29 +0000
+++ launcher/LauncherHideMachine.cpp	2014-08-05 23:16:51 +0000
@@ -19,14 +19,10 @@
 
 #include "LauncherHideMachine.h"
 
-#include <NuxCore/Logger.h>
-
 namespace unity
 {
 namespace launcher
 {
-DECLARE_LOGGER(logger, "unity.launcher.hide");
-
 namespace
 {
 const unsigned int HIDE_DELAY_TIMEOUT_LENGTH = 400;

=== modified file 'launcher/SimpleLauncherIcon.cpp'
--- launcher/SimpleLauncherIcon.cpp	2013-11-14 00:17:19 +0000
+++ launcher/SimpleLauncherIcon.cpp	2014-08-05 23:16:51 +0000
@@ -22,8 +22,6 @@
 
 #include "SimpleLauncherIcon.h"
 
-#include <NuxCore/Logger.h>
-
 #include "unity-shared/UBusWrapper.h"
 #include "unity-shared/UBusMessages.h"
 
@@ -31,8 +29,6 @@
 {
 namespace launcher
 {
-DECLARE_LOGGER(logger, "unity.launcher.icon");
-
 NUX_IMPLEMENT_OBJECT_TYPE(SimpleLauncherIcon);
 
 SimpleLauncherIcon::SimpleLauncherIcon(IconType type)

=== modified file 'launcher/VolumeLauncherIcon.cpp'
--- launcher/VolumeLauncherIcon.cpp	2014-04-16 01:24:47 +0000
+++ launcher/VolumeLauncherIcon.cpp	2014-08-05 23:16:51 +0000
@@ -21,7 +21,6 @@
 
 #include "config.h"
 #include <glib/gi18n-lib.h>
-#include <NuxCore/Logger.h>
 #include <UnityCore/ConnectionManager.h>
 #include <UnityCore/GLibSignal.h>
 
@@ -32,7 +31,6 @@
 {
 namespace launcher
 {
-DECLARE_LOGGER(logger, "unity.launcher.icon.volume");
 
 //
 // Start private implementation

=== modified file 'panel/PanelController.cpp'
--- panel/PanelController.cpp	2014-02-28 16:56:19 +0000
+++ panel/PanelController.cpp	2014-08-05 23:16:51 +0000
@@ -21,7 +21,6 @@
 #include "PanelController.h"
 
 #include <vector>
-#include <NuxCore/Logger.h>
 #include <Nux/BaseWindow.h>
 
 #include "unity-shared/UScreen.h"
@@ -31,7 +30,6 @@
 {
 namespace panel
 {
-DECLARE_LOGGER(logger, "unity.panel.controller");
 
 const char* window_title = "unity-panel";
 

=== modified file 'panel/PanelView.cpp'
--- panel/PanelView.cpp	2014-03-06 16:26:34 +0000
+++ panel/PanelView.cpp	2014-08-05 23:16:51 +0000
@@ -21,7 +21,6 @@
 #include <Nux/Nux.h>
 #include <Nux/HLayout.h>
 
-#include <NuxCore/Logger.h>
 #include <UnityCore/GLibWrapper.h>
 
 #include "unity-shared/PanelStyle.h"
@@ -34,8 +33,6 @@
 
 #include "PanelView.h"
 
-DECLARE_LOGGER(logger, "unity.panel.view");
-
 namespace
 {
 const int refine_gradient_midpoint = 959;

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2014-07-10 21:19:18 +0000
+++ plugins/unityshell/src/unityshell.cpp	2014-08-05 23:16:51 +0000
@@ -109,8 +109,11 @@
                          GLogLevelFlags log_level,
                          const gchar* message,
                          gpointer user_data);
+
+#ifndef USE_GLES
 gboolean is_extension_supported(const gchar* extensions, const gchar* extension);
 gfloat get_opengl_version_f32(const gchar* version_string);
+#endif
 
 inline CompRegion CompRegionFromNuxGeo(nux::Geometry const& geo)
 {
@@ -2509,6 +2512,16 @@
   }
   else
   {
+    // Handles closing KeyNav (Alt+F1) if the hud is about to show
+    if (launcher_controller_->KeyNavIsActive())
+      launcher_controller_->KeyNavTerminate(false);
+
+    if (dash_controller_->IsVisible())
+      dash_controller_->HideDash();
+
+    if (QuicklistManager::Default()->Current())
+      QuicklistManager::Default()->Current()->Hide();
+
     auto& wm = WindowManager::Default();
 
     if (wm.IsTopWindowFullscreenOnMonitorWithMouse())
@@ -2527,16 +2540,6 @@
       return false;
     }
 
-    // Handles closing KeyNav (Alt+F1) if the hud is about to show
-    if (launcher_controller_->KeyNavIsActive())
-      launcher_controller_->KeyNavTerminate(false);
-
-    if (dash_controller_->IsVisible())
-      dash_controller_->HideDash();
-
-    if (QuicklistManager::Default()->Current())
-      QuicklistManager::Default()->Current()->Hide();
-
     hud_ungrab_slot_->disconnect();
     hud_controller_->ShowHud();
   }
@@ -4597,6 +4600,8 @@
 
 /* Checks whether an extension is supported by the GLX or OpenGL implementation
  * given the extension name and the list of supported extensions. */
+
+#ifndef USE_GLES
 gboolean is_extension_supported(const gchar* extensions, const gchar* extension)
 {
   if (extensions != NULL && extension != NULL)
@@ -4635,6 +4640,7 @@
   else
     return 0.0f;
 }
+#endif
 
 nux::logging::Level glog_level_to_nux(GLogLevelFlags log_level)
 {

=== modified file 'tests/test_glib_object.cpp'
--- tests/test_glib_object.cpp	2013-07-11 13:51:21 +0000
+++ tests/test_glib_object.cpp	2014-08-05 23:16:51 +0000
@@ -44,11 +44,6 @@
   return IsGOBject(g_obj.RawPtr());
 }
 
-bool IsNotGOBject(TestGObject* t_obj)
-{
-  return !IsGOBject(t_obj);
-}
-
 bool IsNotGOBject(TestObjectWrapper const& g_obj)
 {
   return !IsGOBject(g_obj);

=== modified file 'tests/test_icon_loader.cpp'
--- tests/test_icon_loader.cpp	2013-10-29 22:33:02 +0000
+++ tests/test_icon_loader.cpp	2014-08-05 23:16:51 +0000
@@ -35,15 +35,6 @@
   return GDK_IS_PIXBUF (pixbuf);
 }
 
-gboolean TimeoutReached (gpointer data)
-{
-  bool *b = static_cast<bool*>(data);
-
-  *b = true;
-
-  return FALSE;
-}
-
 struct LoadResult
 {
   glib::Object<GdkPixbuf> pixbuf;

=== modified file 'tests/test_result_renderer.cpp'
--- tests/test_result_renderer.cpp	2014-03-21 04:40:12 +0000
+++ tests/test_result_renderer.cpp	2014-08-05 23:16:51 +0000
@@ -41,29 +41,6 @@
 
 #define DEFAULT_GICON ". GThemedIcon cmake"
 
-GdkPixbuf* GetIconData(std::string icon_hint, int size)
-{
-  GdkPixbuf *pbuf;
-  GtkIconTheme *theme;
-  glib::Error error;
-
-  theme = gtk_icon_theme_get_default();
-  glib::Object<GIcon> icon(g_icon_new_for_string(icon_hint.c_str(), NULL));
-
-  if (icon.IsType(G_TYPE_ICON))
-  {
-    gtk::IconInfo info(gtk_icon_theme_lookup_by_gicon(theme, icon, size, (GtkIconLookupFlags)0));
-    pbuf = gtk_icon_info_load_icon(info, &error);
-
-    if (error)
-    {
-      pbuf = NULL;
-    }
-  }
-
-  return pbuf;
-}
-
 } // namespace [anonymous]
 
 class TestResultRenderer : public testing::Test

=== modified file 'unity-shared/OverlayWindowButtons.cpp'
--- unity-shared/OverlayWindowButtons.cpp	2014-02-26 20:26:01 +0000
+++ unity-shared/OverlayWindowButtons.cpp	2014-08-05 23:16:51 +0000
@@ -45,7 +45,7 @@
   SetBackgroundColor(nux::color::Transparent);
 }
 
-bool OverlayWindowButtons::IsVisibleOnMonitor(unsigned int monitor) const
+bool OverlayWindowButtons::IsVisibleOnMonitor(int monitor) const
 {
   if (window_buttons_->monitor == monitor)
     return true;

=== modified file 'unity-shared/OverlayWindowButtons.h'
--- unity-shared/OverlayWindowButtons.h	2014-02-10 15:31:44 +0000
+++ unity-shared/OverlayWindowButtons.h	2014-08-05 23:16:51 +0000
@@ -40,7 +40,7 @@
   nux::Area* FindAreaUnderMouse(nux::Point const& mouse_position,
                                 nux::NuxEventType event_type);
 
-  bool IsVisibleOnMonitor(unsigned int monitor) const;
+  bool IsVisibleOnMonitor(int monitor) const;
 
 protected:
   void Draw(nux::GraphicsEngine& gfx_context, bool force_draw);

=== modified file 'unity-shared/StandaloneAppManager.cpp'
--- unity-shared/StandaloneAppManager.cpp	2013-08-07 16:44:55 +0000
+++ unity-shared/StandaloneAppManager.cpp	2014-08-05 23:16:51 +0000
@@ -31,8 +31,6 @@
 using namespace std;
 using namespace unity;
 
-DECLARE_LOGGER(logger, "unity.appmanager.test");
-
 GMainLoop *loop;
 
 void dump_app(ApplicationPtr const& app, std::string const& prefix = "")

=== modified file 'unity-shared/StandaloneWindowManager.cpp'
--- unity-shared/StandaloneWindowManager.cpp	2014-04-02 21:42:12 +0000
+++ unity-shared/StandaloneWindowManager.cpp	2014-08-05 23:16:51 +0000
@@ -24,13 +24,10 @@
 #include "StandaloneWindowManager.h"
 #include "UScreen.h"
 
-#include <NuxCore/Logger.h>
-
 // Entirely stubs for now, unless we need this functionality at some point
 
 namespace unity
 {
-DECLARE_LOGGER(logger, "unity.wm");
 
 StandaloneWindow::StandaloneWindow(Window xid)
   : xid(xid)

=== modified file 'unity-shared/TextureCache.cpp'
--- unity-shared/TextureCache.cpp	2014-07-11 01:26:26 +0000
+++ unity-shared/TextureCache.cpp	2014-08-05 23:16:51 +0000
@@ -21,12 +21,10 @@
 #include "TextureCache.h"
 
 #include <sstream>
-#include <NuxCore/Logger.h>
 #include "config.h"
 
 namespace unity
 {
-DECLARE_LOGGER(logger, "unity.internal.texturecache");
 namespace
 {
 // Stolen from boost

=== modified file 'unity-shared/UBusServer.cpp'
--- unity-shared/UBusServer.cpp	2013-11-14 03:00:29 +0000
+++ unity-shared/UBusServer.cpp	2014-08-05 23:16:51 +0000
@@ -16,13 +16,12 @@
  * Authored by: Michal Hruby <[e-mail]>
  */
 
-#include <NuxCore/Logger.h>
+#include <algorithm>
 
 #include "UBusServer.h"
 
 namespace unity
 {
-DECLARE_LOGGER(logger, "unity.ubus");
 
 UBusServer::UBusServer()
   : last_id_(0)