Ubuntu
empathy package

Merge lp://staging/~tcfox54-gmail/ubuntu/precise/empathy/add_quicklist into lp://staging/ubuntu/precise/empathy

Precise (12.04)
add_quicklist
Merge into precise

Proposed by Trenton Fox on 2012-03-11

Status:	Merged
Merge reported by:	Michael Terry
Merged at revision:	not available
Proposed branch:	lp://staging/~tcfox54-gmail/ubuntu/precise/empathy/add_quicklist
Merge into:	lp://staging/ubuntu/precise/empathy
Diff against target:	12 lines (+5/-0) 1 file modified data/empathy.desktop.in (+5/-0)
To merge this branch:	bzr merge lp://staging/~tcfox54-gmail/ubuntu/precise/empathy/add_quicklist
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
Michael Terry		Approve on 2012-03-15
Ubuntu branches	2012-03-11	Pending
Michael Hall	2012-03-11	Pending
Review via email: mp+96945@code.staging.launchpad.net

This proposal supersedes a proposal from 2012-02-22.

Description of the change

Adds a Unity Quicklist shortcut to Empathy's launcher for opening the application hidden.
Fixed the quicklist to meet specifications.

Revision history for this message

Michael Hall (mhall119) wrote on 2012-02-28: Posted in a previous version of this proposal

Thanks so much for your submission!

Recently a new FreeDesktop.org specification[1] has been approved for providing desktop-agnostic shortcuts. The Quicklist documentation has been updated to coincide with this new spec[2].

Since this is now an official standard, and will benefit environments other than Unity, we encourage you to change your code to match. This will require the following changes:
1) Change "X-Ayatana-Desktop-Shortcuts" to just "Actions"
2) Change each section from "[<action> Shortcut Group]" to "[Desktop Action <action>]"
3) Remove "TargetEnvironment=Unity"
4) Change your Name= entry to use Title Case[3] (capitalizing important words)

Please update this merge proposal with these changes so they can be included in the upcoming release of Ubuntu. Please also make sure you submit them to the upstream developers so they can be included there in future versions.

[1] http://standards.freedesktop.org/desktop-entry-spec/latest/ar01s08.html
[2] https://wiki.ubuntu.com/Unity/LauncherAPI#Quicklists
[3] http://en.wikipedia.org/wiki/Title_case#Headings_and_publication_titles

review: Needs Fixing

Revision history for this message

Sebastien Bacher (seb128) wrote on 2012-03-05: Posted in a previous version of this proposal

Setting to "Work in progress" please set back to "Needs review" when you update so it shows again on the sponsoring list

Revision history for this message

Michael Terry (mterry) wrote on 2012-03-15:

Thanks for the patch! I pushed this in with some changes. Here are some comments to make it easier to merge future patches:

1) Always patch the desktop file with the most ".in" -- here you should have patched empathy.desktop.in.in

2) Since we're patching a desktop file with a .in, it will be processed by intltool for translations. So we should add an underscore before keys that should be translated, like Name. So it should be "_Name=Open Hidden in Background"

3) "Actions" is a list, so it should always end with a semicolon.

4) I added "Open Preferences" and "Open Accounts" items as requested in the bug.

5) For Ubuntu desktop packages like this, there is a separate packaging branch for merges besides lp:ubuntu/empathy. For empathy, it's lp:~ubuntu-desktop/empathy/ubuntu. You can use "debcheckout empathy" to get it.

6) It would be easier if a quilt patch was added to debian/patches (instead of making changes directly to the source) and an entry was added to debian/changelog.

I also opened an upstream bug, linked from the Ubuntu bug.

review: Approve