[librest/gwagner/oauth2] oauth2: harmonized error domains

[Günther Wagner <gwagner src gnome org>]

commit e8876896ca2cd3e96c04eff30cd4a000f71ade8c
Author: Günther Wagner <info gunibert de>
Date:   Wed Nov 17 07:25:47 2021 +0100

    oauth2: harmonized error domains

 rest/rest-oauth2-proxy-call.c | 4 +---
 rest/rest-oauth2-proxy-call.h | 6 ------
 rest/rest-oauth2-proxy.c      | 6 +++---
 rest/rest-oauth2-proxy.h      | 7 ++++---
 tests/oauth2.c                | 2 +-
 5 files changed, 9 insertions(+), 16 deletions(-)
---
diff --git a/rest/rest-oauth2-proxy-call.c b/rest/rest-oauth2-proxy-call.c
index 302df3b..9102917 100644
--- a/rest/rest-oauth2-proxy-call.c
+++ b/rest/rest-oauth2-proxy-call.c
@@ -22,8 +22,6 @@
 
 G_DEFINE_TYPE (RestOAuth2ProxyCall, rest_oauth2_proxy_call, REST_TYPE_PROXY_CALL)
 
-G_DEFINE_QUARK (rest-oauth2-error-quark, rest_oauth2_error)
-
 static gboolean
 rest_oauth2_proxy_call_prepare (RestProxyCall  *call,
                                 GError        **error)
@@ -45,7 +43,7 @@ rest_oauth2_proxy_call_prepare (RestProxyCall  *call,
     {
       g_set_error (error,
                    REST_OAUTH2_ERROR,
-                   REST_OAUTH2_PROXY_ERROR_ACCESS_TOKEN_EXPIRED,
+                   REST_OAUTH2_ERROR_ACCESS_TOKEN_EXPIRED,
                    "Access token is expired");
       return FALSE;
     }
diff --git a/rest/rest-oauth2-proxy-call.h b/rest/rest-oauth2-proxy-call.h
index f89d033..d3a171a 100644
--- a/rest/rest-oauth2-proxy-call.h
+++ b/rest/rest-oauth2-proxy-call.h
@@ -32,10 +32,4 @@ struct _RestOAuth2ProxyCallClass {
   RestProxyCallClass parent_class;
 };
 
-enum {
-  REST_OAUTH2_PROXY_ERROR_ACCESS_TOKEN_EXPIRED,
-};
-
-#define REST_OAUTH2_ERROR rest_oauth2_error_quark ()
-
 G_END_DECLS
diff --git a/rest/rest-oauth2-proxy.c b/rest/rest-oauth2-proxy.c
index 7c0d222..4764f43 100644
--- a/rest/rest-oauth2-proxy.c
+++ b/rest/rest-oauth2-proxy.c
@@ -40,7 +40,7 @@ typedef struct
 
 G_DEFINE_TYPE_WITH_PRIVATE (RestOAuth2Proxy, rest_oauth2_proxy, REST_TYPE_PROXY)
 
-G_DEFINE_QUARK (rest-oauth2-proxy-error-quark, rest_oauth2_proxy_error)
+G_DEFINE_QUARK (rest-oauth2-error-quark, rest_oauth2_error)
 
 enum {
   PROP_0,
@@ -485,8 +485,8 @@ rest_oauth2_proxy_refresh_access_token_async (RestOAuth2Proxy     *self,
   if (priv->refresh_token == NULL)
     {
       g_task_return_new_error (task,
-                               REST_OAUTH2_PROXY_ERROR,
-                               REST_OAUTH2_PROXY_NO_REFRESH_TOKEN,
+                               REST_OAUTH2_ERROR,
+                               REST_OAUTH2_ERROR_NO_REFRESH_TOKEN,
                                "No refresh token available");
       return;
     }
diff --git a/rest/rest-oauth2-proxy.h b/rest/rest-oauth2-proxy.h
index 7ba3111..f55f1eb 100644
--- a/rest/rest-oauth2-proxy.h
+++ b/rest/rest-oauth2-proxy.h
@@ -40,11 +40,12 @@ struct _RestOAuth2ProxyClass
 };
 
 enum {
-  REST_OAUTH2_PROXY_NO_REFRESH_TOKEN,
+  REST_OAUTH2_ERROR_NO_REFRESH_TOKEN,
+  REST_OAUTH2_ERROR_ACCESS_TOKEN_EXPIRED,
 };
 
-#define REST_OAUTH2_PROXY_ERROR rest_oauth2_proxy_error_quark ()
-GQuark rest_oauth2_proxy_error_quark ();
+#define REST_OAUTH2_ERROR rest_oauth2_error_quark ()
+GQuark rest_oauth2_error_quark ();
 
 RestOAuth2Proxy *rest_oauth2_proxy_new                         (const gchar          *authurl,
                                                                 const gchar          *tokenurl,
diff --git a/tests/oauth2.c b/tests/oauth2.c
index c9ba8d2..a859e23 100644
--- a/tests/oauth2.c
+++ b/tests/oauth2.c
@@ -138,7 +138,7 @@ test_refresh_access_token_finished_error (GObject      *object,
   g_assert (G_IS_ASYNC_RESULT (result));
 
   rest_oauth2_proxy_refresh_access_token_finish (REST_OAUTH2_PROXY (object), result, &error);
-  g_assert_error (error, REST_OAUTH2_PROXY_ERROR, REST_OAUTH2_PROXY_NO_REFRESH_TOKEN);
+  g_assert_error (error, REST_OAUTH2_ERROR, REST_OAUTH2_ERROR_NO_REFRESH_TOKEN);
 
   *finished = TRUE;
 }