Unity

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

  1. lp.1353167-fix
  2. Merge into trunk
Proposed by Brandon Schaefer
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: no longer in the source branch.
Merged at revision: 3853
Proposed branch: lp:~brandontschaefer/unity/lp.1353167-fix
Merge into: lp:unity
Diff against target: 706 lines (+27/-121)
34 files modified
UnityCore/CheckOptionFilter.cpp (+0/-3)
UnityCore/Filter.cpp (+0/-3)
UnityCore/MultiRangeFilter.cpp (+0/-3)
UnityCore/MusicPreview.cpp (+0/-1)
UnityCore/RadioOptionFilter.cpp (+0/-3)
UnityCore/Scope.cpp (+6/-0)
UnityCore/Scope.h (+2/-7)
dash/ScopeBar.cpp (+0/-2)
dash/previews/ActionButton.cpp (+0/-2)
dash/previews/PreviewContainer.cpp (+0/-2)
dash/previews/PreviewInfoHintWidget.cpp (+0/-2)
dash/previews/PreviewNavigator.cpp (+0/-2)
dash/previews/SocialPreviewComments.cpp (+0/-2)
dash/previews/SocialPreviewContent.cpp (+0/-2)
dash/previews/Track.cpp (+0/-2)
decorations/DecoratedWindow.cpp (+0/-2)
decorations/DecorationsInputMixer.cpp (+0/-5)
decorations/DecorationsManager.cpp (+0/-3)
hud/HudButton.cpp (+0/-2)
launcher/LauncherHideMachine.cpp (+0/-4)
launcher/SimpleLauncherIcon.cpp (+0/-4)
launcher/VolumeLauncherIcon.cpp (+0/-2)
panel/PanelController.cpp (+0/-2)
panel/PanelView.cpp (+0/-3)
plugins/unityshell/src/unityshell.cpp (+16/-10)
tests/test_glib_object.cpp (+0/-5)
tests/test_icon_loader.cpp (+0/-9)
tests/test_result_renderer.cpp (+0/-23)
unity-shared/OverlayWindowButtons.cpp (+1/-1)
unity-shared/OverlayWindowButtons.h (+1/-1)
unity-shared/StandaloneAppManager.cpp (+0/-2)
unity-shared/StandaloneWindowManager.cpp (+0/-3)
unity-shared/TextureCache.cpp (+0/-2)
unity-shared/UBusServer.cpp (+1/-2)
To merge this branch: bzr merge lp:~brandontschaefer/unity/lp.1353167-fix
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Marco Trevisan (Treviño) Approve
Review via email: mp+229708@code.launchpad.net

Commit message

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.

Description of the change

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.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

+1

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1919
20#include "CheckOptionFilter.h"20#include "CheckOptionFilter.h"
2121
22#include <NuxCore/Logger.h>
23
24namespace unity22namespace unity
25{23{
26namespace dash24namespace dash
27{25{
28DECLARE_LOGGER(logger, "unity.dash.filter.checkoption");
2926
30CheckOptionFilter::CheckOptionFilter(DeeModel* model, DeeModelIter* iter)27CheckOptionFilter::CheckOptionFilter(DeeModel* model, DeeModelIter* iter)
31: Filter(model, iter)28: Filter(model, iter)
3229
=== 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 @@
20#include "Filter.h"20#include "Filter.h"
21#include "Filters.h"21#include "Filters.h"
2222
23#include <NuxCore/Logger.h>
24
25#include "CheckOptionFilter.h"23#include "CheckOptionFilter.h"
26#include "MultiRangeFilter.h"24#include "MultiRangeFilter.h"
27#include "RadioOptionFilter.h"25#include "RadioOptionFilter.h"
@@ -32,7 +30,6 @@
32{30{
33namespace dash31namespace dash
34{32{
35DECLARE_LOGGER(logger, "unity.dash.filter");
3633
37using unity::glib::Signal;34using unity::glib::Signal;
3835
3936
=== 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 @@
1919
20#include "MultiRangeFilter.h"20#include "MultiRangeFilter.h"
2121
22#include <NuxCore/Logger.h>
23
24namespace unity22namespace unity
25{23{
26namespace dash24namespace dash
27{25{
28DECLARE_LOGGER(logger, "unity.dash.filter.multirange");
2926
30MultiRangeFilter::MultiRangeFilter(DeeModel* model, DeeModelIter* iter)27MultiRangeFilter::MultiRangeFilter(DeeModel* model, DeeModelIter* iter)
31: Filter(model, iter)28: Filter(model, iter)
3229
=== 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 @@
29{29{
30namespace dash30namespace dash
31{31{
32DECLARE_LOGGER(logger, "unity.dash.musicpreview");
3332
34class MusicPreview::Impl33class MusicPreview::Impl
35{34{
3635
=== 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 @@
1919
20#include "RadioOptionFilter.h"20#include "RadioOptionFilter.h"
2121
22#include <NuxCore/Logger.h>
23
24namespace unity22namespace unity
25{23{
26namespace dash24namespace dash
27{25{
28DECLARE_LOGGER(logger, "unity.dash.filter.radiooption");
2926
30RadioOptionFilter::RadioOptionFilter(DeeModel* model, DeeModelIter* iter)27RadioOptionFilter::RadioOptionFilter(DeeModel* model, DeeModelIter* iter)
31: Filter(model, iter)28: Filter(model, iter)
3229
=== 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 @@
32{32{
33DECLARE_LOGGER(logger, "unity.dash.scope");33DECLARE_LOGGER(logger, "unity.dash.scope");
3434
35GQuark
36g_scope_error_quark (void)
37{
38 return g_quark_from_static_string ("g-scope-error-quark");
39}
40
35class Scope::Impl41class Scope::Impl
36{42{
37public:43public:
3844
=== 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 @@
31namespace dash31namespace dash
32{32{
3333
34namespace
35{
36#define G_SCOPE_ERROR g_scope_error_quark ()34#define G_SCOPE_ERROR g_scope_error_quark ()
35
37typedef enum36typedef enum
38{37{
39 G_SCOPE_ERROR_NO_ACTIVATION_HANDLER = (1 << 0),38 G_SCOPE_ERROR_NO_ACTIVATION_HANDLER = (1 << 0),
@@ -41,11 +40,7 @@
41} GScopeError;40} GScopeError;
4241
43GQuark42GQuark
44g_scope_error_quark (void)43g_scope_error_quark (void);
45{
46 return g_quark_from_static_string ("g-scope-error-quark");
47}
48}
4944
50class Scope : public sigc::trackable, boost::noncopyable45class Scope : public sigc::trackable, boost::noncopyable
51{46{
5247
=== 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 @@
1818
19#include <glib/gstdio.h>19#include <glib/gstdio.h>
20#include "ScopeBar.h"20#include "ScopeBar.h"
21#include <NuxCore/Logger.h>
22#include "config.h"21#include "config.h"
23#include <Nux/HLayout.h>22#include <Nux/HLayout.h>
24#include <Nux/LayeredLayout.h>23#include <Nux/LayeredLayout.h>
@@ -33,7 +32,6 @@
33{32{
34namespace dash33namespace dash
35{34{
36DECLARE_LOGGER(logger, "unity.dash.scopebar");
37namespace35namespace
38{36{
39// according to Q design the inner area of the scopebar should be 40px37// according to Q design the inner area of the scopebar should be 40px
4038
=== 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 @@
2121
22#include "unity-shared/DashStyle.h"22#include "unity-shared/DashStyle.h"
23#include "ActionButton.h"23#include "ActionButton.h"
24#include <NuxCore/Logger.h>
25#include <Nux/HLayout.h>24#include <Nux/HLayout.h>
26#include "unity-shared/IconTexture.h"25#include "unity-shared/IconTexture.h"
27#include "unity-shared/StaticCairoText.h"26#include "unity-shared/StaticCairoText.h"
@@ -38,7 +37,6 @@
3837
39namespace dash38namespace dash
40{39{
41DECLARE_LOGGER(logger, "unity.dash.preview.action");
4240
43ActionButton::ActionButton(std::string const& action_hint, std::string const& label, std::string const& icon_hint, NUX_FILE_LINE_DECL)41ActionButton::ActionButton(std::string const& action_hint, std::string const& label, std::string const& icon_hint, NUX_FILE_LINE_DECL)
44 : nux::AbstractButton(NUX_FILE_LINE_PARAM)42 : nux::AbstractButton(NUX_FILE_LINE_PARAM)
4543
=== 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 @@
21 */21 */
2222
23#include "PreviewContainer.h"23#include "PreviewContainer.h"
24#include <NuxCore/Logger.h>
25#include <Nux/HLayout.h>24#include <Nux/HLayout.h>
2625
27#include "unity-shared/IntrospectableWrappers.h"26#include "unity-shared/IntrospectableWrappers.h"
@@ -39,7 +38,6 @@
39{38{
40namespace previews39namespace previews
41{40{
42DECLARE_LOGGER(logger, "unity.dash.preview.container");
4341
44Navigation operator&(const Navigation lhs, const Navigation rhs)42Navigation operator&(const Navigation lhs, const Navigation rhs)
45{43{
4644
=== 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 @@
2626
27#include "PreviewInfoHintWidget.h"27#include "PreviewInfoHintWidget.h"
28#include "unity-shared/IntrospectableWrappers.h"28#include "unity-shared/IntrospectableWrappers.h"
29#include <NuxCore/Logger.h>
30#include <Nux/HLayout.h>29#include <Nux/HLayout.h>
31#include <Nux/VLayout.h>30#include <Nux/VLayout.h>
32#include <unity-shared/StaticCairoText.h>31#include <unity-shared/StaticCairoText.h>
@@ -39,7 +38,6 @@
39{38{
40namespace previews39namespace previews
41{40{
42DECLARE_LOGGER(logger, "unity.dash.preview.infohintwidget");
43namespace41namespace
44{42{
45const RawPixel LAYOUT_SPACING = 12_em;43const RawPixel LAYOUT_SPACING = 12_em;
4644
=== 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 @@
2222
2323
24#include "PreviewNavigator.h"24#include "PreviewNavigator.h"
25#include <NuxCore/Logger.h>
26#include <Nux/HLayout.h>25#include <Nux/HLayout.h>
27#include <Nux/VLayout.h>26#include <Nux/VLayout.h>
28#include <unity-shared/IconTexture.h>27#include <unity-shared/IconTexture.h>
@@ -34,7 +33,6 @@
34{33{
35namespace previews34namespace previews
36{35{
37DECLARE_LOGGER(logger, "unity.dash.preview.navigator");
3836
39NUX_IMPLEMENT_OBJECT_TYPE(PreviewNavigator);37NUX_IMPLEMENT_OBJECT_TYPE(PreviewNavigator);
4038
4139
=== 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 @@
23#include "unity-shared/DashStyle.h"23#include "unity-shared/DashStyle.h"
24#include "unity-shared/PreviewStyle.h"24#include "unity-shared/PreviewStyle.h"
25#include <UnityCore/SocialPreview.h>25#include <UnityCore/SocialPreview.h>
26#include <NuxCore/Logger.h>
27#include <Nux/Layout.h>26#include <Nux/Layout.h>
28#include <Nux/VLayout.h>27#include <Nux/VLayout.h>
29#include <Nux/HLayout.h>28#include <Nux/HLayout.h>
@@ -36,7 +35,6 @@
36{35{
37namespace previews36namespace previews
38{37{
39DECLARE_LOGGER(logger, "unity.dash.preview.social.comments");
4038
41namespace39namespace
42{40{
4341
=== 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 @@
2323
24#include "unity-shared/DashStyle.h"24#include "unity-shared/DashStyle.h"
25#include "unity-shared/PreviewStyle.h"25#include "unity-shared/PreviewStyle.h"
26#include <NuxCore/Logger.h>
27#include <Nux/Layout.h>26#include <Nux/Layout.h>
2827
29#include "SocialPreviewContent.h"28#include "SocialPreviewContent.h"
@@ -34,7 +33,6 @@
34{33{
35namespace previews34namespace previews
36{35{
37DECLARE_LOGGER(logger, "unity.dash.previews.social.content");
3836
39namespace37namespace
40{38{
4139
=== 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 @@
2222
23#include "Track.h"23#include "Track.h"
24#include "unity-shared/IntrospectableWrappers.h"24#include "unity-shared/IntrospectableWrappers.h"
25#include <NuxCore/Logger.h>
26#include <Nux/HLayout.h>25#include <Nux/HLayout.h>
27#include <Nux/LayeredLayout.h>26#include <Nux/LayeredLayout.h>
28#include <unity-shared/StaticCairoText.h>27#include <unity-shared/StaticCairoText.h>
@@ -37,7 +36,6 @@
37namespace previews36namespace previews
38{37{
3938
40DECLARE_LOGGER(logger, "unity.dash.preview.music.track");
41namespace39namespace
42{40{
43const RawPixel LAYOUT_SPACING = 6_em;41const RawPixel LAYOUT_SPACING = 6_em;
4442
=== 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 @@
17 * Authored by: Marco Trevisan <marco.trevisan@canonical.com>17 * Authored by: Marco Trevisan <marco.trevisan@canonical.com>
18 */18 */
1919
20#include <NuxCore/Logger.h>
21#include "DecorationsPriv.h"20#include "DecorationsPriv.h"
22#include "DecorationsForceQuitDialog.h"21#include "DecorationsForceQuitDialog.h"
23#include "DecorationsEdgeBorders.h"22#include "DecorationsEdgeBorders.h"
@@ -35,7 +34,6 @@
35{34{
36namespace35namespace
37{36{
38DECLARE_LOGGER(logger, "unity.decoration.window");
39const std::string MENUS_PANEL_NAME = "WindowLIM";37const std::string MENUS_PANEL_NAME = "WindowLIM";
40}38}
4139
4240
=== 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 @@
17 * Authored by: Marco Trevisan <marco.trevisan@canonical.com>17 * Authored by: Marco Trevisan <marco.trevisan@canonical.com>
18 */18 */
1919
20#include <NuxCore/Logger.h>
21#include "DecorationsInputMixer.h"20#include "DecorationsInputMixer.h"
2221
23namespace unity22namespace unity
24{23{
25namespace decoration24namespace decoration
26{25{
27namespace
28{
29DECLARE_LOGGER(logger, "unity.decorations.inputmixer");
30}
3126
32InputMixer::InputMixer()27InputMixer::InputMixer()
33 : mouse_down_(false)28 : mouse_down_(false)
3429
=== 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 @@
20#include "DecorationsPriv.h"20#include "DecorationsPriv.h"
2121
22#include <core/atoms.h>22#include <core/atoms.h>
23#include <NuxCore/Logger.h>
24#include <NuxGraphics/CairoGraphics.h>23#include <NuxGraphics/CairoGraphics.h>
25#include <UnityCore/DBusIndicators.h>24#include <UnityCore/DBusIndicators.h>
26#include <X11/Xatom.h>25#include <X11/Xatom.h>
@@ -34,8 +33,6 @@
3433
35namespace34namespace
36{35{
37DECLARE_LOGGER(logger, "unity.decoration.manager");
38
39namespace atom36namespace atom
40{37{
41Atom _NET_REQUEST_FRAME_EXTENTS = 0;38Atom _NET_REQUEST_FRAME_EXTENTS = 0;
4239
=== 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 @@
2727
28#include <Nux/Nux.h>28#include <Nux/Nux.h>
29#include <Nux/HLayout.h>29#include <Nux/HLayout.h>
30#include <NuxCore/Logger.h>
31#include <NuxGraphics/CairoGraphics.h>30#include <NuxGraphics/CairoGraphics.h>
32#include <NuxGraphics/NuxGraphics.h>31#include <NuxGraphics/NuxGraphics.h>
33#include <UnityCore/GLibWrapper.h>32#include <UnityCore/GLibWrapper.h>
@@ -45,7 +44,6 @@
4544
46namespace45namespace
47{46{
48DECLARE_LOGGER(logger, "unity.hud.button");
49const RawPixel HLAYOUT_LEFT_PADDING = 46_em;47const RawPixel HLAYOUT_LEFT_PADDING = 46_em;
50const RawPixel HEIGHT = 42_em;48const RawPixel HEIGHT = 42_em;
51const char* const button_font = "Ubuntu 13"; // 17px = 1349const char* const button_font = "Ubuntu 13"; // 17px = 13
5250
=== 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 @@
1919
20#include "LauncherHideMachine.h"20#include "LauncherHideMachine.h"
2121
22#include <NuxCore/Logger.h>
23
24namespace unity22namespace unity
25{23{
26namespace launcher24namespace launcher
27{25{
28DECLARE_LOGGER(logger, "unity.launcher.hide");
29
30namespace26namespace
31{27{
32const unsigned int HIDE_DELAY_TIMEOUT_LENGTH = 400;28const unsigned int HIDE_DELAY_TIMEOUT_LENGTH = 400;
3329
=== 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 @@
2222
23#include "SimpleLauncherIcon.h"23#include "SimpleLauncherIcon.h"
2424
25#include <NuxCore/Logger.h>
26
27#include "unity-shared/UBusWrapper.h"25#include "unity-shared/UBusWrapper.h"
28#include "unity-shared/UBusMessages.h"26#include "unity-shared/UBusMessages.h"
2927
@@ -31,8 +29,6 @@
31{29{
32namespace launcher30namespace launcher
33{31{
34DECLARE_LOGGER(logger, "unity.launcher.icon");
35
36NUX_IMPLEMENT_OBJECT_TYPE(SimpleLauncherIcon);32NUX_IMPLEMENT_OBJECT_TYPE(SimpleLauncherIcon);
3733
38SimpleLauncherIcon::SimpleLauncherIcon(IconType type)34SimpleLauncherIcon::SimpleLauncherIcon(IconType type)
3935
=== 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 @@
2121
22#include "config.h"22#include "config.h"
23#include <glib/gi18n-lib.h>23#include <glib/gi18n-lib.h>
24#include <NuxCore/Logger.h>
25#include <UnityCore/ConnectionManager.h>24#include <UnityCore/ConnectionManager.h>
26#include <UnityCore/GLibSignal.h>25#include <UnityCore/GLibSignal.h>
2726
@@ -32,7 +31,6 @@
32{31{
33namespace launcher32namespace launcher
34{33{
35DECLARE_LOGGER(logger, "unity.launcher.icon.volume");
3634
37//35//
38// Start private implementation36// Start private implementation
3937
=== 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 @@
21#include "PanelController.h"21#include "PanelController.h"
2222
23#include <vector>23#include <vector>
24#include <NuxCore/Logger.h>
25#include <Nux/BaseWindow.h>24#include <Nux/BaseWindow.h>
2625
27#include "unity-shared/UScreen.h"26#include "unity-shared/UScreen.h"
@@ -31,7 +30,6 @@
31{30{
32namespace panel31namespace panel
33{32{
34DECLARE_LOGGER(logger, "unity.panel.controller");
3533
36const char* window_title = "unity-panel";34const char* window_title = "unity-panel";
3735
3836
=== 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 @@
21#include <Nux/Nux.h>21#include <Nux/Nux.h>
22#include <Nux/HLayout.h>22#include <Nux/HLayout.h>
2323
24#include <NuxCore/Logger.h>
25#include <UnityCore/GLibWrapper.h>24#include <UnityCore/GLibWrapper.h>
2625
27#include "unity-shared/PanelStyle.h"26#include "unity-shared/PanelStyle.h"
@@ -34,8 +33,6 @@
3433
35#include "PanelView.h"34#include "PanelView.h"
3635
37DECLARE_LOGGER(logger, "unity.panel.view");
38
39namespace36namespace
40{37{
41const int refine_gradient_midpoint = 959;38const int refine_gradient_midpoint = 959;
4239
=== 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 @@
109 GLogLevelFlags log_level,109 GLogLevelFlags log_level,
110 const gchar* message,110 const gchar* message,
111 gpointer user_data);111 gpointer user_data);
112
113#ifndef USE_GLES
112gboolean is_extension_supported(const gchar* extensions, const gchar* extension);114gboolean is_extension_supported(const gchar* extensions, const gchar* extension);
113gfloat get_opengl_version_f32(const gchar* version_string);115gfloat get_opengl_version_f32(const gchar* version_string);
116#endif
114117
115inline CompRegion CompRegionFromNuxGeo(nux::Geometry const& geo)118inline CompRegion CompRegionFromNuxGeo(nux::Geometry const& geo)
116{119{
@@ -2509,6 +2512,16 @@
2509 }2512 }
2510 else2513 else
2511 {2514 {
2515 // Handles closing KeyNav (Alt+F1) if the hud is about to show
2516 if (launcher_controller_->KeyNavIsActive())
2517 launcher_controller_->KeyNavTerminate(false);
2518
2519 if (dash_controller_->IsVisible())
2520 dash_controller_->HideDash();
2521
2522 if (QuicklistManager::Default()->Current())
2523 QuicklistManager::Default()->Current()->Hide();
2524
2512 auto& wm = WindowManager::Default();2525 auto& wm = WindowManager::Default();
25132526
2514 if (wm.IsTopWindowFullscreenOnMonitorWithMouse())2527 if (wm.IsTopWindowFullscreenOnMonitorWithMouse())
@@ -2527,16 +2540,6 @@
2527 return false;2540 return false;
2528 }2541 }
25292542
2530 // Handles closing KeyNav (Alt+F1) if the hud is about to show
2531 if (launcher_controller_->KeyNavIsActive())
2532 launcher_controller_->KeyNavTerminate(false);
2533
2534 if (dash_controller_->IsVisible())
2535 dash_controller_->HideDash();
2536
2537 if (QuicklistManager::Default()->Current())
2538 QuicklistManager::Default()->Current()->Hide();
2539
2540 hud_ungrab_slot_->disconnect();2543 hud_ungrab_slot_->disconnect();
2541 hud_controller_->ShowHud();2544 hud_controller_->ShowHud();
2542 }2545 }
@@ -4597,6 +4600,8 @@
45974600
4598/* Checks whether an extension is supported by the GLX or OpenGL implementation4601/* Checks whether an extension is supported by the GLX or OpenGL implementation
4599 * given the extension name and the list of supported extensions. */4602 * given the extension name and the list of supported extensions. */
4603
4604#ifndef USE_GLES
4600gboolean is_extension_supported(const gchar* extensions, const gchar* extension)4605gboolean is_extension_supported(const gchar* extensions, const gchar* extension)
4601{4606{
4602 if (extensions != NULL && extension != NULL)4607 if (extensions != NULL && extension != NULL)
@@ -4635,6 +4640,7 @@
4635 else4640 else
4636 return 0.0f;4641 return 0.0f;
4637}4642}
4643#endif
46384644
4639nux::logging::Level glog_level_to_nux(GLogLevelFlags log_level)4645nux::logging::Level glog_level_to_nux(GLogLevelFlags log_level)
4640{4646{
46414647
=== 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 @@
44 return IsGOBject(g_obj.RawPtr());44 return IsGOBject(g_obj.RawPtr());
45}45}
4646
47bool IsNotGOBject(TestGObject* t_obj)
48{
49 return !IsGOBject(t_obj);
50}
51
52bool IsNotGOBject(TestObjectWrapper const& g_obj)47bool IsNotGOBject(TestObjectWrapper const& g_obj)
53{48{
54 return !IsGOBject(g_obj);49 return !IsGOBject(g_obj);
5550
=== 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 @@
35 return GDK_IS_PIXBUF (pixbuf);35 return GDK_IS_PIXBUF (pixbuf);
36}36}
3737
38gboolean TimeoutReached (gpointer data)
39{
40 bool *b = static_cast<bool*>(data);
41
42 *b = true;
43
44 return FALSE;
45}
46
47struct LoadResult38struct LoadResult
48{39{
49 glib::Object<GdkPixbuf> pixbuf;40 glib::Object<GdkPixbuf> pixbuf;
5041
=== 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 @@
4141
42#define DEFAULT_GICON ". GThemedIcon cmake"42#define DEFAULT_GICON ". GThemedIcon cmake"
4343
44GdkPixbuf* GetIconData(std::string icon_hint, int size)
45{
46 GdkPixbuf *pbuf;
47 GtkIconTheme *theme;
48 glib::Error error;
49
50 theme = gtk_icon_theme_get_default();
51 glib::Object<GIcon> icon(g_icon_new_for_string(icon_hint.c_str(), NULL));
52
53 if (icon.IsType(G_TYPE_ICON))
54 {
55 gtk::IconInfo info(gtk_icon_theme_lookup_by_gicon(theme, icon, size, (GtkIconLookupFlags)0));
56 pbuf = gtk_icon_info_load_icon(info, &error);
57
58 if (error)
59 {
60 pbuf = NULL;
61 }
62 }
63
64 return pbuf;
65}
66
67} // namespace [anonymous]44} // namespace [anonymous]
6845
69class TestResultRenderer : public testing::Test46class TestResultRenderer : public testing::Test
7047
=== 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 @@
45 SetBackgroundColor(nux::color::Transparent);45 SetBackgroundColor(nux::color::Transparent);
46}46}
4747
48bool OverlayWindowButtons::IsVisibleOnMonitor(unsigned int monitor) const48bool OverlayWindowButtons::IsVisibleOnMonitor(int monitor) const
49{49{
50 if (window_buttons_->monitor == monitor)50 if (window_buttons_->monitor == monitor)
51 return true;51 return true;
5252
=== 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 @@
40 nux::Area* FindAreaUnderMouse(nux::Point const& mouse_position,40 nux::Area* FindAreaUnderMouse(nux::Point const& mouse_position,
41 nux::NuxEventType event_type);41 nux::NuxEventType event_type);
4242
43 bool IsVisibleOnMonitor(unsigned int monitor) const;43 bool IsVisibleOnMonitor(int monitor) const;
4444
45protected:45protected:
46 void Draw(nux::GraphicsEngine& gfx_context, bool force_draw);46 void Draw(nux::GraphicsEngine& gfx_context, bool force_draw);
4747
=== 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 @@
31using namespace std;31using namespace std;
32using namespace unity;32using namespace unity;
3333
34DECLARE_LOGGER(logger, "unity.appmanager.test");
35
36GMainLoop *loop;34GMainLoop *loop;
3735
38void dump_app(ApplicationPtr const& app, std::string const& prefix = "")36void dump_app(ApplicationPtr const& app, std::string const& prefix = "")
3937
=== 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 @@
24#include "StandaloneWindowManager.h"24#include "StandaloneWindowManager.h"
25#include "UScreen.h"25#include "UScreen.h"
2626
27#include <NuxCore/Logger.h>
28
29// Entirely stubs for now, unless we need this functionality at some point27// Entirely stubs for now, unless we need this functionality at some point
3028
31namespace unity29namespace unity
32{30{
33DECLARE_LOGGER(logger, "unity.wm");
3431
35StandaloneWindow::StandaloneWindow(Window xid)32StandaloneWindow::StandaloneWindow(Window xid)
36 : xid(xid)33 : xid(xid)
3734
=== 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 @@
21#include "TextureCache.h"21#include "TextureCache.h"
2222
23#include <sstream>23#include <sstream>
24#include <NuxCore/Logger.h>
25#include "config.h"24#include "config.h"
2625
27namespace unity26namespace unity
28{27{
29DECLARE_LOGGER(logger, "unity.internal.texturecache");
30namespace28namespace
31{29{
32// Stolen from boost30// Stolen from boost
3331
=== 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 @@
16 * Authored by: Michal Hruby <michal.hruby@canonical.com>16 * Authored by: Michal Hruby <michal.hruby@canonical.com>
17 */17 */
1818
19#include <NuxCore/Logger.h>19#include <algorithm>
2020
21#include "UBusServer.h"21#include "UBusServer.h"
2222
23namespace unity23namespace unity
24{24{
25DECLARE_LOGGER(logger, "unity.ubus");
2625
27UBusServer::UBusServer()26UBusServer::UBusServer()
28 : last_id_(0)27 : last_id_(0)