[gnome-software/wip/iainl/ubuntu-xenial: 23/56] Merge branch 'master' into snappy

[William Hua <williamhua src gnome org>]

commit 93a8c321cf7f97573648a6d1adae16e078c95295
Merge: 9869fe3 e8cfba4
Author: Robert Ancell <robert ancell canonical com>
Date:   Thu Feb 11 10:35:02 2016 +1300

    Merge branch 'master' into snappy

 configure.ac                            |    2 +-
 contrib/gnome-software.spec.in          |    1 +
 data/org.gnome.software.gschema.xml     |    9 +
 po/hu.po                                |  230 +++++---
 po/pt_BR.po                             |  228 +++++---
 po/sk.po                                |  222 +++++---
 src/gs-app.c                            |   10 +
 src/gs-app.h                            |    2 +
 src/gs-application.c                    |    5 +-
 src/gs-plugin-loader.c                  |   14 +-
 src/gs-review-dialog.c                  |   11 +-
 src/gs-review-dialog.ui                 |    1 +
 src/gs-review-histogram.c               |   18 +-
 src/gs-review-row.c                     |   38 +-
 src/gs-review-row.ui                    |    1 +
 src/gs-review.c                         |   48 +-
 src/gs-review.h                         |   17 +-
 src/gs-shell-details.c                  |   25 +-
 src/gs-shell-updates.c                  |    5 +-
 src/gs-shell.c                          |    5 +-
 src/plugins/Makefile.am                 |    7 +
 src/plugins/gs-plugin-dummy.c           |    5 +-
 src/plugins/gs-plugin-xdg-app-reviews.c |  979 +++++++++++++++++++++++++++++++
 src/plugins/gs-plugin-xdg-app.c         |  142 +++--
 24 files changed, 1696 insertions(+), 329 deletions(-)
---
diff --cc src/plugins/Makefile.am
index 48f63dc,ed90743..35a9679
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@@ -10,9 -10,9 +10,10 @@@ AM_CPPFLAGS =                                                
        $(SOUP_CFLAGS)                                  \
        $(SQLITE_CFLAGS)                                \
        $(FWUPD_CFLAGS)                                 \
+       $(JSON_GLIB_CFLAGS)                             \
        $(LIMBA_CFLAGS)                                 \
        $(XDG_APP_CFLAGS)                               \
 +      $(JSON_GLIB_CFLAGS)                             \
        -DBINDIR=\"$(bindir)\"                          \
        -DDATADIR=\"$(datadir)\"                        \
        -DGS_MODULESETDIR=\"$(datadir)/gnome-software/modulesets.d\" \