Unity

Merge lp:~didrocks/unity/fix-682345 into lp:unity

  1. fix-682345
  2. Merge into trunk
Proposed by Didier Roche-Tolomelli
Status: Merged
Merged at revision: 661
Proposed branch: lp:~didrocks/unity/fix-682345
Merge into: lp:unity
Diff against target: 12 lines (+2/-0)
1 file modified
src/LauncherController.cpp (+2/-0)
To merge this branch: bzr merge lp:~didrocks/unity/fix-682345
Reviewer Review Type Date Requested Status
Jason Smith (community) Approve
Review via email: mp+42628@code.launchpad.net

Description of the change

After merging
https://code.edge.launchpad.net/~didrocks/bamf/fix682345/+merge/42627 bamf can
return NULL as app if the desktop file in favorites isn't recognized
(fix bug #682345)

To post a comment you must log in.
Revision history for this message
Jason Smith (jassmith) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/LauncherController.cpp'
--- src/LauncherController.cpp 2010-12-01 03:14:13 +0000
+++ src/LauncherController.cpp 2010-12-03 14:48:26 +0000
@@ -180,6 +180,8 @@
180 BamfLauncherIcon *icon;180 BamfLauncherIcon *icon;
181181
182 app = bamf_matcher_get_application_for_desktop_file (_matcher, file_path, true);182 app = bamf_matcher_get_application_for_desktop_file (_matcher, file_path, true);
183 if (!app)
184 return NULL;
183 185
184 if (g_object_get_qdata (G_OBJECT (app), g_quark_from_static_string ("unity-seen")))186 if (g_object_get_qdata (G_OBJECT (app), g_quark_from_static_string ("unity-seen")))
185 {187 {