Merge lp:~azzar1/update-notifier/livepatch-notification-button into lp:update-notifier/ubuntu

[Andrea Azzarone]

src/livepatch.c: Add a "Settings..." button to the notification.

[lp:~azzar1/update-notifier/livepatch-notification-button]

951. By Andrea Azzarone on 2019-01-30

src/livepatch.c: Add a "Settings..." button to the notification.

[Sebastien Bacher (seb128)]

Thank you for your work, that looks mostly fine, I'm unsure why you add the action twice though?

+ if (info) {
+ 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);

Wouldn't one be enough?

review: Needs Information

[Andrea Azzarone (azzar1)]

> Thank you for your work, that looks mostly fine, I'm unsure why you add the
> action twice though?
>
> + if (info) {
> + 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);
>
> Wouldn't one be enough?

One is to add a button, one is to open software properties if you click on the notification.

[Sebastien Bacher (seb128)]

Thanks

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2019-01-07 16:32:46 +0000
+++ debian/changelog	2019-01-30 17:24:03 +0000
@@ -1,3 +1,9 @@
+update-notifier (3.192.12) UNRELEASED; urgency=medium
+
+  * src/livepatch.c: Add a "Settings..." button to the notification.
+
+ -- Andrea Azzarone <[e-mail]>  Wed, 30 Jan 2019 17:20:42 +0000
+
 update-notifier (3.192.11) disco; urgency=medium
 
   * src/update-notifier.c: Don't use G_SPAWN_DO_NOT_REAP_CHILD in order

=== modified file 'src/livepatch.c'
--- src/livepatch.c	2018-11-12 09:52:00 +0000
+++ src/livepatch.c	2019-01-30 17:24:03 +0000
@@ -3,6 +3,7 @@
 #endif
 
 #include <errno.h>
+#include <gio/gdesktopappinfo.h>
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <libnotify/notify.h>
@@ -11,6 +12,7 @@
 
 #include "update-notifier.h"
 
+#define LIVEPATCH_DESKTOP_FILE "software-properties-livepatch.desktop"
 #define STATUS_PATH "/var/snap/canonical-livepatch/current/status"
 
 static void
@@ -29,12 +31,55 @@
 }
 
 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(GDesktopAppInfo) info = NULL;
+    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);
+
+    info = g_desktop_app_info_new (LIVEPATCH_DESKTOP_FILE);
+    if (info) {
+        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 ("Could not find application '%s'. The notification will not "
+                   "have a 'Show Settings…' button.", LIVEPATCH_DESKTOP_FILE);
+    }
+
+    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 void
@@ -94,17 +139,17 @@
     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;
 
     if (!g_file_test (STATUS_PATH, G_FILE_TEST_EXISTS))
-        return;
+        return FALSE;
 
     if (!file_modified_after_boot (STATUS_PATH))
-        return;
+        return FALSE;
 
     get_event_from_file (STATUS_PATH, &event, &description);
 
@@ -120,6 +165,7 @@
 
         if (is_overflow || conversion_failed) {
             g_warning ("Failed to parse the status file");
+            return FALSE;
         } else if (num_updates != 0) {
             body = g_strdup_printf (
                 ngettext ("%" G_GUINT64_FORMAT " Livepatch update has been successfully applied.",
@@ -127,18 +173,22 @@
                           num_updates),
                 num_updates);
 
-            show_notification (_("Canonical Livepatch"), body, NULL);
+            return show_notification (_("Canonical Livepatch"), body, NULL);
         }
     }
+
+    return FALSE;
 }
 
 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;
 }