Merge lp:~thisfred/ubuntuone-control-panel/lp-721525 into lp:ubuntuone-control-panel

Proposed by Eric Casteleijn on 2011-03-29
Status: Merged
Approved by: Natalia Bidart on 2011-03-29
Approved revision: 115
Merged at revision: 116
Proposed branch: lp:~thisfred/ubuntuone-control-panel/lp-721525
Merge into: lp:ubuntuone-control-panel
Diff against target: 14 lines (+0/-6)
1 file modified
ubuntuone-control-panel-gtk.desktop.in (+0/-6)
To merge this branch: bzr merge lp:~thisfred/ubuntuone-control-panel/lp-721525
Reviewer Review Type Date Requested Status
Natalia Bidart Approve on 2011-03-29
Shane Fagan (community) 2011-03-29 Approve on 2011-03-29
Review via email: mp+55327@code.launchpad.net

Commit message

Removed the shortcut group that causes two Ubuntu One entries to appear in the messaging menu when syncdaemon is not running.

Description of the change

Removed the shortcut group that causes two Ubuntu One entries to appear in the messaging menu when syncdaemon is not running.

To post a comment you must log in.
Eric Casteleijn (thisfred) wrote :

To see the problem:

kill syncdaemon, and verify that the messaging menu has two entries for Ubuntu One.

To test the fix:

sudo mv /usr/share/applications/ubuntuone-control-panel-gtk.desktop ~/ubuntuone-control-panel-gtk.desktop
sudo cp [path/to/branch]/ubuntuone-control-panel-gtk.desktop.in /usr/share/applications/ubuntuone-control-panel-gtk.desktop

log out and back in, kill syncdaemon, and verify that the messaging menu only has one entry for Ubuntu One.

Shane Fagan (shanepatrickfagan) wrote :

Tested works fine

review: Approve
Natalia Bidart (nataliabidart) wrote :

Works like a charm!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntuone-control-panel-gtk.desktop.in'
2--- ubuntuone-control-panel-gtk.desktop.in 2011-02-22 15:17:31 +0000
3+++ ubuntuone-control-panel-gtk.desktop.in 2011-03-29 12:25:15 +0000
4@@ -7,10 +7,4 @@
5 Type=Application
6 Categories=GNOME;GTK;Settings;
7 StartupNotify=true
8-X-Ayatana-Desktop-Shortcuts=U1
9 X-Ayatana-Appmenu-Show-Stubs=False
10-
11-[U1 Shortcut Group]
12-Name=Ubuntu One
13-Exec=ubuntuone-control-panel-gtk
14-OnlyShowIn=Messaging Menu

Subscribers

People subscribed via source and target branches