Merge lp:~azzar1/update-notifier/ubuntu-bionic-livepatch into lp:~ubuntu-core-dev/update-notifier/ubuntu-bionic

[Andrea Azzarone]

Cherry-pick changes to Livepatch from Disco.

[Sebastien Bacher (seb128)]

Thanks, code looks fine and work as expected!

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2013-02-01 00:51:16 +0000
+++ configure.ac	2019-04-05 14:32:08 +0000
@@ -13,7 +13,7 @@
 GNOME_COMMON_INIT
 GLIB_GSETTINGS
 
-pkg_modules="glib-2.0 >= 2.34 gtk+-3.0 libnotify gio-2.0 >= 2.26 x11"
+pkg_modules="glib-2.0 >= 2.34 gtk+-3.0 libnotify gio-2.0 >= 2.26 x11 json-glib-1.0"
 
 PKG_CHECK_EXISTS(gudev-1.0, [ HAVE_GUDEV=1 ])
 if test "x$HAVE_GUDEV" != "x"; then
@@ -100,6 +100,7 @@
 pixmaps/22x22/Makefile
 pixmaps/24x24/Makefile
 pixmaps/48x48/Makefile
+pixmaps/scalable/Makefile
 po/Makefile.in
 ])
 

=== modified file 'data/com.ubuntu.update-notifier.gschema.xml.in'
--- data/com.ubuntu.update-notifier.gschema.xml.in	2013-06-05 17:31:47 +0000
+++ data/com.ubuntu.update-notifier.gschema.xml.in	2019-04-05 14:32:08 +0000
@@ -25,5 +25,10 @@
       <summary>Time of last release check</summary>
       <description>The last time update-notifier checked for a new release.  The format is seconds since UNIX epoch.</description>
     </key>
+    <key name="show-livepatch-status-icon" type="b">
+      <default>true</default>
+      <summary>Show Livepatch status icon</summary>
+      <description>Enable or diable the Livepatch status icon in the systray.</description>
+    </key>
   </schema>
 </schemalist>

=== modified file 'debian/changelog'
--- debian/changelog	2019-01-17 14:17:50 +0000
+++ debian/changelog	2019-04-05 14:32:08 +0000
@@ -1,3 +1,10 @@
+update-notifier (3.192.1.6) UNRELEASED; urgency=medium
+
+  * Add a Livepatch indicator in the system tray. (LP: #1820259)
+  * Add a "Settings..." button to the Livepatch notification. (LP: #1823351)
+
+ -- Andrea Azzarone <[e-mail]>  Fri, 05 Apr 2019 15:20:05 +0100
+
 update-notifier (3.192.1.5) bionic; urgency=medium
 
   * [ Andrea Azzarone ]

=== modified file 'debian/control'
--- debian/control	2018-04-09 11:35:03 +0000
+++ debian/control	2019-04-05 14:32:08 +0000
@@ -6,6 +6,7 @@
                dh-python,
                libgtk-3-dev,
                libglib2.0-dev (>= 2.34),
+               libjson-glib-dev,
                intltool,
                libnotify-dev (>= 0.7),
                libgudev-1.0-dev,

=== modified file 'debian/update-notifier.install'
--- debian/update-notifier.install	2017-09-29 14:37:12 +0000
+++ debian/update-notifier.install	2019-04-05 14:32:08 +0000
@@ -4,6 +4,7 @@
 usr/share/icons/hicolor/22x22/
 usr/share/icons/hicolor/24x24/
 usr/share/icons/hicolor/48x48/
+usr/share/icons/hicolor/scalable/
 usr/share/glib-2.0/schemas/com.ubuntu.update-notifier.gschema.xml
 usr/bin/update-notifier
 usr/bin/distro-cd-updater usr/lib/update-notifier/

=== modified file 'pixmaps/Makefile.am'
--- pixmaps/Makefile.am	2007-11-16 09:44:48 +0000
+++ pixmaps/Makefile.am	2019-04-05 14:32:08 +0000
@@ -1,1 +1,1 @@
-SUBDIRS = 16x16 22x22 24x24 48x48 
+SUBDIRS = 16x16 22x22 24x24 48x48 scalable

=== added directory 'pixmaps/scalable'
=== added file 'pixmaps/scalable/Makefile.am'
--- pixmaps/scalable/Makefile.am	1970-01-01 00:00:00 +0000
+++ pixmaps/scalable/Makefile.am	2019-04-05 14:32:08 +0000
@@ -0,0 +1,5 @@
+
+appicondir = $(datadir)/icons/hicolor/scalable/apps
+appicon_DATA = *.svg
+
+EXTRA_DIST = $(appicon_DATA)

=== added file 'pixmaps/scalable/livepatch-off.svg'
--- pixmaps/scalable/livepatch-off.svg	1970-01-01 00:00:00 +0000
+++ pixmaps/scalable/livepatch-off.svg	2019-04-05 14:32:08 +0000
@@ -0,0 +1,1 @@
+<svg id="Livepatch-_off" data-name="Livepatch- off" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19"><defs><style>.cls-1{fill:none;}.cls-2{fill:#ccc;}.cls-3{fill:#df382c;}.cls-4{fill:#fff;}</style></defs><title>Artboard 1</title><g id="layer1"><rect id="rect4782" class="cls-1" y="0.13" width="19" height="19"/><path id="path4210" class="cls-2" d="M9.5.52S7.56,3.77,2.38,3.77c0,11.06,7.12,15,7.12,15s7.13-3.9,7.13-15C11.46,3.77,9.5.52,9.5.52Z"/></g><circle class="cls-3" cx="13.56" cy="11.99" r="4.4"/><path id="path4179" class="cls-4" d="M11.86,9.76l-.4.4,1.68,1.68-1.68,1.68.4.4,1.68-1.68,1.68,1.68.4-.4L14,11.84l1.67-1.68-.4-.4-1.68,1.67Z"/></svg>
\ No newline at end of file

=== added file 'pixmaps/scalable/livepatch-on.svg'
--- pixmaps/scalable/livepatch-on.svg	1970-01-01 00:00:00 +0000
+++ pixmaps/scalable/livepatch-on.svg	2019-04-05 14:32:08 +0000
@@ -0,0 +1,1 @@
+<svg id="livepatch_-_on" data-name="livepatch - on" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19"><defs><style>.cls-1{fill:none;}.cls-2{fill:#ccc;}.cls-3{fill:#38b44a;}.cls-4{fill:#fff;}</style></defs><title>Artboard 1</title><g id="layer1"><rect id="rect4782" class="cls-1" y="0.13" width="19" height="19"/><path id="path4210" class="cls-2" d="M9.5.52S7.56,3.77,2.38,3.77c0,11.06,7.12,15,7.12,15s7.13-3.9,7.13-15C11.46,3.77,9.5.52,9.5.52Z"/></g><path id="path4155" class="cls-3" d="M13.56,7.59A4.4,4.4,0,1,0,18,12,4.4,4.4,0,0,0,13.56,7.59Z"/><path id="path4041-9" class="cls-4" d="M16,10.12l-2.8,2.46L11.57,11.2l-.3.33,1.92,2,3-3.18Z"/></svg>
\ No newline at end of file

=== added file 'pixmaps/scalable/livepatch-warning.svg'
--- pixmaps/scalable/livepatch-warning.svg	1970-01-01 00:00:00 +0000
+++ pixmaps/scalable/livepatch-warning.svg	2019-04-05 14:32:08 +0000
@@ -0,0 +1,1 @@
+<svg id="livepatch-_warning" data-name="livepatch- warning" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19"><defs><style>.cls-1{fill:none;}.cls-2{fill:#ccc;}.cls-3{fill:#e95420;}.cls-4{fill:#fff;}</style></defs><title>Artboard 1</title><g id="layer1"><rect id="rect4782" class="cls-1" x="-0.03" y="0.09" width="19.07" height="19.07"/><path id="path4210" class="cls-2" d="M9.5.49S7.56,3.75,2.35,3.75c0,11.1,7.15,15,7.15,15s7.16-3.91,7.16-15C11.47,3.75,9.5.49,9.5.49Z"/></g><path id="path4155" class="cls-3" d="M13.56,7.59A4.4,4.4,0,1,0,18,12,4.4,4.4,0,0,0,13.56,7.59Z"/><path id="path4159" class="cls-4" d="M13.06,9.07v.84c0,.54,0,1.05,0,1.51s.07.91.12,1.38h.67q.07-.71.12-1.38c0-.46,0-1,0-1.51V9.07Zm.5,4.84a.63.63,0,0,0-.44.19.57.57,0,0,0-.18.44.61.61,0,0,0,.18.45.66.66,0,0,0,.44.17A.64.64,0,0,0,14,15a.61.61,0,0,0,.18-.45A.57.57,0,0,0,14,14.1.62.62,0,0,0,13.56,13.91Z"/></svg>
\ No newline at end of file

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2017-08-21 17:30:53 +0000
+++ po/POTFILES.in	2019-04-05 14:32:08 +0000
@@ -11,6 +11,7 @@
 src/cdroms.c
 src/hooks.c
 src/livepatch.c
+src/livepatch-tray.c
 src/update.c
 src/update-notifier.c
 [type: gettext/glade]ui/hooks-dialog.ui

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2018-04-20 18:02:03 +0000
+++ src/Makefile.am	2019-04-05 14:32:08 +0000
@@ -23,6 +23,10 @@
 			   hooks.c\
 			   crash.c\
 			   crash.h\
+			   livepatch-tray.c\
+			   livepatch-tray.h\
+			   livepatch-utils.c\
+			   livepatch-utils.h\
 			   update.c\
 			   update.h\
 			   release.c\
@@ -41,7 +45,9 @@
 system_crash_notification_SOURCES = system-crash.c\
 			             system-crash.h
 
-livepatch_notification_SOURCES = livepatch.c
+livepatch_notification_SOURCES = livepatch.c\
+				 livepatch-utils.c\
+				 livepatch-utils.h
 
 update_notifier_LDADD = $(PACKAGE_LIBS) $(INTLLIBS) $(APP_INDICATOR_LIBS)
 update_notifier_LDFLAGS = -export-dynamic

=== added file 'src/livepatch-tray.c'
--- src/livepatch-tray.c	1970-01-01 00:00:00 +0000
+++ src/livepatch-tray.c	2019-04-05 14:32:08 +0000
@@ -0,0 +1,289 @@
+/* livepatch-tray.c
+ * Copyright (C) 2019 Canonical Ltd
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor
+ * Boston, MA  02110-1301 USA.
+ */
+#include <gio/gdesktopappinfo.h>
+#include <glib.h>
+
+#include "update-notifier.h"
+#include "livepatch-tray.h"
+#include "livepatch-utils.h"
+#include "trayappletui.h"
+
+#define LIVEPATCH_COMMON_DIRECTORY "/var/snap/canonical-livepatch/common"
+#define LIVEPATCH_SNAP_DIRECTORY "/snap/canonical-livepatch"
+#define TIMEOUT_SECONDS_DELAY 2
+
+typedef struct _LivepatchTrayAppletPriv LivepatchTrayAppletPriv;
+struct _LivepatchTrayAppletPriv
+{
+  GtkWidget    *menuitem_enabled;
+  GtkWidget    *menuitem_desc;
+
+  GFileMonitor *common_dir_monitor;
+  GFileMonitor *snap_dir_monitor;
+
+  guint         timeout_id;
+};
+
+static void
+on_settings_menuitem_activated(GObject *self, gpointer user_data)
+{
+  g_autoptr(GDesktopAppInfo) info = NULL;
+  g_autoptr(GdkAppLaunchContext) context = NULL;
+  g_autoptr(GError) error = NULL;
+
+  info = g_desktop_app_info_new(LIVEPATCH_DESKTOP_FILE);
+  if (info == NULL)
+    {
+      g_warning("Could not find application '%s'", LIVEPATCH_DESKTOP_FILE);
+      return;
+    }
+
+  context = gdk_display_get_app_launch_context(gdk_display_get_default());
+  if (!g_app_info_launch(G_APP_INFO(info), NULL,
+                         G_APP_LAUNCH_CONTEXT(context), &error))
+    {
+      g_warning("Could not launch application '%s'", LIVEPATCH_DESKTOP_FILE);
+    }
+}
+
+
+static void
+livepatch_trayicon_create_menu(TrayApplet *ta)
+{
+  LivepatchTrayAppletPriv *priv = (LivepatchTrayAppletPriv *) ta->user_data;
+  GtkWidget *menuitem;
+
+  ta->menu = gtk_menu_new();
+
+  priv->menuitem_enabled = gtk_menu_item_new();
+  gtk_widget_set_sensitive(priv->menuitem_enabled, FALSE);
+  gtk_menu_shell_append(GTK_MENU_SHELL(ta->menu), priv->menuitem_enabled);
+
+  priv->menuitem_desc = gtk_menu_item_new();
+  gtk_widget_set_sensitive(priv->menuitem_desc, FALSE);
+  gtk_menu_shell_append(GTK_MENU_SHELL(ta->menu), priv->menuitem_desc);
+
+  menuitem = gtk_separator_menu_item_new();
+  gtk_menu_shell_append(GTK_MENU_SHELL(ta->menu), menuitem);
+
+  menuitem = gtk_menu_item_new_with_label(_("Livepatch Settings…"));
+  gtk_menu_shell_append(GTK_MENU_SHELL(ta->menu), menuitem);
+  g_signal_connect(G_OBJECT(menuitem), "activate",
+                   G_CALLBACK(on_settings_menuitem_activated), ta);
+
+  gtk_widget_show_all(ta->menu);
+}
+
+static gboolean
+check_livepatch(TrayApplet *ta)
+{
+  LivepatchTrayAppletPriv *priv = (LivepatchTrayAppletPriv *) ta->user_data;
+  gboolean show_status_icon;
+  g_autofree gchar *check_state = NULL;
+  g_autofree gchar *state = NULL;
+  g_autoptr(GError) error = NULL;
+
+  show_status_icon = g_settings_get_boolean(ta->un->settings,
+                                            SETTINGS_KEY_SHOW_LIVEPATCH_ICON);
+
+  if (!show_status_icon || !livepatch_is_supported())
+    {
+      tray_applet_ui_set_visible(ta, FALSE);
+
+      priv->timeout_id = 0;
+      return G_SOURCE_REMOVE;
+    }
+
+  tray_applet_ui_set_visible(ta, TRUE);
+
+  if (!livepatch_is_running())
+    {
+      tray_applet_ui_set_icon(ta, "livepatch-off");
+      gtk_menu_item_set_label(GTK_MENU_ITEM(priv->menuitem_enabled),
+                              _("Livepatch is off"));
+      gtk_widget_set_visible(priv->menuitem_desc, FALSE);
+
+      priv->timeout_id = 0;
+      return G_SOURCE_REMOVE;
+    }
+
+  gtk_menu_item_set_label(GTK_MENU_ITEM(priv->menuitem_enabled),
+                          _("Livepatch is on"));
+
+  check_state = livepatch_get_check_state(&error);
+  if (check_state == NULL)
+    g_warning("Cannot get Livepatch check-state: %s", error->message);
+
+  state = livepatch_get_state(&error);
+  if (state == NULL)
+    g_warning("Cannot get Livepatch state: %s", error->message);
+
+  if (!g_strcmp0(check_state, "checked") &&
+      (!g_strcmp0(state, "applied") || !g_strcmp0(state, "nothing-to-apply")))
+    {
+      gssize num_fixes;
+      g_autofree gchar *label = NULL;
+
+      tray_applet_ui_set_icon(ta, "livepatch-on");
+
+      num_fixes = livepatch_get_num_fixes(&error);
+      if (num_fixes == -1)
+        {
+          g_warning("Cannot get applied Livepatch fixes: %s", error->message);
+          num_fixes = 0;
+        }
+
+      gtk_widget_set_visible(priv->menuitem_desc, TRUE);
+
+      if (num_fixes == 0)
+        label = g_strdup(_("No current updates"));
+      else
+        label = g_strdup_printf(ngettext("%" G_GSSIZE_FORMAT " current update",
+                                         "%" G_GSSIZE_FORMAT " current updates",
+                                         num_fixes), num_fixes);
+
+      gtk_menu_item_set_label(GTK_MENU_ITEM(priv->menuitem_desc), label);
+    }
+  else if (!g_strcmp0(check_state, "needs-check") ||
+           !g_strcmp0(state, "unapplied"))
+    {
+      /* Check livepatch status again */
+      return G_SOURCE_CONTINUE;
+    }
+  else
+    {
+      tray_applet_ui_set_icon(ta, "livepatch-warning");
+
+      if (check_state == NULL || !g_strcmp0(check_state, "check-failed"))
+        {
+          gtk_menu_item_set_label(GTK_MENU_ITEM(priv->menuitem_desc),
+            _("An error occured when checking for Livepatch updates."));
+        }
+      else
+        {
+          gtk_menu_item_set_label(GTK_MENU_ITEM(priv->menuitem_desc),
+            _("An error occured when applying Livepatch updates."));
+        }
+    }
+
+    priv->timeout_id = 0;
+    return G_SOURCE_REMOVE;
+}
+
+static void
+gsettings_visibility_changed_cb(GSettings *settings,
+                                gchar     *key,
+                                gpointer   user_data)
+{
+  TrayApplet *ta = (TrayApplet *) user_data;
+  LivepatchTrayAppletPriv *priv = (LivepatchTrayAppletPriv *) ta->user_data;
+
+  if (priv->timeout_id <= 0)
+    priv->timeout_id = g_timeout_add_seconds(0, (GSourceFunc) check_livepatch, ta);
+}
+
+static void
+livepatch_directory_changed_cb(GFileMonitor     *monitor,
+                               GFile            *file,
+                               GFile            *other_file,
+                               GFileMonitorEvent event_type,
+                               gpointer          user_data)
+{
+  TrayApplet *ta = (TrayApplet *) user_data;
+  LivepatchTrayAppletPriv *priv = (LivepatchTrayAppletPriv *) ta->user_data;
+
+  if (priv->timeout_id <= 0)
+    priv->timeout_id = g_timeout_add_seconds(TIMEOUT_SECONDS_DELAY,
+                                             (GSourceFunc) check_livepatch, ta);
+}
+
+void
+livepatch_tray_icon_init(TrayApplet *ta)
+{
+  g_autoptr(GFile) livepatch_common_dir = NULL;
+  g_autoptr(GFile) livepatch_snap_dir = NULL;
+  g_autoptr(GFileMonitor) common_dir_monitor = NULL;
+  g_autoptr(GFileMonitor) snap_dir_monitor = NULL;
+  g_autoptr(GError) error = NULL;
+  LivepatchTrayAppletPriv *priv;
+
+  if (!livepatch_is_supported())
+    return;
+
+  if (!livepatch_has_settings_ui())
+    {
+      g_warning("There is no graphical application installed to manage "
+                "Livepatch. The livepatch status icon will not be displayed.");
+      return;
+    }
+
+  /* Monitor the directory LIVEPATCH_COMMON_DIRECTORY for changes to update
+     the status of the indicator. */
+  livepatch_common_dir = g_file_new_for_path(LIVEPATCH_COMMON_DIRECTORY);
+  common_dir_monitor = g_file_monitor_directory(livepatch_common_dir,
+                                                G_FILE_MONITOR_NONE,
+                                                NULL, &error);
+  if (common_dir_monitor == NULL)
+    {
+        g_warning("Couldn't create directory monitor on %s. Error: %s\n",
+                  LIVEPATCH_COMMON_DIRECTORY, error->message);
+        return;
+    }
+
+  /* We also need to monitor the directory LIVEPATCH_SNAP_DIRECTORY in order to
+     detect if the snap was enabled/disabled. This consider the case
+     canonical-livepatch is enabled but the snap is disabled. */
+  livepatch_snap_dir = g_file_new_for_path(LIVEPATCH_SNAP_DIRECTORY);
+  snap_dir_monitor = g_file_monitor_directory(livepatch_snap_dir,
+                                              G_FILE_MONITOR_WATCH_MOUNTS,
+                                              NULL, &error);
+  if (snap_dir_monitor == NULL)
+    {
+        g_warning("Couldn't create directory monitor on %s. Error: %s\n",
+                  LIVEPATCH_SNAP_DIRECTORY, error->message);
+        return;
+    }
+
+  priv = g_new0(LivepatchTrayAppletPriv, 1);
+  priv->common_dir_monitor = g_steal_pointer(&common_dir_monitor);
+  priv->snap_dir_monitor = g_steal_pointer(&snap_dir_monitor);
+  ta->user_data = priv;
+
+  tray_applet_ui_ensure(ta);
+
+  /* Menu initialization */
+  livepatch_trayicon_create_menu(ta);
+  tray_applet_ui_set_menu(ta, ta->menu);
+
+  g_signal_connect(ta->un->settings,
+                   "changed::"SETTINGS_KEY_SHOW_LIVEPATCH_ICON,
+                   G_CALLBACK(gsettings_visibility_changed_cb), ta);
+  g_signal_connect(priv->common_dir_monitor,
+                   "changed",
+                   G_CALLBACK(livepatch_directory_changed_cb), ta);
+  g_signal_connect(priv->snap_dir_monitor,
+                   "changed",
+                   G_CALLBACK(livepatch_directory_changed_cb), ta);
+
+  /* We always run check_livepatch in a timeout beacuse this allows us to easily
+     check again the status of livepatch if it is in a transistion state (e.g.
+     it is downloading the patches or applying them, etc.) */
+  priv->timeout_id = g_timeout_add_seconds(TIMEOUT_SECONDS_DELAY,
+                                           (GSourceFunc) check_livepatch, ta);
+}

=== added file 'src/livepatch-tray.h'
--- src/livepatch-tray.h	1970-01-01 00:00:00 +0000
+++ src/livepatch-tray.h	2019-04-05 14:32:08 +0000
@@ -0,0 +1,22 @@
+/* livepatch-tray.h
+ * Copyright (C) 2019 Canonical Ltd
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor
+ * Boston, MA  02110-1301 USA.
+ */
+
+#pragma once
+
+void livepatch_tray_icon_init(TrayApplet *ta);

=== added file 'src/livepatch-utils.c'
--- src/livepatch-utils.c	1970-01-01 00:00:00 +0000
+++ src/livepatch-utils.c	2019-04-05 14:32:08 +0000
@@ -0,0 +1,242 @@
+/* livepatch-utils.c
+ * Copyright (C) 2019 Canonical Ltd
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor
+ * Boston, MA  02110-1301 USA.
+ */
+
+#include "livepatch-utils.h"
+
+#include <gio/gdesktopappinfo.h>
+#include <glib.h>
+#include <json-glib/json-glib.h>
+
+#define OS_RELEASE_PATH "/etc/os-release"
+
+GQuark
+livepatch_error_quark(void)
+{
+  static GQuark q = 0;
+
+  if (G_UNLIKELY(!q))
+    q = g_quark_from_static_string("livepatch-error-quark");
+
+  return q;
+}
+
+static GKeyFile *
+parse_osrelease()
+{
+    g_autoptr(GKeyFile) keys = NULL;
+    g_autofree gchar *content = NULL;
+    g_autofree gchar *content_with_group = NULL;
+    const gchar *group = "[os-release]\n";
+    g_autoptr(GError) error = NULL;
+
+    if (!g_file_get_contents(OS_RELEASE_PATH, &content, NULL, &error))
+      {
+        g_warning("Failed to read '%s', error: %s",
+                  OS_RELEASE_PATH, error->message);
+        return NULL;
+      }
+
+    content_with_group = g_strdup_printf("%s%s", group, content);
+
+    keys = g_key_file_new();
+    if (!g_key_file_load_from_data(keys, content_with_group, -1,
+                                   G_KEY_FILE_NONE, &error))
+      {
+        g_warning("Failed to parse /etc/os-release: %s", error->message);
+        return NULL;
+      }
+
+    return g_steal_pointer(&keys);
+}
+
+static JsonNode *
+livepatch_get_status(GError **error)
+{
+  g_autofree gchar *std_output = NULL;
+  g_autofree gchar *std_error = NULL;
+  g_autoptr(JsonParser) json_parser = NULL;
+  JsonNode *root_node;
+
+  if (!g_spawn_command_line_sync("canonical-livepatch status --format=json",
+                                 &std_output, &std_error, NULL, error))
+    return NULL;
+
+  if (std_output == NULL || strlen(std_output) == 0)
+    {
+      if (std_error == NULL || strlen(std_error) == 0)
+        {
+          g_set_error(error,
+                      LIVEPATCH_ERROR, LIVEPATCH_ERROR_CMD_FAILED,
+                      "canonical-livepatch returned an empty status.");
+        }
+      else
+        {
+          g_set_error(error,
+                      LIVEPATCH_ERROR, LIVEPATCH_ERROR_CMD_FAILED,
+                      "canonical-livepatch status returned an error: %s",
+                      std_error);
+        }
+
+      return NULL;
+    }
+
+  json_parser = json_parser_new();
+  if (!json_parser_load_from_data(json_parser, std_output, -1, error))
+    return NULL;
+
+  root_node = json_parser_get_root(json_parser);
+  if (root_node == NULL)
+    {
+      g_set_error(error,
+                  LIVEPATCH_ERROR, LIVEPATCH_ERROR_CMD_FAILED,
+                  "The output of canonical-livepatch has no json root node.");
+      return NULL;
+    }
+
+  return json_node_copy(root_node);
+}
+
+static JsonNode *
+livepatch_get_status_node(const gchar *expr, GError **error)
+{
+  g_autoptr(JsonNode) root = NULL;
+
+  root = livepatch_get_status(error);
+  if (root == NULL)
+    return NULL;
+
+  return json_path_query(expr, root, error);
+}
+
+gboolean
+livepatch_has_settings_ui()
+{
+  g_autoptr(GDesktopAppInfo) info = NULL;
+
+  info = g_desktop_app_info_new(LIVEPATCH_DESKTOP_FILE);
+  return info != NULL;
+}
+
+gboolean
+livepatch_is_supported()
+{
+  g_autoptr(GKeyFile) file = NULL;
+  g_autofree gchar *version = NULL;
+  g_autoptr(GError) error = NULL;
+
+  file = parse_osrelease();
+  if (file == NULL)
+    return FALSE;
+
+  version = g_key_file_get_string(file, "os-release", "VERSION", &error);
+  if (version == NULL)
+    {
+      g_warning("Failed to get the version from the file %s: %s",
+                OS_RELEASE_PATH, error->message);
+      return FALSE;
+    }
+
+  return g_strstr_len(version, -1, "LTS") != NULL;
+}
+
+gboolean
+livepatch_is_running()
+{
+  g_autoptr(JsonNode) result_node = NULL;
+  JsonNode *running_node = NULL;
+  JsonArray *result_array;
+
+  result_node = livepatch_get_status_node("$.Status[0].Running", NULL);
+  if (result_node == NULL)
+    return FALSE;
+
+  result_array = json_node_get_array(result_node);
+
+  if (json_array_get_length(result_array) == 0)
+    return FALSE;
+
+  running_node = json_array_get_element(result_array, 0);
+  return json_node_get_boolean(running_node);
+}
+
+gchar *
+livepatch_get_state(GError **error)
+{
+  g_autoptr(JsonNode) result_node = NULL;
+  JsonNode *state_node = NULL;
+  JsonArray *result_array;
+  const gchar *expr = "$.Status[0].Livepatch.State";
+
+  result_node = livepatch_get_status_node(expr, error);
+  if (result_node == NULL)
+    return NULL;
+
+  result_array = json_node_get_array(result_node);
+
+  if (json_array_get_length(result_array) == 0)
+    {
+      g_set_error(error,
+                  LIVEPATCH_ERROR, LIVEPATCH_ERROR_NOMATCH,
+                  "No matches for: %s", expr);
+      return NULL;
+    }
+
+  state_node = json_array_get_element(result_array, 0);
+  return g_strdup(json_node_get_string(state_node));
+}
+
+gchar *
+livepatch_get_check_state(GError **error)
+{
+  g_autoptr(JsonNode) result_node = NULL;
+  JsonNode *state_node = NULL;
+  JsonArray *result_array;
+  const gchar *expr = "$.Status[0].Livepatch.CheckState";
+
+  result_node = livepatch_get_status_node(expr, error);
+  if (result_node == NULL)
+    return NULL;
+
+  result_array = json_node_get_array(result_node);
+
+  if (json_array_get_length(result_array) == 0)
+    {
+      g_set_error(error,
+                  LIVEPATCH_ERROR, LIVEPATCH_ERROR_NOMATCH,
+                  "No matches for: %s", expr);
+      return NULL;
+    }
+
+  state_node = json_array_get_element(result_array, 0);
+  return g_strdup(json_node_get_string(state_node));
+}
+
+gssize
+livepatch_get_num_fixes(GError **error)
+{
+  g_autoptr(JsonNode) node = NULL;
+  JsonArray *array;
+
+  node = livepatch_get_status_node("$.Status[0].Livepatch.Fixes[*]", error);
+  if (node == NULL)
+    return -1;
+
+  array = json_node_get_array(node);
+  return json_array_get_length(array);
+}

=== added file 'src/livepatch-utils.h'
--- src/livepatch-utils.h	1970-01-01 00:00:00 +0000
+++ src/livepatch-utils.h	2019-04-05 14:32:08 +0000
@@ -0,0 +1,39 @@
+/* livepatch-utils.h
+ * Copyright (C) 2019 Canonical Ltd
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor
+ * Boston, MA  02110-1301 USA.
+ */
+
+#pragma once
+
+#include <gio/gio.h>
+
+#define LIVEPATCH_ERROR livepatch_error_quark()
+#define LIVEPATCH_DESKTOP_FILE "software-properties-livepatch.desktop"
+
+typedef enum
+{
+  LIVEPATCH_ERROR_CMD_FAILED,
+  LIVEPATCH_ERROR_NOMATCH
+} LivepatchError;
+
+
+gboolean livepatch_has_settings_ui ();
+gboolean livepatch_is_supported    ();
+gboolean livepatch_is_running      ();
+gchar*   livepatch_get_state       (GError **error);
+gchar*   livepatch_get_check_state (GError **error);
+gssize   livepatch_get_num_fixes   (GError **error);

=== modified file 'src/livepatch.c'
--- src/livepatch.c	2018-11-12 15:58:56 +0000
+++ src/livepatch.c	2019-04-05 14:32:08 +0000
@@ -2,14 +2,14 @@
 #include "config.h"
 #endif
 
-#include <errno.h>
+#include <gio/gdesktopappinfo.h>
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <libnotify/notify.h>
-#include <stdlib.h>
 #include <sys/sysinfo.h>
 
 #include "update-notifier.h"
+#include "livepatch-utils.h"
 
 #define STATUS_PATH "/var/snap/canonical-livepatch/current/status"
 
@@ -29,37 +29,54 @@
 }
 
 static void
+notify_action_cb (NotifyNotification *notification,
+                  char *action,
+                  gpointer user_data)
+{
+    g_autoptr(GDesktopAppInfo) info = NULL;
+    g_autoptr(GdkAppLaunchContext) context = NULL;
+    g_autoptr(GError) error = NULL;
+
+    info = g_desktop_app_info_new (LIVEPATCH_DESKTOP_FILE);
+    if (!info) {
+        g_warning ("Could not find application '%s'", LIVEPATCH_DESKTOP_FILE);
+        return;
+    }
+
+    context = gdk_display_get_app_launch_context (gdk_display_get_default ());
+    if (!g_app_info_launch (G_APP_INFO (info), NULL, G_APP_LAUNCH_CONTEXT (context), &error)) {
+        g_warning ("Could not launch application '%s'", LIVEPATCH_DESKTOP_FILE);
+    }
+}
+
+static gboolean
 show_notification (const char *summary, const char *body, const char *icon)
 {
-    NotifyNotification *n = notify_notification_new (summary, body, icon);
+    NotifyNotification *n;
+    g_autoptr(GError) error = NULL;
+
+    n = notify_notification_new (summary, body, icon);
     notify_notification_set_timeout (n, 60000);
-    notify_notification_show (n, NULL);
-    g_object_unref (n);
-}
-
-static void
-get_event_from_file (const char* filename, char **event, char **description)
-{
-    g_autofree gchar *content = NULL;
-
-    g_return_if_fail (filename != NULL);
-    g_return_if_fail (event != NULL);
-    g_return_if_fail (description != NULL);
-
-    *event = *description = NULL;
-
-    g_file_get_contents (filename, &content, NULL, NULL);
-
-    if (content) {
-        gchar **strings = g_strsplit (content, " ", 2);
-
-        if (g_strv_length (strings) > 0)
-            *event = g_strdup (g_strstrip (strings[0]));
-        if (g_strv_length (strings) > 1)
-            *description = g_strdup (g_strstrip (strings[1]));
-
-        g_strfreev (strings);
-    }
+
+    if (livepatch_has_settings_ui()) {
+        notify_notification_add_action (n, "settings", _("Show Settings…"),
+                                        notify_action_cb, NULL, NULL);
+        notify_notification_add_action (n, "default", _("Show Settings…"),
+                                        notify_action_cb, NULL, NULL);
+    } else {
+        g_warning ("There is no graphical application installed to manage "
+                   "Livepatch. The notification will not have a "
+                   "'Show Settings…' button.");
+    }
+
+    g_signal_connect (n, "closed", G_CALLBACK (gtk_main_quit), NULL);
+
+    if (!notify_notification_show (n, &error)) {
+        g_warning ("Could not show notification: '%s", error->message);
+        return FALSE;
+    }
+
+    return TRUE;
 }
 
 static long
@@ -94,51 +111,39 @@
     return difftime (status_stat.st_mtim.tv_sec, boot_timestamp) >= 0;
 }
 
-static void
+static gboolean
 show_status_notification ()
 {
-    g_autofree gchar *event = NULL;
-    g_autofree gchar *description = NULL;
+    g_autofree gchar *state = NULL;
+    g_autoptr(GError) error = NULL;
 
     if (!g_file_test (STATUS_PATH, G_FILE_TEST_EXISTS))
-        return;
+        return FALSE;
 
     if (!file_modified_after_boot (STATUS_PATH))
-        return;
-
-    get_event_from_file (STATUS_PATH, &event, &description);
-
-    if (g_strcmp0 (event, "applied") == 0) {
-        g_autofree gchar *body = NULL;
-        gchar *endptr;
-        gboolean is_overflow, conversion_failed;
-
-        errno = 0;
-        guint64 num_updates = g_ascii_strtoull (description, &endptr, 10);
-        is_overflow = (num_updates == G_MAXUINT64 && errno == ERANGE);
-        conversion_failed = (num_updates == 0 && description == endptr);
-
-        if (is_overflow || conversion_failed) {
-            g_warning ("Failed to parse the status file");
-        } else if (num_updates != 0) {
-            body = g_strdup_printf (
-                ngettext ("%" G_GUINT64_FORMAT " Livepatch update has been successfully applied.",
-                          "%" G_GUINT64_FORMAT " Livepatch updates have been successfully applied.",
-                          num_updates),
-                num_updates);
-
-            show_notification (_("Canonical Livepatch"), body, NULL);
-        }
+        return FALSE;
+
+    state = livepatch_get_state (&error);
+    if (state == NULL) {
+        g_warning ("Failed to get Livepatch state: %s", error->message);
+        return FALSE;
     }
+
+    if (g_strcmp0(state, "applied") != 0)
+        return FALSE;
+
+    return show_notification ("Livepatch", _("An update has just been applied."), NULL);
 }
 
 int
 main (int argc, char **argv)
 {
+    gtk_init (&argc, &argv);
     init_notification ();
     init_gettext ();
 
-    show_status_notification ();
+    if (show_status_notification ())
+        gtk_main ();
 
     return EXIT_SUCCESS;
 }

=== modified file 'src/update-notifier.c'
--- src/update-notifier.c	2019-01-17 14:17:33 +0000
+++ src/update-notifier.c	2019-04-05 14:32:08 +0000
@@ -41,6 +41,7 @@
 #include <gio/gio.h>
 
 #include "update-notifier.h"
+#include "livepatch-tray.h"
 #include "update.h"
 #include "hooks.h"
 #include "uevent.h"
@@ -475,6 +476,11 @@
    trayapplet_create(un->crashreport, un, "apport");
    crashreport_tray_icon_init(un->crashreport);
 
+   /* livepatch icon */
+   un->livepatch = g_new0(TrayApplet, 1);
+   trayapplet_create(un->livepatch, un, "livepatch");
+   livepatch_tray_icon_init(un->livepatch);
+
    return FALSE; // for the tray_destroyed_cb
 }
 

=== modified file 'src/update-notifier.h'
--- src/update-notifier.h	2018-06-27 08:00:27 +0000
+++ src/update-notifier.h	2019-04-05 14:32:08 +0000
@@ -37,6 +37,7 @@
 #define SETTINGS_KEY_END_SYSTEM_UIDS "end-system-uids"
 #define SETTINGS_KEY_AUTO_LAUNCH_INTERVAL "regular-auto-launch-interval"
 #define SETTINGS_KEY_LAST_RELEASE_CHECK "release-check-time"
+#define SETTINGS_KEY_SHOW_LIVEPATCH_ICON "show-livepatch-status-icon"
 
 #define SETTINGS_UM_SCHEMA "com.ubuntu.update-manager"
 #define SETTINGS_UM_KEY_LAST_LAUNCH "launch-time"
@@ -102,6 +103,7 @@
    TrayApplet *update;
    TrayApplet *hook;
    TrayApplet *crashreport;
+   TrayApplet *livepatch;
 
    guint update_finished_timer;