Unity

Merge lp:~didrocks/unity/fix-duplicate-entry into lp:unity

  1. fix-duplicate-entry
  2. Merge into trunk
Proposed by Didier Roche-Tolomelli
Status: Merged
Merged at revision: 559
Proposed branch: lp:~didrocks/unity/fix-duplicate-entry
Merge into: lp:unity
Diff against target: 14 lines (+3/-1)
1 file modified
tools/migrate_favorites.py (+3/-1)
To merge this branch: bzr merge lp:~didrocks/unity/fix-duplicate-entry
Reviewer Review Type Date Requested Status
Mikkel Kamstrup Erlandsen (community) Approve
Review via email: mp+36707@code.launchpad.net

Description of the change

Don't migrate ubiquity from dekstop, will result in duplicate entry in the live session

To post a comment you must log in.
Revision history for this message
Mikkel Kamstrup Erlandsen (kamstrup) wrote :

Approved!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tools/migrate_favorites.py'
2--- tools/migrate_favorites.py 2010-09-21 14:43:37 +0000
3+++ tools/migrate_favorites.py 2010-09-27 13:12:47 +0000
4@@ -88,7 +88,9 @@
5 # get GNOME desktop launchers
6 desktop_dir = get_desktop_dir()
7 for launcher_location in glob.glob('%s/*.desktop' % desktop_dir):
8- (apps_list, priority_position) = register_new_app(client, launcher_location, apps_list, priority_position)
9+ # blacklist ubiquity as will have two ubiquity in the netbook live session then
10+ if not "ubiquity" in launcher_location:
11+ (apps_list, priority_position) = register_new_app(client, launcher_location, apps_list, priority_position)
12
13 # set list of default and new favorites and write everything!
14 client.set_list('/desktop/unity/launcher/favorites/favorites_list', gconf.VALUE_STRING, apps_list)