[gnome-software/wip/ubuntu-xenial: 206/208] Merge tag 'GNOME_SOFTWARE_3_20_4' into wip/ubuntu-xenial

[Robert Ancell <rancell src gnome org>]

commit e97bd5e373fc8fef6bfce88fcd8f0c43e105b74a
Merge: dab6c9f 1826dd2
Author: Robert Ancell <robert ancell canonical com>
Date:   Mon Aug 15 16:06:22 2016 +1200

    Merge tag 'GNOME_SOFTWARE_3_20_4' into wip/ubuntu-xenial

 RELEASE                                        |    6 +-
 configure.ac                                   |    2 +-
 data/appdata/org.gnome.Software.appdata.xml.in |   16 +
 po/fur.po                                      |  269 ++++++++--------
 po/tr.po                                       |  411 ++++++++++++------------
 src/gs-app-row.c                               |    6 +-
 src/gs-app.c                                   |    1 +
 src/gs-application.c                           |    6 +
 src/gs-plugin-loader.c                         |   21 +-
 src/gs-plugin.c                                |    2 +-
 src/gs-plugin.h                                |    6 +-
 src/gs-review-row.c                            |    8 +-
 src/gs-review-row.ui                           |   99 +++---
 src/gs-shell-installed.c                       |    3 +-
 src/gs-shell-updates.c                         |   13 +-
 src/gs-star-widget.c                           |   10 +-
 src/gs-update-dialog.c                         |    2 +-
 src/gs-update-monitor.c                        |   15 +-
 src/gs-upgrade-banner.ui                       |    2 +
 src/gtk-style.css                              |   30 ++-
 src/plugins/gs-appstream.c                     |   25 ++-
 src/plugins/gs-plugin-epiphany.c               |   13 +-
 src/plugins/gs-plugin-fedora-distro-upgrades.c |   32 ++-
 src/plugins/gs-plugin-hardcoded-blacklist.c    |    1 -
 src/plugins/gs-plugin-odrs.c                   |    4 +-
 src/plugins/gs-plugin-packagekit-refine.c      |   11 +-
 src/plugins/gs-plugin-packagekit-refresh.c     |    4 +-
 src/plugins/gs-plugin-packagekit-upgrade.c     |    2 +-
 src/plugins/gs-plugin-packagekit.c             |    9 +-
 src/plugins/packagekit-common.c                |    8 +-
 30 files changed, 584 insertions(+), 453 deletions(-)
---
diff --cc src/gs-app-row.c
index 193e88e,f1114f9..1f46c88
--- a/src/gs-app-row.c
+++ b/src/gs-app-row.c
@@@ -82,11 -82,9 +82,10 @@@ gs_app_row_get_description (GsAppRow *a
  {
        GsAppRowPrivate *priv = gs_app_row_get_instance_private (app_row);
        const gchar *tmp = NULL;
-       g_autofree gchar *escaped = NULL;
  
        /* convert the markdown update description into PangoMarkup */
 -      if (priv->show_update &&
 +      /* NOTE: Disabled on Ubuntu since the Debian changelog doesn't display well */
 +      /*if (priv->show_update &&
            (gs_app_get_state (priv->app) == AS_APP_STATE_UPDATABLE ||
             gs_app_get_state (priv->app) == AS_APP_STATE_UPDATABLE_LIVE)) {
                tmp = gs_app_get_update_details (priv->app);
diff --cc src/gs-plugin.h
index 49d0272,a95ed0b..bd1c044
--- a/src/gs-plugin.h
+++ b/src/gs-plugin.h
@@@ -137,8 -138,7 +138,9 @@@ typedef enum 
        GS_PLUGIN_REFRESH_FLAGS_NONE                    = 0,
        GS_PLUGIN_REFRESH_FLAGS_METADATA                = 1 << 0,
        GS_PLUGIN_REFRESH_FLAGS_PAYLOAD                 = 1 << 1,
-       GS_PLUGIN_REFRESH_FLAGS_UPDATES                 = 1 << 2,
-       GS_PLUGIN_REFRESH_FLAGS_UI                      = 1 << 3,
+       GS_PLUGIN_REFRESH_FLAGS_INTERACTIVE             = 1 << 2,
++      GS_PLUGIN_REFRESH_FLAGS_UPDATES                 = 1 << 3,
++      GS_PLUGIN_REFRESH_FLAGS_UI                      = 1 << 4,
        /*< private >*/
        GS_PLUGIN_REFRESH_FLAGS_LAST
  } GsPluginRefreshFlags;
diff --cc src/gs-shell-updates.c
index be716a2,6bfaa41..cafc28b
--- a/src/gs-shell-updates.c
+++ b/src/gs-shell-updates.c
@@@ -1130,11 -1093,16 +1130,16 @@@ upgrade_reboot_failed_cb (GObject *sour
                           error->message);
        }
  
+       app = gs_upgrade_banner_get_app (GS_UPGRADE_BANNER (self->upgrade_banner));
+       if (app == NULL) {
+               g_warning ("no upgrade to cancel");
+               return;
+       }
+ 
        /* cancel trigger */
-       apps = gs_update_list_get_apps (GS_UPDATE_LIST (self->list_box_updates));
        gs_plugin_loader_app_action_async (self->plugin_loader,
-                                          GS_APP (apps->data),
+                                          app,
 -                                         GS_PLUGIN_LOADER_ACTION_OFFLINE_UPDATE_CANCEL,
 +                                         GS_PLUGIN_LOADER_ACTION_UPDATE_CANCEL,
                                           self->cancellable,
                                           cancel_trigger_failed_cb,
                                           self);