Merge lp:~stolowski/unity-lens-applications/use-raw-price into lp:unity-lens-applications

[Paweł Stołowski]

Use raw_price instead of price to check if it's a commercial or free application; this impacts preview action buttons and how installation is handled (free apps are installed directly via apt-daemon, commercial apps are handled by SoftwareCenter).

Use raw_price instead of price to check if it's a commercial or free application; this impacts preview action buttons and how installation is handled (free apps are installed directly via apt-daemon, commercial apps are handled by SoftwareCenter).

[lp:~stolowski/unity-lens-applications/use-raw-price]

297. By Paweł Stołowski on 2012-09-06

Check raw_price for null.

[Michal Hruby (mhr3)]

+1

review: Approve

=== modified file 'src/daemon.vala'
--- src/daemon.vala	2012-09-05 14:54:07 +0000
+++ src/daemon.vala	2012-09-06 14:17:40 +0000
@@ -1235,7 +1235,7 @@
               {
 
                 Unity.PreviewAction install_action = null;
-                if (sc_data_provider.price == "")
+                if (sc_data_provider.raw_price == null || sc_data_provider.raw_price == "")
                 {
                   install_action = new Unity.PreviewAction ("install", _("Free Download"), null);
                   install_action.activated.connect (app_preview_install);

=== modified file 'src/software-center-data-provider.vala'
--- src/software-center-data-provider.vala	2012-08-15 16:03:14 +0000
+++ src/software-center-data-provider.vala	2012-09-06 14:17:40 +0000
@@ -46,6 +46,7 @@
     public string license { get; set; }
     public string icon { get; set; }
     public string price { get; set; }
+    public string raw_price { get; set; }
     public PackageState pkg_state { get; set; }
     public string installation_date { get; set; }
     public string website { get; set; }
@@ -82,6 +83,7 @@
       license = data["license"].get_string ();
       icon = data["icon_file_name"].get_string ();
       price = data["price"].get_string ();
+      raw_price = data["raw_price"].get_string ();
       installation_date = data["installation_date"].get_string ();
       website = data["website"].get_string ();
       hardware_requirements = data["hardware_requirements"].get_string ();