Ubuntu One Client

Merge lp:~dobey/ubuntuone-client/goodbye-prefs-menu into lp:ubuntuone-client

  1. goodbye-prefs-menu
  2. Merge into trunk
Proposed by dobey
Status: Merged
Approved by: Elliot Murphy
Approved revision: 243
Merged at revision: not available
Proposed branch: lp:~dobey/ubuntuone-client/goodbye-prefs-menu
Merge into: lp:ubuntuone-client
Diff against target: 13 lines
1 file modified
data/Makefile.am (+1/-2)
To merge this branch: bzr merge lp:~dobey/ubuntuone-client/goodbye-prefs-menu
Reviewer Review Type Date Requested Status
John O'Brien (community) Approve
Elliot Murphy (community) Approve
Review via email: mp+13080@code.launchpad.net

Commit message

Don't install the preferences desktop item

To post a comment you must log in.
Revision history for this message
Elliot Murphy (statik) wrote :

thanks for fixing this, pitti will be happy.

review: Approve
Revision history for this message
John O'Brien (jdobrien) :
review: Approve

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 2009-09-25 18:48:03 +0000
3+++ data/Makefile.am 2009-10-08 17:00:29 +0000
4@@ -12,8 +12,7 @@
5 oauth_DATA = oauth_registration.d/ubuntuone
6
7 desktopdir = $(datadir)/applications
8-desktop_in_files = ubuntuone-client-applet.desktop.in \
9- ubuntuone-client-preferences.desktop.in
10+desktop_in_files = ubuntuone-client-applet.desktop.in
11 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
12
13 @INTLTOOL_DESKTOP_RULE@

Subscribers

People subscribed via source and target branches