Unity

Merge lp:~unity-team/unity/unity.fav-crasher-fix into lp:unity

  1. unity.fav-crasher-fix
  2. Merge into trunk
Proposed by Gord Allott
Status: Merged
Merged at revision: 561
Proposed branch: lp:~unity-team/unity/unity.fav-crasher-fix
Merge into: lp:unity
Diff against target: 14 lines (+2/-2)
1 file modified
unity-private/launcher/application-controller.vala (+2/-2)
To merge this branch: bzr merge lp:~unity-team/unity/unity.fav-crasher-fix
Reviewer Review Type Date Requested Status
Mikkel Kamstrup Erlandsen (community) Approve
Review via email: mp+36709@code.launchpad.net

Description of the change

hopefully should fix the attached branch, i thought i had already put this into the original merge but i guess it got missed :(

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 'unity-private/launcher/application-controller.vala'
2--- unity-private/launcher/application-controller.vala 2010-09-24 11:07:34 +0000
3+++ unity-private/launcher/application-controller.vala 2010-09-27 13:17:40 +0000
4@@ -44,8 +44,8 @@
5 if (_fav_id == "" || _fav_id == null &&
6 desktop_file != "" && desktop_file != null)
7 {
8- var filepath = desktop_file.split ("/");
9- _fav_id = "app-" + filepath[filepath.length - 1];
10+ var filepath = Path.get_basename (desktop_file);
11+ _fav_id = "app-" + filepath;
12 }
13 return _fav_id;
14 }