[gnome-software/wip/rancell/reviews: 57/57] Merge branch 'master' into wip/rancell/reviews



commit 676712c5bb2de0bf8969f4f955a7f8aabac457fd
Merge: 9ebb43a 80cf1ba
Author: Robert Ancell <robert ancell canonical com>
Date:   Fri Feb 19 10:43:43 2016 -0800

    Merge branch 'master' into wip/rancell/reviews

 RELEASE                                        |    6 +-
 configure.ac                                   |    7 +-
 contrib/gnome-software.spec.in                 |   12 +-
 data/appdata/org.gnome.Software.appdata.xml.in |   23 +
 po/ca.po                                       |  715 +++++++++++++++---------
 po/es.po                                       |   51 ++-
 po/pl.po                                       |  256 ++++++---
 po/pt_BR.po                                    |  114 ++--
 po/sk.po                                       |  122 +++--
 po/th.po                                       |  668 ++++++++++++++---------
 src/gs-app-row.c                               |    5 +
 src/gs-app.c                                   |   43 ++
 src/gs-app.h                                   |    4 +
 src/gs-hiding-box.c                            |    2 +-
 src/gs-plugin-loader.c                         |    9 +-
 src/gs-plugin.h                                |    4 +
 src/gs-review-dialog.c                         |    5 +-
 src/gs-review-dialog.ui                        |   10 +-
 src/gs-review-histogram.ui                     |   19 +-
 src/gs-shell-details.c                         |   45 --
 src/gs-shell-moderate.c                        |    7 +
 src/gs-shell-moderate.ui                       |   42 ++
 src/gs-shell-updates.c                         |  150 +++++
 src/gs-shell-updates.ui                        |   25 +-
 src/gs-star-widget.c                           |   78 ++--
 src/gs-star-widget.h                           |    2 +
 src/gs-star-widget.ui                          |   10 +-
 src/gs-update-monitor.c                        |    9 +-
 src/gs-upgrade-banner.c                        |   35 +-
 src/gs-upgrade-banner.h                        |    5 +-
 src/gtk-style-hc.css                           |   14 +-
 src/gtk-style.css                              |   16 +-
 src/plugins/Makefile.am                        |   12 -
 src/plugins/gs-plugin-appstream.c              |   72 ++-
 src/plugins/gs-plugin-dummy.c                  |    4 +-
 src/plugins/gs-plugin-fedora-tagger-ratings.c  |  630 ---------------------
 src/plugins/gs-plugin-fwupd.c                  |    1 +
 src/plugins/gs-plugin-local-ratings.c          |  261 ---------
 src/plugins/gs-plugin-packagekit-refine.c      |   39 +--
 src/plugins/gs-plugin-packagekit.c             |   38 ++
 src/plugins/gs-plugin-systemd-updates.c        |   12 +
 src/plugins/gs-plugin-xdg-app-reviews.c        |   18 +-
 src/plugins/gs-plugin-xdg-app.c                |  593 ++++++++++++++++----
 43 files changed, 2286 insertions(+), 1907 deletions(-)
---
diff --cc src/plugins/Makefile.am
index a6eddae,04396be..1c61244
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@@ -37,11 -36,8 +37,9 @@@ plugin_LTLIBRARIES =                                 
        libgs_plugin_moduleset.la                       \
        libgs_plugin_menu-spec-categories.la            \
        libgs_plugin_menu-spec-refine.la                \
-       libgs_plugin_local-ratings.la                   \
        libgs_plugin_fedora_distro_upgrades.la          \
        libgs_plugin_fedora_provenance.la               \
 +      libgs_plugin_ubuntu-reviews.la                  \
-       libgs_plugin_fedora_tagger_ratings.la           \
        libgs_plugin_fedora_tagger_usage.la             \
        libgs_plugin_epiphany.la                        \
        libgs_plugin_icons.la
@@@ -169,18 -160,6 +162,13 @@@ libgs_plugin_hardcoded_blacklist_la_LIB
  libgs_plugin_hardcoded_blacklist_la_LDFLAGS = -module -avoid-version
  libgs_plugin_hardcoded_blacklist_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
  
- libgs_plugin_local_ratings_la_SOURCES = gs-plugin-local-ratings.c
- libgs_plugin_local_ratings_la_LIBADD = $(GS_PLUGIN_LIBS) $(SQLITE_LIBS)
- libgs_plugin_local_ratings_la_LDFLAGS = -module -avoid-version
- libgs_plugin_local_ratings_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
- 
 +libgs_plugin_ubuntu_reviews_la_SOURCES =              \
 +      gs-plugin-ubuntu-reviews.c                      \
 +      gs-ubuntu-login-dialog.c
 +libgs_plugin_ubuntu_reviews_la_LIBADD = $(GS_PLUGIN_LIBS) $(SOUP_LIBS) $(JSON_GLIB_LIBS) $(OAUTH_LIBS) 
$(SQLITE_LIBS)
 +libgs_plugin_ubuntu_reviews_la_LDFLAGS = -module -avoid-version
 +libgs_plugin_ubuntu_reviews_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
 +
  libgs_plugin_packagekit_la_SOURCES =                  \
        gs-plugin-packagekit.c                          \
        packagekit-common.c                             \


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]