Merge lp:~aacid/unity-greeter/help-icon into lp:unity-greeter

Proposed by Albert Astals Cid
Status: Merged
Merged at revision: 566
Proposed branch: lp:~aacid/unity-greeter/help-icon
Merge into: lp:unity-greeter
Diff against target: 26 lines (+2/-1)
2 files modified
data/Makefile.am (+1/-0)
src/session-list.vala (+1/-1)
To merge this branch: bzr merge lp:~aacid/unity-greeter/help-icon
Reviewer Review Type Date Requested Status
Unity Greeter Development Team Pending
Review via email: mp+123032@code.launchpad.net

Description of the change

Help icon as provided by Matthieu James via Matthew Paul Thomas

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/Makefile.am'
2--- data/Makefile.am 2012-08-22 18:38:43 +0000
3+++ data/Makefile.am 2012-09-06 08:58:19 +0000
4@@ -14,6 +14,7 @@
5 kde_badge.png \
6 recovery_console_badge.png \
7 ubuntu_badge.png \
8+ remote_login_help.png \
9 unknown_badge.png
10
11 @GSETTINGS_RULES@
12
13=== added file 'data/remote_login_help.png'
14Binary files data/remote_login_help.png 1970-01-01 00:00:00 +0000 and data/remote_login_help.png 2012-09-06 08:58:19 +0000 differ
15=== modified file 'src/session-list.vala'
16--- src/session-list.vala 2012-08-27 23:02:51 +0000
17+++ src/session-list.vala 2012-09-06 08:58:19 +0000
18@@ -196,7 +196,7 @@
19 case "xterm":
20 return "recovery_console_badge.png";
21 case "remote-login":
22- return "unknown_badge.png"; //"remote_login_help.png";
23+ return "remote_login_help.png";
24 default:
25 return null;
26 }

Subscribers

People subscribed via source and target branches