Merge lp:~stolowski/unity-lens-applications/reload-gmenu-on-change into lp:unity-lens-applications

[Paweł Stołowski]

Reload gnome menu tree after receiving 'changed' signal. This is now required by gnome-menu-3.6.0 code.

Reload gnome menu tree after receiving 'changed' signal. This is now required by gnome-menu-3.6.0 code.

[Michal Hruby (mhr3)]

LGTM

review: Approve

=== modified file 'src/daemon.vala'
--- src/daemon.vala	2012-11-05 19:18:41 +0000
+++ src/daemon.vala	2012-11-30 09:16:23 +0000
@@ -357,26 +357,29 @@
         app_menu = new GMenu.Tree ("unity-lens-applications.menu",
                                         GMenu.TreeFlags.INCLUDE_NODISPLAY);
 
-        try
-        {
-          app_menu.load_sync (); //FIXME: libgnome-menu doesn't provide async method (yet?)
-        }
-        catch (GLib.Error e)
-        {
-          warning ("Failed to load menu entries: %s", e.message);
-        }
-
         app_menu.changed.connect (() => {
             /* Reschedule the timeout if we already have one. The menu tree triggers
              * many change events during app installation. This way we wait the full
              * delay *after* the last change event has triggered */
             if (app_menu_changed_reindex_timeout != 0)
+            {
               Source.remove (app_menu_changed_reindex_timeout);
+            }
 
             app_menu_changed_reindex_timeout = Timeout.add_seconds (5, build_app_menu_index_and_result_models);
           });
       }
 
+      // gnome menu tree needs to be loaded on startup and after receiving 'changed' signal - see gmenu-tree.c in gnome-menus-3.6.0.
+      try
+      {
+        app_menu.load_sync (); //FIXME: libgnome-menu doesn't provide async method (yet?)
+      }
+      catch (GLib.Error e)
+      {
+        warning ("Failed to load menu entries: %s", e.message);
+      }
+
       debug ("Indexing application menu");
       appsearcher = new Unity.Package.Searcher.for_menu (app_menu);
       app_menu_changed_reindex_timeout = 0;
@@ -385,8 +388,9 @@
     }
 
     /* Called when our app_menu structure changes - probably because something
-     * has been installed or removed. We rebuild the index and update the
-     * result models for global and scope. We need to update both because
+     * has been installed or removed. We reload gnome menu tree,
+     * rebuild the index and update the result models for global and scope.
+     * We need to update both because
      * we can't know exactly what Unity may be showing */
     private bool build_app_menu_index_and_result_models ()
     {

=== modified file 'tests/manual/apps-lens-tests.txt'
--- tests/manual/apps-lens-tests.txt	2012-10-12 12:05:51 +0000
+++ tests/manual/apps-lens-tests.txt	2012-11-30 09:16:23 +0000
@@ -40,3 +40,19 @@
 Expected Result:
 Open-source free applications display 'Free' string in ribbons in the search results. Their previews should have 'Developer site' and 'Free Download' buttons.
 Commercial apps should have the price displayed in ribbons (e.g. 'US$ 8.40'). Their previews should have 'Developer site' and 'Buy US$ ...' buttons.
+
+Test updates to gnome menu structure
+------------------------------------
+Check that adding/removing applications updates applications lens contents.
+
+Setup:
+At least default ubuntu applications installed.
+
+Actions:
+Open the Dash and switch to the application lens.
+Right-click one of free apps listed in 'More suggestions' category and install it via its preview.
+Open the Dash and switch to the application lens again.
+
+Expected Result:
+'Recently used', 'Installed', 'More suggestions' categories are displayed.
+The new application is listed in the 'Installed' category (note: this may take a few seconds after installation finished).