Merge lp:~3v1n0/unity/ignore-icon-theme-indicator-for-lockscreen into lp:unity

Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Andrea Azzarone
Approved revision: no longer in the source branch.
Merged at revision: 4201
Proposed branch: lp:~3v1n0/unity/ignore-icon-theme-indicator-for-lockscreen
Merge into: lp:unity
Diff against target: 10 lines (+1/-0)
1 file modified
lockscreen/LockScreenController.cpp (+1/-0)
To merge this branch: bzr merge lp:~3v1n0/unity/ignore-icon-theme-indicator-for-lockscreen
Reviewer Review Type Date Requested Status
Andrea Azzarone (community) Approve
Review via email: mp+309997@code.launchpad.net

Commit message

LockScreenController: ignore icon_paths_changed signal in menumanager for Lockscreen

To post a comment you must log in.
Revision history for this message
Andrea Azzarone (azzar1) wrote :

+1

review: Approve
Revision history for this message
Maximilian (ma27) wrote :

may I ask, when it's planned to release this change?

Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

It's now released in zeisty, SRUing to yakkety is planned.

2016-11-07 17:08 GMT+01:00 Maximilian <email address hidden>:
> may I ask, when it's planned to release this change?
> --
> https://code.launchpad.net/~3v1n0/unity/ignore-icon-theme-indicator-for-lockscreen/+merge/309997
> You are the owner of lp:~3v1n0/unity/ignore-icon-theme-indicator-for-lockscreen.
>
> Launchpad-Message-Rationale: Owner
> Launchpad-Message-For: 3v1n0
> Launchpad-Notification-Type: code-review
> Launchpad-Branch: ~3v1n0/unity/ignore-icon-theme-indicator-for-lockscreen
> Launchpad-Project: unity

--
Treviño's World - Life and Linux
http://www.3v1n0.net

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lockscreen/LockScreenController.cpp'
2--- lockscreen/LockScreenController.cpp 2016-09-02 13:36:37 +0000
3+++ lockscreen/LockScreenController.cpp 2016-11-04 00:52:28 +0000
4@@ -467,6 +467,7 @@
5 void Controller::LockScreen()
6 {
7 menu_manager_ = std::make_shared<menu::Manager>(std::make_shared<indicator::LockScreenDBusIndicators>(), key_grabber_);
8+ menu_manager_->Indicators()->icon_paths_changed.clear(); // Ignore custom icon themes for lockscreen, see bug #1635625
9 upstart_wrapper_->Emit("desktop-lock");
10 systemd_wrapper_->Start(SYSTEMD_LOCK_TARGET);
11