Merge lp:~didrocks/unity-lens-applications/conditionnally-show-more-suggestions into lp:unity-lens-applications

[Didier Roche-Tolomelli]

Add conditionnal more suggestions show/hide based on the global online/commercial
key (LP: #1054746)

Manual test included.

[Didier Roche-Tolomelli (didrocks)]

Rejecting myself the merge request. Design descoped the app lens

Unmerged revisions

308. By Didier Roche-Tolomelli on 2012-09-26

add manual test

307. By Didier Roche-Tolomelli on 2012-09-26

dep on latest libunity

306. By Didier Roche-Tolomelli on 2012-09-26

add conditionally showing the suggestions (LP: #1054746).

=== modified file 'configure.ac'
--- configure.ac	2012-09-19 11:33:38 +0000
+++ configure.ac	2012-09-26 08:24:20 +0000
@@ -65,7 +65,7 @@
                   gee-1.0
                   dee-1.0 >= 0.5.16
                   zeitgeist-1.0 >= 0.3.8
-                  unity >= 6.5.1
+                  unity >= 6.7
                   libgnome-menu)
 
 AC_SUBST(LENS_DAEMON_CFLAGS)
 
=== modified file 'src/daemon.vala'
--- src/daemon.vala	2012-09-25 10:24:12 +0000
+++ src/daemon.vala	2012-09-26 08:24:20 +0000
@@ -122,6 +122,8 @@
 
     private PurchaseInfoHelper purchase_info = null;
 
+    private PreferencesManager preferences = PreferencesManager.get_default ();
+
     construct
     {
       populate_type_queries ();
@@ -183,7 +185,8 @@
       // TRANSLATORS: Please make sure this string is short enough to fit
       // into the filter button
       local_apps_option = scope.sources.add_option ("local", _("Local Apps"));
-      if (display_available_apps)
+      if (display_available_apps &&
+          (preferences.remote_content_search == Unity.PreferencesManager.RemoteContent.ALL))
       {
         // TRANSLATORS: Please make sure this string is short enough to fit
         // into the filter button
@@ -569,7 +572,8 @@
       purchase_info = new PurchaseInfoHelper ();
 
       /* If we don't have a search we display 6 random apps */
-      if (usc_apps_active () && display_available_apps && pkgsearcher != null)
+      if (usc_apps_active () && display_available_apps && pkgsearcher != null &&
+         (preferences.remote_content_search == Unity.PreferencesManager.RemoteContent.ALL))
       {
         if (has_search)
         {
 
=== added file 'tests/software-center-suggestions.txt'
--- tests/software-center-suggestions.txt	1970-01-01 00:00:00 +0000
+++ tests/software-center-suggestions.txt	2012-09-26 08:24:20 +0000
@@ -0,0 +1,14 @@
+'Disable' Software Center suggestions
+----------------------------------------------------
+Disabling the commercial/online suggestions should not show available apps.
+
+Setup:
+
+Actions:
+1. Disable the online/commercial search in gnome-control-center or directly in gsettings
+(com.canonical.Unity.Lenses "remote-content-search" to none)
+2. Perfom a search in the application lens
+
+Expected Results:
+No "More suggestions" category should appear.
+