Merge lp:~mhr3/unity-lens-shopping/revert-r23 into lp:unity-lens-shopping

[Michal Hruby]

Revert r23

Revert r23, because... No there isn't a logical reason for that, sorry...

[Neil J. Patel (njpatel)]

review: Approve

=== modified file 'src/scope.vala'
--- src/scope.vala	2012-09-27 08:40:46 +0000
+++ src/scope.vala	2012-09-28 14:31:09 +0000
@@ -383,32 +383,13 @@
 
         if (image_uri != "")
         {
+          // TODO: what to do if we have price but no icon?
           var file = File.new_for_uri (image_uri);
           var icon = new AnnotatedIcon (new FileIcon (file));
           // FIXME: dash doesn't like empty string as ribbon
-          icon.ribbon = price == null || price == "" ? " " : price;
-
-          unowned string category = "";
-          if (result.has_member ("category"))
-            category = result.get_string_member ("category");
-          switch (category)
-          {
-            case "application":
-              icon.category = CategoryType.APPLICATION;
-              break;
-            case "movie":
-              icon.category = CategoryType.MOVIE;
-              break;
-            case "music":
-              icon.category = CategoryType.MUSIC;
-              break;
-            case "book":
-              icon.category = CategoryType.BOOK;
-              break;
-            default:
-              icon.category = CategoryType.HOME; // will use generic icon
-              break;
-          }
+          icon.ribbon = price == null || price == "" ? " " : price; 
+          // FIXME: the service doesn't expose categories yet
+          // icon.category = CategoryType.BOOK;
           image_uri = icon.to_string ();
         }
 

=== modified file 'tests/manual-tests/shopping-lens-tests.txt'
--- tests/manual-tests/shopping-lens-tests.txt	2012-09-27 08:46:19 +0000
+++ tests/manual-tests/shopping-lens-tests.txt	2012-09-28 14:31:09 +0000
@@ -70,19 +70,6 @@
 Expected Results:
 Web site for selected item is opened in web browser, with an option to complete purchase.
 
-Emblems on icons provided by the Shopping lens
-----------------------------------------------------
-Whenever there are results from the shopping lens, emblems are present on the icons.
-
-Setup:
-Internet connectivity.
-
-Actions:
-Perform a search so that some results in the "More suggestions" category are displayed. (for example search for "novel")
-
-Expected Results:
-All items that are displayed have an icon categorizing the product - either a music icon, book, movie, or a generic shopping bag icon along with a price.
-
 'Disable' Shopping Lens Search
 ----------------------------------------------------
 Disabling the shopping lens should not show any result.