Merge lp:~davidc3/unity-lens-video/fix-no-xdg-video into lp:unity-lens-video

Proposed by David Callé
Status: Merged
Approved by: David Callé
Approved revision: 32
Merged at revision: 32
Proposed branch: lp:~davidc3/unity-lens-video/fix-no-xdg-video
Merge into: lp:unity-lens-video
Diff against target: 23 lines (+4/-2)
1 file modified
src/unity-lens-video (+4/-2)
To merge this branch: bzr merge lp:~davidc3/unity-lens-video/fix-no-xdg-video
Reviewer Review Type Date Requested Status
Unity Videos lens Pending
Review via email: mp+93873@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/unity-lens-video'
2--- src/unity-lens-video 2012-02-20 09:27:15 +0000
3+++ src/unity-lens-video 2012-02-20 16:28:24 +0000
4@@ -85,6 +85,7 @@
5
6 BUS_NAME = "net.launchpad.lens.video"
7 FOLDER = GLib.get_user_special_dir(GLib.USER_DIRECTORY_VIDEOS)
8+HOME_FOLDER = GLib.get_home_dir()
9 CACHE = "%s/.cache/unity-lens-video" % GLib.get_home_dir()
10 DB = "videos.db"
11
12@@ -170,8 +171,9 @@
13 the run the search method."""
14 if not Gio.file_new_for_path(CACHE).query_exists(None):
15 Gio.file_new_for_path(CACHE).make_directory(None)
16- GLib.spawn_command_line_async('updatedb -o %s/%s -l 0 -U %s' %
17- (CACHE, DB, FOLDER))
18+ if FOLDER != HOME_FOLDER:
19+ GLib.spawn_command_line_async('updatedb -o %s/%s -l 0 -U %s' %
20+ (CACHE, DB, FOLDER))
21
22 result_sets = []
23 if cat == 'global':

Subscribers

People subscribed via source and target branches