Merge lp:~cairo-dock-team/unity-greeter/cairo-dock-badge into lp:unity-greeter

Proposed by Matthieu Baerts on 2012-04-01
Status: Rejected
Rejected by: Michael Terry on 2012-08-16
Proposed branch: lp:~cairo-dock-team/unity-greeter/cairo-dock-badge
Merge into: lp:unity-greeter
Diff against target: 28 lines (+5/-0)
2 files modified
data/Makefile.am (+1/-0)
src/session-chooser.vala (+4/-0)
To merge this branch: bzr merge lp:~cairo-dock-team/unity-greeter/cairo-dock-badge
Reviewer Review Type Date Requested Status
Michael Terry (community) 2012-04-30 Disapprove on 2012-04-30
Unity Greeter Development Team 2012-04-01 Pending
Review via email: mp+100339@code.launchpad.net

Description of the change

Hello,

Is it possible to add a badge for Cairo-Dock sessions?
I know that Cairo-Dock project is not supported by Canonical but it's not an important change :)

Currently, Cairo-Dock sessions have the unknown badge. With this modification these sessions now have this badge: http://uppix.net/7/2/d/7b7a0a06b3103a860d6dee1ce7bc8.png

To post a comment you must log in.
Robert Ancell (robert-ancell) wrote :

Michael, can you review this? I can't remember the process you had for session badges.

Michael Terry (mterry) wrote :

I think it would make more sense for Cairo-Dock to provide these itself. That way they aren't installed when users don't have Cairo-Dock, and Cairo-Dock's developers can control the branding easier, etc.

To see how to provide a custom badge without patching Unity Greeter, see this email:
https://lists.ubuntu.com/archives/ubuntu-devel/2012-February/034800.html

Basically, the idea is to provide:

/usr/share/unity-greeter/custom_cairo-dock_badge.png
/usr/share/unity-greeter/custom_cairo-dock-fallback_badge.png
/usr/share/unity-greeter/custom_cairo-dock-unity_badge.png

(obviously you'd want symlinks there to reduce duplication, but I think that happens automatically?)

review: Disapprove

Unmerged revisions

376. By Matthieu Baerts on 2012-04-01

Add a badge for Cairo-Dock sessions

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-02-21 17:31:59 +0000
3+++ data/Makefile.am 2012-04-01 15:34:23 +0000
4@@ -7,6 +7,7 @@
5 a11y.svg \
6 arrow_left.png \
7 arrow_right.png \
8+ cairodock_badge.png \
9 cof.png \
10 logo.png \
11 message.png \
12
13=== added file 'data/cairodock_badge.png'
14Binary files data/cairodock_badge.png 1970-01-01 00:00:00 +0000 and data/cairodock_badge.png 2012-04-01 15:34:23 +0000 differ
15=== modified file 'src/session-chooser.vala'
16--- src/session-chooser.vala 2012-03-13 14:00:28 +0000
17+++ src/session-chooser.vala 2012-04-01 15:34:23 +0000
18@@ -122,6 +122,10 @@
19 return "gnome_badge.png";
20 case "kde":
21 return "kde_badge.png";
22+ case "cairo-dock":
23+ case "cairo-dock-fallback":
24+ case "cairo-dock-unity":
25+ return "cairodock_badge.png";
26 case "xterm":
27 return "recovery_console_badge.png";
28 default:

Subscribers

People subscribed via source and target branches