Merge lp:~robert-ancell/ubuntuone-control-panel/unity-control-center2 into lp:ubuntuone-control-panel

Proposed by Robert Ancell on 2014-01-27
Status: Merged
Approved by: dobey on 2014-01-28
Approved revision: 410
Merged at revision: 410
Proposed branch: lp:~robert-ancell/ubuntuone-control-panel/unity-control-center2
Merge into: lp:ubuntuone-control-panel
Diff against target: 13 lines (+2/-1)
1 file modified
ubuntuone-installer.desktop.in (+2/-1)
To merge this branch: bzr merge lp:~robert-ancell/ubuntuone-control-panel/unity-control-center2
Reviewer Review Type Date Requested Status
dobey (community) 2014-01-27 Approve on 2014-01-28
Review via email: mp+203434@code.launchpad.net

Commit message

Show installer in both GNOME control center and Unity control center

To post a comment you must log in.
dobey (dobey) :
review: Approve
Ubuntu One Auto Pilot (otto-pilot) wrote :

There was a problem validating some authors of the branch. Authors must be either one of the listed Launchpad users, or a member of one of the listed teams on Launchpad.

Persons or Teams:

    contributor-agreement-canonical
    ubuntuone-hackers

Unaccepted Authors:

    Robert Ancell <email address hidden>

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntuone-installer.desktop.in'
2--- ubuntuone-installer.desktop.in 2012-11-08 03:36:18 +0000
3+++ ubuntuone-installer.desktop.in 2014-01-27 23:17:05 +0000
4@@ -6,8 +6,9 @@
5 Terminal=false
6 Type=Application
7 NotShowIn=GNOME;
8-Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-PersonalSettings
9+Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-Unity-Settings-Panel;X-GNOME-PersonalSettings
10 StartupNotify=true
11 X-Ayatana-Appmenu-Show-Stubs=False
12 X-GNOME-Settings-Panel=ubuntuone
13+X-Unity-Settings-Panel=ubuntuone
14

Subscribers

People subscribed via source and target branches