Merge lp:~donadigo/slingshot/uninstall-apps into lp:~elementary-pantheon/slingshot/trunk

[Adam Bieńkowski]

* Add uninstall item to app right-click menu to uninstall apps

This branch fixes bug #1211570: "Uninstall apps from context menu in Slingshot".

The implementation is done with appstream, altough on Slack we also talked about a possible implementation depending on Contractor / appstream-glib in the future.

The Gtk.show_uri error is only handeled internally, so there is no warning message shown to the user when the app handling appstream URI couldn't be launched for some reason (definitely should be shown in the future).

Please test, if launching wingpanel doesn't take too much time, because this branch uses heavy AppStream.Pool.load () which could make impact on loading times on logging in first time or launching wingpanel from terminal.

[lp:~donadigo/slingshot/uninstall-apps]

714. By Adam Bieńkowski on 2016-12-29

Remove unneded return line; check if component id is already assigned

[Neal Gompa (ngompa13)]

If you're going to use AppStream instead of appstream-glib, be sure to target AppStream 0.10 or newer only. There's an API break between 0.9.x and 0.10.x.

review: Needs Fixing

[Neal Gompa (ngompa13)]

Also, I'm curious why you moved the #ifdef for HAS_PLANK. There doesn't seem to be an obvious reason for it.

review: Needs Information

[lp:~donadigo/slingshot/uninstall-apps]

715. By Adam Bieńkowski on 2016-12-30

Bump appstream version to 0.10.0

[Jung-Kyu Park (bagjunggyu)]

It works good with AppCenter.

review: Approve

[Danielle Foré (danrabbit)]

This is not working for David and me. But even if it were working, I would not merge because it doesn't do what it says it does. It says "Uninstall" but it doesn't actually perform an uninstall.

review: Needs Fixing

[Rico Tzschichholz (ricotz)]

This is already merged!

[Adam Bieńkowski (donadigo)]

ricotz: We discussed this on Slack, it will be just reverted, hence the review.

Unmerged revisions

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-08-14 19:55:27 +0000
+++ CMakeLists.txt	2016-12-30 12:20:39 +0000
@@ -77,7 +77,7 @@
   endif ()
 endif ()
 
-set (CORE_DEPS "gobject-2.0;glib-2.0;gio-2.0;gio-unix-2.0;libsoup-2.4;gee-0.8;libgnome-menu-3.0;json-glib-1.0;${UNITY_DEPS};${PLANK_DEPS};")
+set (CORE_DEPS "gobject-2.0;glib-2.0;gio-2.0;gio-unix-2.0;libsoup-2.4;gee-0.8;libgnome-menu-3.0;json-glib-1.0;${UNITY_DEPS};${PLANK_DEPS};appstream>=0.10.0;")
 set (UI_DEPS "wingpanel-2.0;gtk+-3.0>=3.12.0;granite;${ZEITGEIST_DEPS};")
 
 pkg_check_modules (DEPS REQUIRED "${CORE_DEPS}${UI_DEPS}" gthread-2.0)
 
=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2015-11-21 11:47:57 +0000
+++ src/CMakeLists.txt	2016-12-30 12:20:39 +0000
@@ -29,6 +29,7 @@
     ${UI_DEPS}
     synapse-core
     synapse-plugins
+    appstream
 CUSTOM_VAPIS
     ../vapi/config.vapi
 OPTIONS
 
=== modified file 'src/Widgets/AppEntry.vala'
--- src/Widgets/AppEntry.vala	2016-12-27 21:08:33 +0000
+++ src/Widgets/AppEntry.vala	2016-12-30 12:20:39 +0000
@@ -50,9 +50,10 @@
     private Gtk.Image count_image;
     private bool dragging = false; //prevent launching
     private Backend.App application;
+    private string? appstream_comp_id = null;
 
-#if HAS_PLANK
     static construct {
+#if HAS_PLANK        
         Plank.Paths.initialize ("plank", Build.PKGDATADIR);
         plank_theme = new Plank.DockTheme (Plank.Theme.GTK_THEME_NAME);
 #if HAS_PLANK_0_11
@@ -60,10 +61,23 @@
 #else
         plank_client = Plank.DBus.Client.get_instance ();
 #endif
+#endif
+
+        has_appstream_handler = AppInfo.get_default_for_uri_scheme ("appstream") != null;
+        appstream_pool = new AppStream.Pool ();
+        try {
+            appstream_pool.load ();
+        } catch (Error e) {
+            warning (e.message);
+        }
     }
 
     private const int ICON_SIZE = 64;
 
+    private static AppStream.Pool appstream_pool;
+    private static bool has_appstream_handler = false;
+
+#if HAS_PLANK
 #if HAS_PLANK_0_11
     private const int SURFACE_SIZE = 48;
     private static Plank.DockTheme plank_theme;
@@ -88,6 +102,12 @@
         application = app;
         tooltip_text = app.description;
 
+        appstream_pool.get_components ().foreach ((comp) => {
+            if (appstream_comp_id == null && desktop_id == comp.get_desktop_id () && comp.get_pkgname () != null) {
+                appstream_comp_id = comp.get_id ();
+            }
+        });
+
         get_style_context ().add_class (Gtk.STYLE_CLASS_FLAT);
 
         app_label = new Gtk.Label (app_name);
@@ -217,6 +237,14 @@
             });
         }
 
+        if (has_appstream_handler && appstream_comp_id != null) {
+            if (menu.get_children ().length () > 0) {
+                menu.add (new Gtk.SeparatorMenuItem ());
+            }
+
+            menu.add (get_uninstall_menuitem ());
+        }
+
 #if HAS_PLANK
         if (plank_client != null && plank_client.is_connected) {
             if (menu.get_children ().length () > 0)
@@ -229,6 +257,24 @@
         menu.show_all ();
     }
 
+    private Gtk.MenuItem get_uninstall_menuitem () {
+        var uninstall_menuitem = new Gtk.MenuItem ();
+        uninstall_menuitem.set_label (_("Uninstall"));
+        uninstall_menuitem.activate.connect (uninstall_menuitem_activate);
+
+        return uninstall_menuitem;
+    }
+
+    private void uninstall_menuitem_activate () {
+        try {
+            Gtk.show_uri (null, "appstream://%s".printf (appstream_comp_id), Gdk.CURRENT_TIME);
+        } catch (Error e) {
+            warning (e.message);
+        }
+
+        app_launched ();
+    }
+
 #if HAS_PLANK
     private Gtk.MenuItem get_plank_menuitem () {
         docked = (desktop_uri in plank_client.get_persistent_applications ());