[gnome-software/wip/ubuntu] Rename snappy plugin to snap.

[Robert Ancell <rancell src gnome org>]

commit 5bb182316be9bc213ec6e1650c994be3380d992b
Author: Robert Ancell <robert ancell canonical com>
Date:   Wed Jun 22 15:14:38 2016 +1200

    Rename snappy plugin to snap.
    
    This was the recommended name from the snap team using the current naming conventions.

 po/POTFILES.in                                     |    2 +-
 src/gs-shell-search.c                              |    2 +-
 src/plugins/Makefile.am                            |   12 ++++++------
 .../{gs-plugin-snappy.c => gs-plugin-snap.c}       |   12 ++++++------
 4 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9aa136f..bbbd21d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -64,6 +64,6 @@ 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/gs-plugin-snap.c
 src/plugins/menu-spec-common.c
 [type: gettext/glade]src/popular-tile.ui
diff --git a/src/gs-shell-search.c b/src/gs-shell-search.c
index 129fe9a..412e760 100644
--- a/src/gs-shell-search.c
+++ b/src/gs-shell-search.c
@@ -258,7 +258,7 @@ gs_shell_search_get_app_sort_key (GsApp *app)
        key = g_string_sized_new (64);
 
        /* sort snaps before other apps */
-       if (g_strcmp0 (gs_app_get_management_plugin (app), "snappy") == 0)
+       if (g_strcmp0 (gs_app_get_management_plugin (app), "snap") == 0)
                g_string_append (key, "9:");
        else
                g_string_append (key, "1:");
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index b90e5e0..68b0e0d 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -45,7 +45,7 @@ plugin_LTLIBRARIES =                                  \
        libgs_plugin_fedora_tagger_usage.la             \
        libgs_plugin_epiphany.la                        \
        libgs_plugin_icons.la                           \
-       libgs_plugin_snappy.la
+       libgs_plugin_snap.la
 
 if HAVE_APT
 plugin_LTLIBRARIES +=                                  \
@@ -280,21 +280,21 @@ libgs_plugin_packagekit_proxy_la_LIBADD = $(GS_PLUGIN_LIBS)
 libgs_plugin_packagekit_proxy_la_LDFLAGS = -module -avoid-version
 libgs_plugin_packagekit_proxy_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
 
-libgs_plugin_snappy_la_SOURCES =                       \
-       gs-plugin-snappy.c                              \
+libgs_plugin_snap_la_SOURCES =                         \
+       gs-plugin-snap.c                                \
        gs-ubuntuone.h                                  \
        gs-ubuntuone.c                                  \
        gs-ubuntuone-dialog.h                           \
        gs-ubuntuone-dialog.c                           \
        gs-snapd.h                                      \
        gs-snapd.c
-libgs_plugin_snappy_la_LIBADD =                                \
+libgs_plugin_snap_la_LIBADD =                          \
        $(GS_PLUGIN_LIBS)                               \
        $(SOUP_LIBS)                                    \
        $(JSON_GLIB_LIBS)                               \
        $(LIBSECRET_LIBS)
-libgs_plugin_snappy_la_LDFLAGS = -module -avoid-version
-libgs_plugin_snappy_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
+libgs_plugin_snap_la_LDFLAGS = -module -avoid-version
+libgs_plugin_snap_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
 
 check_PROGRAMS =                                       \
        gs-self-test
diff --git a/src/plugins/gs-plugin-snappy.c b/src/plugins/gs-plugin-snap.c
similarity index 97%
rename from src/plugins/gs-plugin-snappy.c
rename to src/plugins/gs-plugin-snap.c
index f234803..9ebfcbd 100644
--- a/src/plugins/gs-plugin-snappy.c
+++ b/src/plugins/gs-plugin-snap.c
@@ -37,7 +37,7 @@ typedef gboolean (*AppFilterFunc)(const gchar *id, JsonObject *object, gpointer
 const gchar *
 gs_plugin_get_name (void)
 {
-       return "snappy";
+       return "snap";
 }
 
 void
@@ -244,7 +244,7 @@ get_apps (GsPlugin *plugin, const gchar *sources, gchar **search_terms, GList **
                        continue;
 
                app = gs_app_new (id);
-               gs_app_set_management_plugin (app, "snappy");
+               gs_app_set_management_plugin (app, "snap");
                gs_app_set_origin (app, _("Ubuntu Snappy Store"));
                gs_app_set_kind (app, AS_APP_KIND_DESKTOP);
                gs_app_add_quirk (app, AS_APP_QUIRK_NOT_REVIEWABLE);
@@ -341,7 +341,7 @@ gs_plugin_refine (GsPlugin *plugin,
        for (link = *list; link; link = link->next) {
                GsApp *app = link->data;
 
-               if (g_strcmp0 (gs_app_get_management_plugin (app), "snappy") != 0)
+               if (g_strcmp0 (gs_app_get_management_plugin (app), "snap") != 0)
                        continue;
 
                // Get info from snapd
@@ -468,7 +468,7 @@ gs_plugin_app_install (GsPlugin *plugin,
        gboolean result;
 
        /* We can only install apps we know of */
-       if (g_strcmp0 (gs_app_get_management_plugin (app), "snappy") != 0)
+       if (g_strcmp0 (gs_app_get_management_plugin (app), "snap") != 0)
                return TRUE;
 
        gs_app_set_state (app, AS_APP_STATE_INSTALLING);
@@ -492,7 +492,7 @@ gs_plugin_launch (GsPlugin *plugin,
        g_autoptr(GAppInfo) info = NULL;
 
        /* We can only launch apps we know of */
-       if (g_strcmp0 (gs_app_get_management_plugin (app), "snappy") != 0)
+       if (g_strcmp0 (gs_app_get_management_plugin (app), "snap") != 0)
                return TRUE;
 
        launch_name = gs_app_get_metadata_item (app, "snap::launch-name");
@@ -523,7 +523,7 @@ gs_plugin_app_remove (GsPlugin *plugin,
        gboolean result;
 
        /* We can only remove apps we know of */
-       if (g_strcmp0 (gs_app_get_management_plugin (app), "snappy") != 0)
+       if (g_strcmp0 (gs_app_get_management_plugin (app), "snap") != 0)
                return TRUE;
 
        gs_app_set_state (app, AS_APP_STATE_REMOVING);