Merge lp:~francesco-marella/entertainer/manager-desktop-file into lp:entertainer

Proposed by Francesco Marella
Status: Merged
Approved by: Matt Layman
Approved revision: 408
Merged at revision: 412
Proposed branch: lp:~francesco-marella/entertainer/manager-desktop-file
Merge into: lp:entertainer
Diff against target: 30 lines (+15/-1)
2 files modified
docs/entertainer-manager.desktop (+11/-0)
setup.py (+4/-1)
To merge this branch: bzr merge lp:~francesco-marella/entertainer/manager-desktop-file
Reviewer Review Type Date Requested Status
Matt Layman Approve
Review via email: mp+22969@code.launchpad.net

Commit message

Add a link to the Entertainer's Manager in System > Preferences menu. (Francesco Marella)

To post a comment you must log in.
Revision history for this message
Matt Layman (mblayman) wrote :

Francesco,

This branch is great in helping us expose some more of the pieces that a user will have to interact with. One small thing to fix. Please change the setup so that it is just one call to data_files.append for 'share/applications' rather than two. You can look at 'share/entertainer/docs' right above 'share/applications' for an example of what I mean. Please let me know if you have questions.

Thanks,
Matt

review: Needs Fixing
408. By Francesco Marella

Call data_files.append for 'share/applications' just one time.

Revision history for this message
Francesco Marella (francesco-marella) wrote :

> Francesco,
>
> This branch is great in helping us expose some more of the pieces that a user
> will have to interact with. One small thing to fix. Please change the setup so
> that it is just one call to data_files.append for 'share/applications' rather
> than two. You can look at 'share/entertainer/docs' right above
> 'share/applications' for an example of what I mean. Please let me know if you
> have questions.
>
> Thanks,
> Matt

Matt, thanks for taking the time to review this merge request.
I have done the changes as requested.

-fm

Revision history for this message
Matt Layman (mblayman) wrote :

Looks good now.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'docs/entertainer-manager.desktop'
2--- docs/entertainer-manager.desktop 1970-01-01 00:00:00 +0000
3+++ docs/entertainer-manager.desktop 2010-05-17 09:22:24 +0000
4@@ -0,0 +1,11 @@
5+[Desktop Entry]
6+Version=1.0
7+Name=Entertainer Manager
8+Comment=Manager for Entertainer Media Center
9+Exec=entertainer-manager
10+Icon=entertainer
11+Terminal=false
12+Type=Application
13+Categories=GTK;GNOME;Settings;
14+X-GNOME-FullName=Entertainer Manager
15+X-GNOME-Gettext-Domain=entertainer-manager
16
17=== modified file 'setup.py'
18--- setup.py 2010-05-16 19:29:08 +0000
19+++ setup.py 2010-05-17 09:22:24 +0000
20@@ -65,7 +65,10 @@
21 'docs/DEPENDENCIES',
22 ]))
23 data_files.append(
24- ('share/applications', ['docs/entertainer.desktop']))
25+ ('share/applications', [
26+ 'docs/entertainer.desktop',
27+ 'docs/entertainer-manager.desktop',
28+ ]))
29 data_files.append(
30 ('share/man/man1', ['docs/entertainer.1.gz']))
31

Subscribers

People subscribed via source and target branches