[gnome-software] trivial: Correctly namespace the recently added error_add_unique_id()

[Richard Hughes <rhughes src gnome org>]

commit ade1fc98101e8d004e5a092b494d333961019536
Author: Richard Hughes <richard hughsie com>
Date:   Thu Sep 8 13:07:28 2016 +0100

    trivial: Correctly namespace the recently added error_add_unique_id()

 src/gs-plugin-private.h |    1 -
 src/gs-plugin.c         |   44 --------------------------------------------
 src/gs-plugin.h         |    2 --
 src/gs-self-test.c      |   10 +++++-----
 src/gs-shell-updates.c  |    4 ++--
 src/gs-utils.c          |   44 ++++++++++++++++++++++++++++++++++++++++++++
 src/gs-utils.h          |    3 +++
 7 files changed, 54 insertions(+), 54 deletions(-)
---
diff --git a/src/gs-plugin-private.h b/src/gs-plugin-private.h
index 5cacb89..da95954 100644
--- a/src/gs-plugin-private.h
+++ b/src/gs-plugin-private.h
@@ -121,7 +121,6 @@ GsPlugin    *gs_plugin_create                       (const gchar    *filename,
 const gchar    *gs_plugin_error_to_string              (GsPluginError   error);
 const gchar    *gs_plugin_action_to_string             (GsPluginAction  action);
 
-void            gs_plugin_error_strip_unique_id        (GError         *error);
 void            gs_plugin_action_start                 (GsPlugin       *plugin,
                                                         gboolean        exclusive);
 void            gs_plugin_action_stop                  (GsPlugin       *plugin);
diff --git a/src/gs-plugin.c b/src/gs-plugin.c
index 85b479b..4f850a0 100644
--- a/src/gs-plugin.c
+++ b/src/gs-plugin.c
@@ -1402,50 +1402,6 @@ gs_plugin_action_to_string (GsPluginAction action)
        return NULL;
 }
 
-/**
- * gs_plugin_error_add_unique_id:
- * @error: a #GError
- * @app: a #GsApp
- *
- * Adds a unique ID prefix to the error.
- *
- * Since: 3.22
- **/
-void
-gs_plugin_error_add_unique_id (GError **error, GsApp *app)
-{
-       if (error == NULL || *error == NULL)
-               return;
-       g_prefix_error (error, "[%s] ", gs_app_get_unique_id (app));
-}
-
-/**
- * gs_plugin_error_strip_unique_id:
- * @error: a #GError
- * @app: a #GsApp
- *
- * Removes a possible unique ID prefix from the error.
- *
- * Since: 3.22
- **/
-void
-gs_plugin_error_strip_unique_id (GError *error)
-{
-       gchar *str;
-       if (error == NULL)
-               return;
-       if (!g_str_has_prefix (error->message, "["))
-               return;
-       str = g_strstr_len (error->message, -1, " ");
-       if (str == NULL)
-               return;
-
-       /* gahh, my eyes are bleeding */
-       str = g_strdup (str + 1);
-       g_free (error->message);
-       error->message = str;
-}
-
 static void
 gs_plugin_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
 {
diff --git a/src/gs-plugin.h b/src/gs-plugin.h
index 43c2d0b..7cceeda 100644
--- a/src/gs-plugin.h
+++ b/src/gs-plugin.h
@@ -303,8 +303,6 @@ gboolean     gs_plugin_app_launch                   (GsPlugin       *plugin,
 void            gs_plugin_updates_changed              (GsPlugin       *plugin);
 void            gs_plugin_reload                       (GsPlugin       *plugin);
 const gchar    *gs_plugin_status_to_string             (GsPluginStatus  status);
-void            gs_plugin_error_add_unique_id          (GError         **error,
-                                                        GsApp          *app);
 
 G_END_DECLS
 
diff --git a/src/gs-self-test.c b/src/gs-self-test.c
index 1e92c0a..8571a61 100644
--- a/src/gs-self-test.c
+++ b/src/gs-self-test.c
@@ -89,7 +89,7 @@ gs_os_release_func (void)
 }
 
 static void
-gs_plugin_error_func (void)
+gs_utils_error_func (void)
 {
        guint i;
        g_autoptr(GError) error = NULL;
@@ -98,15 +98,15 @@ gs_plugin_error_func (void)
        for (i = 0; i < GS_PLUGIN_ERROR_LAST; i++)
                g_assert (gs_plugin_error_to_string (i) != NULL);
 
-       gs_plugin_error_add_unique_id (&error, app);
+       gs_utils_error_add_unique_id (&error, app);
        g_set_error (&error,
                     GS_PLUGIN_ERROR,
                     GS_PLUGIN_ERROR_DOWNLOAD_FAILED,
                     "failed");
        g_assert_cmpstr (error->message, ==, "failed");
-       gs_plugin_error_add_unique_id (&error, app);
+       gs_utils_error_add_unique_id (&error, app);
        g_assert_cmpstr (error->message, ==, "[*/*/*/*/gimp.desktop/*] failed");
-       gs_plugin_error_strip_unique_id (error);
+       gs_utils_error_strip_unique_id (error);
        g_assert_cmpstr (error->message, ==, "failed");
 }
 
@@ -1364,11 +1364,11 @@ main (int argc, char **argv)
 
        /* generic tests go here */
        g_test_add_func ("/gnome-software/utils{wilson}", gs_utils_wilson_func);
+       g_test_add_func ("/gnome-software/utils{error}", gs_utils_error_func);
        g_test_add_func ("/gnome-software/os-release", gs_os_release_func);
        g_test_add_func ("/gnome-software/app", gs_app_func);
        g_test_add_func ("/gnome-software/app{unique-id}", gs_app_unique_id_func);
        g_test_add_func ("/gnome-software/plugin", gs_plugin_func);
-       g_test_add_func ("/gnome-software/plugin{error}", gs_plugin_error_func);
        g_test_add_func ("/gnome-software/plugin{global-cache}", gs_plugin_global_cache_func);
        g_test_add_func ("/gnome-software/auth{secret}", gs_auth_secret_func);
 
diff --git a/src/gs-shell-updates.c b/src/gs-shell-updates.c
index 366e0ec..c21c567 100644
--- a/src/gs-shell-updates.c
+++ b/src/gs-shell-updates.c
@@ -468,7 +468,7 @@ gs_shell_updates_get_updates_cb (GsPluginLoader *plugin_loader,
                gs_shell_updates_clear_flag (self, GS_SHELL_UPDATES_FLAG_HAS_UPDATES);
                if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
                        g_warning ("updates-shell: failed to get updates: %s", error->message);
-               gs_plugin_error_strip_unique_id (error);
+               gs_utils_error_strip_unique_id (error);
                gtk_label_set_label (GTK_LABEL (self->label_updates_failed),
                                     error->message);
                gs_shell_updates_set_state (self,
@@ -703,7 +703,7 @@ gs_shell_updates_refresh_cb (GsPluginLoader *plugin_loader,
                        return;
                }
                g_warning ("failed to refresh: %s", error->message);
-               gs_plugin_error_strip_unique_id (error);
+               gs_utils_error_strip_unique_id (error);
                gtk_label_set_label (GTK_LABEL (self->label_updates_failed),
                                     error->message);
                gs_shell_updates_set_state (self,
diff --git a/src/gs-utils.c b/src/gs-utils.c
index 58263d1..3146a1e 100644
--- a/src/gs-utils.c
+++ b/src/gs-utils.c
@@ -503,4 +503,48 @@ gs_utils_get_wilson_rating (guint64 star1,
        return (gint) ceil (val);
 }
 
+/**
+ * gs_utils_error_add_unique_id:
+ * @error: a #GError
+ * @app: a #GsApp
+ *
+ * Adds a unique ID prefix to the error.
+ *
+ * Since: 3.22
+ **/
+void
+gs_utils_error_add_unique_id (GError **error, GsApp *app)
+{
+       if (error == NULL || *error == NULL)
+               return;
+       g_prefix_error (error, "[%s] ", gs_app_get_unique_id (app));
+}
+
+/**
+ * gs_utils_error_strip_unique_id:
+ * @error: a #GError
+ * @app: a #GsApp
+ *
+ * Removes a possible unique ID prefix from the error.
+ *
+ * Since: 3.22
+ **/
+void
+gs_utils_error_strip_unique_id (GError *error)
+{
+       gchar *str;
+       if (error == NULL)
+               return;
+       if (!g_str_has_prefix (error->message, "["))
+               return;
+       str = g_strstr_len (error->message, -1, " ");
+       if (str == NULL)
+               return;
+
+       /* gahh, my eyes are bleeding */
+       str = g_strdup (str + 1);
+       g_free (error->message);
+       error->message = str;
+}
+
 /* vim: set noexpandtab: */
diff --git a/src/gs-utils.h b/src/gs-utils.h
index 0a9db60..cbf803a 100644
--- a/src/gs-utils.h
+++ b/src/gs-utils.h
@@ -70,6 +70,9 @@ gint           gs_utils_get_wilson_rating     (guint64         star1,
                                                 guint64         star3,
                                                 guint64         star4,
                                                 guint64         star5);
+void            gs_utils_error_add_unique_id   (GError         **error,
+                                                GsApp          *app);
+void            gs_utils_error_strip_unique_id (GError         *error);
 
 G_END_DECLS