Merge lp:~azzar1/update-notifier/hide-livepatch-indicator-if-disabled into lp:update-notifier/ubuntu

[Andrea Azzarone]

* pixmaps/scalable/livepatch-off.svg:
   - Remove as no longer needed.
* src/livepatch-tray.c:
   - Don't show the Livepatch indicator if livepatch is disabled.

[Sebastien Bacher (seb128)]

Thanks!

review: Approve

=== removed file 'pixmaps/scalable/livepatch-off.svg'
--- pixmaps/scalable/livepatch-off.svg	2019-03-13 10:05:20 +0000
+++ pixmaps/scalable/livepatch-off.svg	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-<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

=== modified file 'src/livepatch-tray.c'
--- src/livepatch-tray.c	2019-03-15 16:48:29 +0000
+++ src/livepatch-tray.c	2019-04-26 13:35:53 +0000
@@ -102,7 +102,9 @@
   show_status_icon = g_settings_get_boolean(ta->un->settings,
                                             SETTINGS_KEY_SHOW_LIVEPATCH_ICON);
 
-  if (!show_status_icon || !livepatch_is_supported())
+  if (!show_status_icon ||
+      !livepatch_is_supported() || 
+      !livepatch_is_running ())
     {
       tray_applet_ui_set_visible(ta, FALSE);
 
@@ -112,17 +114,6 @@
 
   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"));