Merge lp:~osomon/unity-lens-files/noxdguserdirs into lp:unity-lens-files

[Olivier Tilloy]

Although unlikely in "normal" use cases, Environment.get_user_special_dir(UserDirectory.DOWNLOAD) may return NULL (see http://developer.gnome.org/glib/stable/glib-Miscellaneous-Utility-Functions.html#g-get-user-special-dir).
If it does, the files lens won’t display any search results. Instead of letting that happen, just check the result of get_user_special_dir(…), and ignore the downloaded files if it’s NULL.

[Michal Hruby (mhr3)]

Looks good, thank you!

review: Approve

=== modified file 'src/daemon.vala'
--- src/daemon.vala	2012-01-30 15:00:57 +0000
+++ src/daemon.vala	2012-02-14 13:52:38 +0000
@@ -692,6 +692,10 @@
       // FIXME: Store the Downloads folder and update on changes
       unowned string download_path =
                  Environment.get_user_special_dir (UserDirectory.DOWNLOAD);
+      if (download_path == null) {
+        warning ("Download directory unknown, skipping.");
+        return;
+      }
       var download_dir = File.new_for_path (download_path);
       SList<FileInfo> downloads;