Merge lp:~mhr3/unity-lens-applications/fix-1066816 into lp:unity-lens-applications/6.0

[Michal Hruby]

Initialize the ratings DB lazily.

Initialize the ratings DB lazily.

[Łukasz Zemczak (sil2100)]

LGTM.

review: Approve

=== modified file 'src/daemon.vala'
--- src/daemon.vala	2012-09-27 08:38:36 +0000
+++ src/daemon.vala	2012-10-15 10:26:31 +0000
@@ -58,7 +58,8 @@
     public Unity.Package.Searcher appsearcher;
 
     /* Read the app ratings dumped by the Software Center */
-    private Unity.Ratings.Database? ratings;
+    private bool ratings_db_initialized = false;
+    private Unity.Ratings.Database? ratings = null;
 
     private Unity.Lens lens;
     private Unity.Scope scope;
@@ -154,13 +155,6 @@
         critical ("Failed to load Software Center index. 'Apps Available for Download' will not be listed");
       }
 
-      try {
-        ratings = new Unity.Ratings.Database ();
-      } catch (FileError e) {
-        warning (e.message);
-        ratings = null;
-      }
-
       /* Image file extensions in order of popularity */
       image_extensions = new Gee.ArrayList<string> ();
       image_extensions.add ("png");
@@ -249,6 +243,21 @@
       lens.export ();
     }
 
+    private void init_ratings_db ()
+    {
+      if (ratings_db_initialized) return;
+      try
+      {
+        ratings = new Unity.Ratings.Database ();
+      }
+      catch (FileError e)
+      {
+        warning ("%s", e.message);
+        ratings = null;
+      }
+      ratings_db_initialized = true;
+    }
+
     private async void dispatch_search (LensSearch lens_search,
                                         SearchType search_type,
                                         Cancellable cancellable)
@@ -1325,7 +1334,8 @@
             preview = new Unity.ApplicationPreview (sc_data_provider.name, subtitle, sc_data_provider.description, icon, screenshot);
             preview.license = sc_data_provider.license;
 
-            if (ratings !=null)
+            init_ratings_db ();
+            if (ratings != null)
             {
               Unity.Ratings.Result result;
               ratings.query (pkgname, out result);