Merge lp:~azzar1/update-notifier/xdg-autostart-path-units into lp:update-notifier/ubuntu

[Andrea Azzarone]

Add /etc/xdg/autostart/ desktop files to start systemd path units that require graphical-session.target.

[Sebastien Bacher (seb128)]

Thank you for your work, I didn't review the code changes yet but some comment for translations
- you need to prefix the translatable key with an underscore in the .desktop.in, e.g "_Name="
- you need to list the new files in po/POTFILES.in
- the strings are new in the template so that's going to require a UIFe

Is the systemd code to see if an unit is active copied from somewhere else/a well defined way to get that info or something new you wrote for this specific need? (to know how much checking that part needs)

review: Needs Fixing

[lp:~azzar1/update-notifier/xdg-autostart-path-units]

924. By Andrea Azzarone on 2018-04-11

Make Name and Comment translatable.

[Andrea Azzarone (azzar1)]

> Thank you for your work, I didn't review the code changes yet but some comment
> for translations
> - you need to prefix the translatable key with an underscore in the
> .desktop.in, e.g "_Name="
> - you need to list the new files in po/POTFILES.in
> - the strings are new in the template so that's going to require a UIFe

Done!

>
> Is the systemd code to see if an unit is active copied from somewhere else/a
> well defined way to get that info or something new you wrote for this specific
> need? (to know how much checking that part needs)

I did not copy it.

[Sebastien Bacher (seb128)]

looks fine now

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2009-11-16 17:10:48 +0000
+++ .bzrignore	2018-04-11 12:48:56 +0000
@@ -29,3 +29,7 @@
 src/update-notifier
 data/update-notifier.desktop
 data/update-notifier.schemas
+data/update-notifier-avhai.desktop
+data/update-notifier-crash.desktop
+data/update-notifier-livepatch.desktop
+data/update-notifier-release.desktop

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2017-09-29 14:37:12 +0000
+++ data/Makefile.am	2018-04-11 12:48:56 +0000
@@ -1,7 +1,11 @@
 @INTLTOOL_DESKTOP_RULE@
 
 desktopdir       = $(sysconfdir)/xdg/autostart
-desktop_in_files = update-notifier.desktop.in
+desktop_in_files = update-notifier.desktop.in \
+                   update-notifier-avhai.desktop.in \
+                   update-notifier-crash.desktop.in \
+                   update-notifier-livepatch.desktop.in \
+                   update-notifier-release.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
 @INTLTOOL_XML_NOMERGE_RULE@

=== added file 'data/update-notifier-avhai.desktop.in'
--- data/update-notifier-avhai.desktop.in	1970-01-01 00:00:00 +0000
+++ data/update-notifier-avhai.desktop.in	2018-04-11 12:48:56 +0000
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+_Name=Avhai Disabled Notifier
+_Comment=Notification regarding avahi disabled due to .local domain
+Icon=update-notifier
+Exec=systemctl --user start unicast-local-avahi.path
+Terminal=false
+Type=Application
+Categories=
+NotShowIn=KDE;
+NoDisplay=true
+X-Ubuntu-Gettext-Domain=update-notifier
\ No newline at end of file

=== added file 'data/update-notifier-crash.desktop.in'
--- data/update-notifier-crash.desktop.in	1970-01-01 00:00:00 +0000
+++ data/update-notifier-crash.desktop.in	2018-04-11 12:48:56 +0000
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+_Name=Crash Report Notifier
+_Comment=Notification regarding a crash report
+Icon=update-notifier
+Exec=systemctl --user start update-notifier-crash.path
+Terminal=false
+Type=Application
+Categories=
+NotShowIn=KDE;
+NoDisplay=true
+X-Ubuntu-Gettext-Domain=update-notifier
\ No newline at end of file

=== added file 'data/update-notifier-livepatch.desktop.in'
--- data/update-notifier-livepatch.desktop.in	1970-01-01 00:00:00 +0000
+++ data/update-notifier-livepatch.desktop.in	2018-04-11 12:48:56 +0000
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+_Name=Livepatch Notifier
+_Comment=Notification regarding Canonical Livepatch
+Icon=update-notifier
+Exec=systemctl --user start update-notifier-livepatch.path
+Terminal=false
+Type=Application
+Categories=
+NotShowIn=KDE;
+NoDisplay=true
+X-Ubuntu-Gettext-Domain=update-notifier
\ No newline at end of file

=== added file 'data/update-notifier-release.desktop.in'
--- data/update-notifier-release.desktop.in	1970-01-01 00:00:00 +0000
+++ data/update-notifier-release.desktop.in	2018-04-11 12:48:56 +0000
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+_Name=New Release Notifier
+_Comment=Notification regarding a new release of Ubuntu
+Icon=update-notifier
+Exec=systemctl --user start update-notifier-release.path
+Terminal=false
+Type=Application
+Categories=
+NotShowIn=KDE;
+NoDisplay=true
+X-Ubuntu-Gettext-Domain=update-notifier
\ No newline at end of file

=== modified file 'debian/update-notifier.install'
--- debian/update-notifier.install	2017-09-29 14:37:12 +0000
+++ debian/update-notifier.install	2018-04-11 12:48:56 +0000
@@ -1,4 +1,4 @@
-etc/xdg/autostart/update-notifier.desktop
+etc/xdg/autostart/
 usr/share/update-notifier/ui/hooks-dialog.ui
 usr/share/icons/hicolor/16x16/
 usr/share/icons/hicolor/22x22/

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2017-08-21 17:30:53 +0000
+++ po/POTFILES.in	2018-04-11 12:48:56 +0000
@@ -16,6 +16,10 @@
 [type: gettext/glade]ui/hooks-dialog.ui
 data/com.ubuntu.update-notifier.gschema.xml.in
 data/com.ubuntu.update-notifier.policy.in
+data/update-notifier-avhai.desktop.in
+data/update-notifier-crash.desktop.in
+data/update-notifier-livepatch.desktop.in
+data/update-notifier-release.desktop.in
 data/update-notifier.desktop.in
 [type: gettext/rfc822deb] data/package-data-downloads-failed.in
 [type: gettext/rfc822deb] data/package-data-downloads-failed-permanently.in

=== modified file 'src/update-notifier.c'
--- src/update-notifier.c	2017-09-06 09:31:58 +0000
+++ src/update-notifier.c	2018-04-11 12:48:56 +0000
@@ -201,6 +201,83 @@
 	return TRUE;
 }
 
+static void
+systemd_dbus_init(UpgradeNotifier *un)
+{
+   g_autoptr(GDBusConnection) conn = NULL;
+   g_autoptr(GError) error = NULL;
+
+   conn = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, &error);
+
+   if (!conn) {
+      g_warning("DBUS cannot connect: %s", error->message);
+      return;
+   }
+
+
+   un->sm_proxy = g_dbus_proxy_new_sync(conn,
+					G_DBUS_PROXY_FLAGS_NONE,
+					NULL,
+					"org.freedesktop.systemd1",
+					"/org/freedesktop/systemd1",
+					"org.freedesktop.systemd1.Manager",
+					NULL,
+					&error);
+
+   if (!un->sm_proxy) {
+      g_debug("Could not get DBUS proxy: org.freedesktop.systemd1: %s", error->message);
+      return;
+   }
+}
+
+static gboolean
+is_systemd_unit_active(UpgradeNotifier *un, const gchar* unit)
+{
+   GDBusConnection *conn = NULL;
+   g_autoptr(GVariant) up_variant = NULL;
+   g_autoptr(GVariant) ret_variant = NULL;
+   g_autoptr(GVariant) us_variant = NULL;
+   g_autofree gchar *unit_path = NULL;
+   g_autofree gchar *unit_state = NULL;
+   g_autoptr(GError) error = NULL;
+
+   g_return_val_if_fail(un != NULL, FALSE);
+   g_return_val_if_fail(un->sm_proxy != NULL, FALSE);
+   g_return_val_if_fail(unit != NULL, FALSE);
+
+   up_variant = g_dbus_proxy_call_sync(un->sm_proxy,
+				       "GetUnit",
+				       g_variant_new("(s)", unit),
+				       G_DBUS_CALL_FLAGS_NONE,
+				       -1, NULL, &error);
+ 
+   if (!up_variant) {
+      g_debug("Failed to call GetUnit method: %s", error->message);
+      return FALSE;
+   }
+
+   conn = g_dbus_proxy_get_connection(un->sm_proxy);
+
+   g_variant_get (up_variant, "(o)", &unit_path);
+   ret_variant = g_dbus_connection_call_sync(conn,
+					     "org.freedesktop.systemd1",
+					     unit_path,
+					     "org.freedesktop.DBus.Properties",
+					     "Get",
+					     g_variant_new("(ss)", "org.freedesktop.systemd1.Unit", "ActiveState"),
+					     G_VARIANT_TYPE("(v)"),
+					     G_DBUS_CALL_FLAGS_NONE,
+					     -1, NULL, &error);
+
+   if (!ret_variant) {
+      g_warning("Failed to get the ActiveState property of %s unit: %s", unit, error->message);
+      return FALSE;
+   }
+
+   g_variant_get (ret_variant, "(v)", &us_variant);
+   return g_strcmp0("active", g_variant_get_string(us_variant, NULL)) == 0;
+}
+
 /* 
  the following files change:
  on "install":
@@ -377,9 +454,11 @@
       CRASHREPORT_DIR,
       NULL};
    for(i=0;monitor_dirs[i] != NULL;i++) {
-      if (getenv("UPSTART_SESSION") && monitor_dirs[i] == CRASHREPORT_DIR) {
+      if ((g_strcmp0(CRASHREPORT_DIR, monitor_dirs[i]) == 0) &&
+          (getenv("UPSTART_SESSION") || is_systemd_unit_active(un, "update-notifier-crash.path"))) {
          continue;
       }
+
       GError *error = NULL;
       GFile *gf = g_file_new_for_path(monitor_dirs[i]);
       monitor_handle = g_file_monitor_directory(gf, 0, NULL, &error);
@@ -397,9 +476,11 @@
       UNICAST_LOCAL_AVAHI_FILE,
       NULL};
    for(i=0;monitor_files[i] != NULL;i++) {
-      if (getenv("UPSTART_SESSION") && monitor_files[i] == UNICAST_LOCAL_AVAHI_FILE) {
+      if ((g_strcmp0(UNICAST_LOCAL_AVAHI_FILE, monitor_dirs[i]) == 0) &&
+          (getenv("UPSTART_SESSION") || is_systemd_unit_active(un, "unicast-local-avahi.path"))) {
          continue;
       }
+
       GError *error = NULL;
       GFile *gf = g_file_new_for_path(monitor_files[i]);
       monitor_handle = g_file_monitor_file(gf, 0, NULL, &error);
@@ -610,6 +691,9 @@
 #ifdef ENABLE_SCP
 	uevent_init();
 #endif
+	// init systemd dbus proxy
+	systemd_dbus_init (un);
+
 	// init gio file monitoring
 	monitor_init (un);
 

=== modified file 'src/update-notifier.h'
--- src/update-notifier.h	2016-07-20 17:23:40 +0000
+++ src/update-notifier.h	2018-04-11 12:48:56 +0000
@@ -90,6 +90,8 @@
 {
    GSettings *settings;
 
+   GDBusProxy *sm_proxy;
+
    TrayApplet *update;
    TrayApplet *hook;
    TrayApplet *crashreport;