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

[William Hua <williamhua src gnome org>]

commit b644de73975c83473aa218da7d54e85f668d5ede
Merge: c9bcf92 0e0afd9
Author: William Hua <william hua canonical com>
Date:   Thu Apr 14 01:38:40 2016 -0400

    Merge branch 'snappy' into wip/iainl/ubuntu-xenial

 po/POTFILES.in                 |    1 +
 src/gs-shell-search.c          |    6 +
 src/plugins/Makefile.am        |    8 +-
 src/plugins/gs-plugin-snappy.c |  622 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 636 insertions(+), 1 deletions(-)
---
diff --cc po/POTFILES.in
index afd5edb,5e87546..9aa136f
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@@ -62,7 -62,6 +62,8 @@@ src/plugins/gs-plugin-epiphany.
  src/plugins/gs-plugin-moduleset.c
  src/plugins/gs-plugin-packagekit.c
  src/plugins/gs-plugin-packagekit-refine.c
 +src/plugins/gs-ubuntuone-dialog.c
 +[type: gettext/glade]src/plugins/gs-ubuntuone-dialog.ui
+ src/plugins/gs-plugin-snappy.c
  src/plugins/menu-spec-common.c
  [type: gettext/glade]src/popular-tile.ui
diff --cc src/plugins/Makefile.am
index 599895d,0f3a8c3..cd91900
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@@ -44,13 -41,9 +44,14 @@@ plugin_LTLIBRARIES =                                        
        libgs_plugin_ubuntu-reviews.la                  \
        libgs_plugin_fedora_tagger_usage.la             \
        libgs_plugin_epiphany.la                        \
-       libgs_plugin_icons.la
+       libgs_plugin_icons.la                           \
+       libgs_plugin_snappy.la
  
 +if HAVE_APT
 +plugin_LTLIBRARIES +=                                 \
 +      libgs_plugin_apt.la
 +endif
 +
  if HAVE_PACKAGEKIT
  plugin_LTLIBRARIES +=                                 \
        libgs_plugin_systemd-updates.la                 \