Merge lp:~stolowski/unity-lens-applications/no-uninstall-for-ubuntu-desktop into lp:unity-lens-applications

Proposed by Paweł Stołowski
Status: Merged
Approved by: Neil J. Patel
Approved revision: 298
Merged at revision: 301
Proposed branch: lp:~stolowski/unity-lens-applications/no-uninstall-for-ubuntu-desktop
Merge into: lp:unity-lens-applications
Diff against target: 38 lines (+8/-3)
2 files modified
src/daemon.vala (+6/-3)
src/software-center-data-provider.vala (+2/-0)
To merge this branch: bzr merge lp:~stolowski/unity-lens-applications/no-uninstall-for-ubuntu-desktop
Reviewer Review Type Date Requested Status
Neil J. Patel (community) Approve
Review via email: mp+124740@code.launchpad.net

Commit message

Don't show 'Uninstall' button for critical apps (i.e. the ones that depend on ubuntu-desktop).
Requires lp:~mvo/software-center/dataprovider-desktop-dependency-property branch.

Description of the change

Don't show 'Uninstall' button for critical apps (i.e. the ones that depend on ubuntu-desktop).
Requires lp:~mvo/software-center/dataprovider-desktop-dependency-property branch.

To post a comment you must log in.
Revision history for this message
Neil J. Patel (njpatel) wrote :

"Works for me!" (c) Kamstrup

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/daemon.vala'
--- src/daemon.vala 2012-09-13 17:12:02 +0000
+++ src/daemon.vala 2012-09-17 16:46:21 +0000
@@ -1247,9 +1247,12 @@
1247 preview.add_info (new InfoHint ("date-installed", _("Installed on"), null, sc_data_provider.installation_date));1247 preview.add_info (new InfoHint ("date-installed", _("Installed on"), null, sc_data_provider.installation_date));
1248 var launch_action = new Unity.PreviewAction ("launch", _("Launch"), null);1248 var launch_action = new Unity.PreviewAction ("launch", _("Launch"), null);
1249 preview.add_action (launch_action);1249 preview.add_action (launch_action);
1250 var uninstall_action = new Unity.PreviewAction ("uninstall", _("Uninstall"), null);1250 if (!sc_data_provider.is_desktop_dependency)
1251 uninstall_action.activated.connect (app_preview_uninstall);1251 {
1252 preview.add_action (uninstall_action);1252 var uninstall_action = new Unity.PreviewAction ("uninstall", _("Uninstall"), null);
1253 uninstall_action.activated.connect (app_preview_uninstall);
1254 preview.add_action (uninstall_action);
1255 }
1253 }1256 }
12541257
1255 preview_installable_desktop_file = sc_data_provider.desktop_file;1258 preview_installable_desktop_file = sc_data_provider.desktop_file;
12561259
=== modified file 'src/software-center-data-provider.vala'
--- src/software-center-data-provider.vala 2012-09-06 08:11:17 +0000
+++ src/software-center-data-provider.vala 2012-09-17 16:46:21 +0000
@@ -52,6 +52,7 @@
52 public string website { get; set; }52 public string website { get; set; }
53 public int64 size { get; set; }53 public int64 size { get; set; }
54 public string hardware_requirements { get; set; }54 public string hardware_requirements { get; set; }
55 public bool is_desktop_dependency { get; set; }
5556
56 public SoftwareCenterDataProviderProxy ()57 public SoftwareCenterDataProviderProxy ()
57 {58 {
@@ -88,6 +89,7 @@
88 website = data["website"].get_string ();89 website = data["website"].get_string ();
89 hardware_requirements = data["hardware_requirements"].get_string ();90 hardware_requirements = data["hardware_requirements"].get_string ();
90 size = int64.parse (data["size"].get_string ());91 size = int64.parse (data["size"].get_string ());
92 is_desktop_dependency = data["is_desktop_dependency"].get_boolean ();
91 93
92 var state = data["pkg_state"].get_string ();94 var state = data["pkg_state"].get_string ();
9395

Subscribers

People subscribed via source and target branches