[gnome-software/wip/ubuntu] Refactor out gs_snapd_exists()

[Robert Ancell <rancell src gnome org>]

commit 1406c53230303e646d5bfe908dc5e81e47f98da8
Author: Robert Ancell <robert ancell canonical com>
Date:   Fri Sep 30 11:19:12 2016 +1300

    Refactor out gs_snapd_exists()

 src/plugins/gs-plugin-snap.c |   10 +++-------
 src/plugins/gs-snapd.c       |   12 +++++++++---
 src/plugins/gs-snapd.h       |    2 ++
 3 files changed, 14 insertions(+), 10 deletions(-)
---
diff --git a/src/plugins/gs-plugin-snap.c b/src/plugins/gs-plugin-snap.c
index 6a24790..8fbfd50 100644
--- a/src/plugins/gs-plugin-snap.c
+++ b/src/plugins/gs-plugin-snap.c
@@ -25,10 +25,6 @@
 #include "gs-snapd.h"
 #include "gs-ubuntuone.h"
 
-// snapd API documentation is at https://github.com/ubuntu-core/snappy/blob/master/docs/rest.md
-
-#define SNAPD_SOCKET "/run/snapd.socket"
-
 struct GsPluginPrivate {
 };
 
@@ -46,9 +42,9 @@ gs_plugin_initialize (GsPlugin *plugin)
        /* create private area */
        plugin->priv = GS_PLUGIN_GET_PRIVATE (GsPluginPrivate);
 
-       if (!g_file_test (SNAPD_SOCKET, G_FILE_TEST_EXISTS)) {
-               g_debug ("disabling '%s' as no %s available",
-                        plugin->name, SNAPD_SOCKET);
+       if (!gs_snapd_exists ()) {
+               g_debug ("disabling '%s' as snapd not running",
+                        gs_plugin_get_name ());
                gs_plugin_set_enabled (plugin, FALSE);
        }
 }
diff --git a/src/plugins/gs-snapd.c b/src/plugins/gs-snapd.c
index a0492c2..804c103 100644
--- a/src/plugins/gs-snapd.c
+++ b/src/plugins/gs-snapd.c
@@ -27,9 +27,15 @@
 #include "gs-snapd.h"
 #include "gs-ubuntuone.h"
 
-#define SNAPD_SOCKET_PATH "/run/snapd.socket"
+// snapd API documentation is at https://github.com/snapcore/snapd/blob/master/docs/rest.md
 
-// snapd API documentation is at https://github.com/ubuntu-core/snappy/blob/master/docs/rest.md
+#define SNAPD_SOCKET "/run/snapd.socket"
+
+gboolean
+gs_snapd_exists (void)
+{
+       return g_file_test (SNAPD_SOCKET, G_FILE_TEST_EXISTS);
+}
 
 static GSocket *
 open_snapd_socket (GCancellable *cancellable, GError **error)
@@ -50,7 +56,7 @@ open_snapd_socket (GCancellable *cancellable, GError **error)
                             error_local->message);
                return NULL;
        }
-       address = g_unix_socket_address_new (SNAPD_SOCKET_PATH);
+       address = g_unix_socket_address_new (SNAPD_SOCKET);
        if (!g_socket_connect (socket, address, cancellable, &error_local)) {
                g_set_error (error,
                             GS_PLUGIN_ERROR,
diff --git a/src/plugins/gs-snapd.h b/src/plugins/gs-snapd.h
index b02ddbd..f41635a 100644
--- a/src/plugins/gs-snapd.h
+++ b/src/plugins/gs-snapd.h
@@ -24,6 +24,8 @@
 
 #include <gio/gio.h>
 
+gboolean gs_snapd_exists       (void);
+
 gboolean send_snapd_request (const gchar  *method,
                             const gchar  *path,
                             const gchar  *content,