[gnome-software/wip/ubuntu-xenial] Update snappy names to match upstream naming

[Robert Ancell <rancell src gnome org>]

commit 57d1e88e55225a07a3c374fb16744681c87ce5ba
Author: Robert Ancell <robert ancell canonical com>
Date:   Wed Jun 22 10:54:31 2016 +1200

    Update snappy names to match upstream naming

 src/plugins/Makefile.am           |    8 +-
 src/plugins/gs-plugin-snappy.c    |    6 +-
 src/plugins/gs-snapd.c            |    4 +-
 src/plugins/gs-snapd.h            |    6 +-
 src/plugins/gs-ubuntu-snapd.c     |  277 -------------------------------------
 src/plugins/gs-ubuntu-snapd.h     |   41 ------
 src/plugins/gs-ubuntuone-dialog.c |    2 +-
 7 files changed, 13 insertions(+), 331 deletions(-)
---
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 06d865e..b90e5e0 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -212,8 +212,8 @@ libgs_plugin_ubuntu_reviews_la_SOURCES =            \
        gs-ubuntuone.c                                  \
        gs-ubuntuone-dialog.h                           \
        gs-ubuntuone-dialog.c                           \
-       gs-ubuntu-snapd.h                               \
-       gs-ubuntu-snapd.c
+       gs-snapd.h                                      \
+       gs-snapd.c
 libgs_plugin_ubuntu_reviews_la_LIBADD =                        \
        $(GS_PLUGIN_LIBS)                               \
        $(SOUP_LIBS)                                    \
@@ -286,8 +286,8 @@ libgs_plugin_snappy_la_SOURCES =                    \
        gs-ubuntuone.c                                  \
        gs-ubuntuone-dialog.h                           \
        gs-ubuntuone-dialog.c                           \
-       gs-ubuntu-snapd.h                               \
-       gs-ubuntu-snapd.c
+       gs-snapd.h                                      \
+       gs-snapd.c
 libgs_plugin_snappy_la_LIBADD =                                \
        $(GS_PLUGIN_LIBS)                               \
        $(SOUP_LIBS)                                    \
diff --git a/src/plugins/gs-plugin-snappy.c b/src/plugins/gs-plugin-snappy.c
index 87fb1aa..e46cb98 100644
--- a/src/plugins/gs-plugin-snappy.c
+++ b/src/plugins/gs-plugin-snappy.c
@@ -22,10 +22,10 @@
 #include <gs-plugin.h>
 #include <glib/gi18n.h>
 #include <json-glib/json-glib.h>
-#include "gs-ubuntu-snapd.h"
+#include "gs-snapd.h"
 #include "gs-ubuntuone.h"
 
-// snapd API documentation is at https://github.com/ubuntu-core/snappy/blob/master/docs/rest.md
+// snapd API documentation is at https://github.com/snapcore/snapd/blob/master/docs/rest.md
 
 #define SNAPD_SOCKET "/run/snapd.socket"
 
@@ -230,7 +230,7 @@ get_apps (GsPlugin *plugin, const gchar *sources, gchar **search_terms, GList **
 
                app = gs_app_new (id);
                gs_app_set_management_plugin (app, "snappy");
-               gs_app_set_origin (app, _("Ubuntu Snappy Store"));
+               gs_app_set_origin (app, _("Snappy Store"));
                gs_app_set_kind (app, AS_APP_KIND_DESKTOP);
                gs_app_add_quirk (app, AS_APP_QUIRK_NOT_REVIEWABLE);
                gs_app_add_quirk (app, AS_APP_QUIRK_NOT_LAUNCHABLE);
diff --git a/src/plugins/gs-snapd.c b/src/plugins/gs-snapd.c
index 32fb2bc..5770778 100644
--- a/src/plugins/gs-snapd.c
+++ b/src/plugins/gs-snapd.c
@@ -24,12 +24,12 @@
 #include <gs-plugin.h>
 #include <libsoup/soup.h>
 #include <gio/gunixsocketaddress.h>
-#include "gs-ubuntu-snapd.h"
+#include "gs-snapd.h"
 #include "gs-ubuntuone.h"
 
 #define SNAPD_SOCKET_PATH "/run/snapd.socket"
 
-// snapd API documentation is at https://github.com/ubuntu-core/snappy/blob/master/docs/rest.md
+// snapd API documentation is at https://github.com/snapcore/snapd/blob/master/docs/rest.md
 
 static GSocket *
 open_snapd_socket (GError **error)
diff --git a/src/plugins/gs-snapd.h b/src/plugins/gs-snapd.h
index cbc1e1a..d44d834 100644
--- a/src/plugins/gs-snapd.h
+++ b/src/plugins/gs-snapd.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef __GS_UBUNTU_SNAPD_H__
-#define __GS_UBUNTU_SNAPD_H__
+#ifndef __GS_SNAPD_H__
+#define __GS_SNAPD_H__
 
 #include <gio/gio.h>
 
@@ -38,4 +38,4 @@ gboolean send_snapd_request (const gchar  *method,
                             gsize        *response_length,
                             GError      **error);
 
-#endif /* __GS_UBUNTU_SNAPD_H__ */
+#endif /* __GS_SNAPD_H__ */
diff --git a/src/plugins/gs-ubuntuone-dialog.c b/src/plugins/gs-ubuntuone-dialog.c
index 7659de8..6fc2a34 100644
--- a/src/plugins/gs-ubuntuone-dialog.c
+++ b/src/plugins/gs-ubuntuone-dialog.c
@@ -26,7 +26,7 @@
 #include <json-glib/json-glib.h>
 #include <libsoup/soup.h>
 
-#include "gs-ubuntu-snapd.h"
+#include "gs-snapd.h"
 
 #define UBUNTU_LOGIN_HOST "https://login.ubuntu.com";