[gnome-software/wip/ubuntu-xenial: 205/208] Merge tag 'GNOME_SOFTWARE_3_20_3' into wip/ubuntu-xenial

[Robert Ancell <rancell src gnome org>]

commit dab6c9f0d2d5159a949f7bdb4b6d535a9b8982cc
Merge: 341c0ba 5034ddb
Author: Robert Ancell <robert ancell canonical com>
Date:   Mon Aug 15 15:58:55 2016 +1200

    Merge tag 'GNOME_SOFTWARE_3_20_3' into wip/ubuntu-xenial

 RELEASE                                        |    6 +-
 configure.ac                                   |    4 +-
 data/appdata/org.gnome.Software.appdata.xml.in |   12 +
 po/ja.po                                       |   25 +-
 po/nb.po                                       |  457 ++++----
 po/pt.po                                       | 1648 ++++++++++++++----------
 po/th.po                                       | 1184 ++++++++++-------
 po/zh_CN.po                                    |  904 +++++++------
 src/gs-app.h                                   |    1 +
 src/gs-review-row.c                            |    2 +-
 src/gs-shell-details.c                         |    2 +-
 src/gs-shell-installed.c                       |   33 +-
 src/gs-shell-updates.c                         |   48 +-
 src/gs-update-monitor.c                        |  111 +--
 src/gs-utils.c                                 |  160 ++-
 src/gs-utils.h                                 |    4 +
 src/plugins/Makefile.am                        |   12 +-
 src/plugins/gs-appstream.c                     |   10 +-
 src/plugins/gs-plugin-packagekit-refine.c      |   11 +-
 src/plugins/gs-plugin-packagekit.c             |   14 +-
 src/plugins/gs-plugin-systemd-updates.c        |   36 +-
 21 files changed, 2657 insertions(+), 2027 deletions(-)
---
diff --cc src/gs-utils.h
index c7cc175,c28e125..b6b0ab5
--- a/src/gs-utils.h
+++ b/src/gs-utils.h
@@@ -70,11 -69,11 +70,15 @@@ gboolean    gs_utils_is_current_desktop    (
  gboolean       gs_utils_is_current_desktop    (const gchar    *name);
  void           gs_utils_widget_set_custom_css (GtkWidget      *widget,
                                                 const gchar    *css);
+ void           gs_utils_show_error_dialog     (GtkWindow      *parent,
+                                                const gchar    *title,
+                                                const gchar    *msg,
+                                                const gchar    *details);
  
 +gboolean       gs_utils_is_current_desktop    (const gchar    *name);
 +
 +GDesktopAppInfo *gs_utils_get_desktop_app_info        (const gchar    *id);
 +
  G_END_DECLS
  
  #endif /* __GS_UTILS_H */
diff --cc src/plugins/gs-plugin-systemd-updates.c
index eb1b4ec,b46b8d9..ce2d836
--- a/src/plugins/gs-plugin-systemd-updates.c
+++ b/src/plugins/gs-plugin-systemd-updates.c
@@@ -139,14 -139,40 +139,40 @@@ gs_plugin_add_updates (GsPlugin *plugin
        return TRUE;
  }
  
+ static gboolean
+ gs_plugin_systemd_updates_requires_trigger (GsApp *app)
+ {
+       GPtrArray *related;
+       guint i;
+ 
+       /* look at related apps too */
+       related = gs_app_get_related (app);
+       for (i = 0; i < related->len; i++) {
+               GsApp *app_tmp = g_ptr_array_index (related, i);
+               if (gs_plugin_systemd_updates_requires_trigger (app_tmp))
+                       return TRUE;
+       }
+ 
+       /* if we can process this online do not require a trigger */
+       if (gs_app_get_state (app) != AS_APP_STATE_UPDATABLE)
+               return FALSE;
+ 
+       /* only process this app if was created by this plugin */
+       if (g_strcmp0 (gs_app_get_management_plugin (app), "packagekit") != 0)
+               return FALSE;
+ 
+       /* success! */
+       return TRUE;
+ }
+ 
  /**
 - * gs_plugin_offline_update:
 + * gs_plugin_update:
   */
  gboolean
 -gs_plugin_offline_update (GsPlugin *plugin,
 -                          GList *apps,
 -                          GCancellable *cancellable,
 -                          GError **error)
 +gs_plugin_update (GsPlugin *plugin,
 +                GList *apps,
 +                GCancellable *cancellable,
 +                GError **error)
  {
        GList *l;