From 7d509ab93a83a9d6662ee201f3657e2f584b7eda Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl@redhat.com>
Date: Thu, 21 Apr 2016 20:56:11 +0200
Subject: [PATCH] Fix confusion about GError types

This was pretty mixed up. Also XdgAppError was not exported.
---
 common/xdg-app-portal-error.c | 2 +-
 common/xdg-app-portal-error.h | 4 ++--
 lib/xdg-app-error.c           | 4 ++--
 lib/xdg-app-error.h           | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/xdg-app-portal-error.c b/common/xdg-app-portal-error.c
index 2df75d0c..a9fc70fd 100644
--- a/common/xdg-app-portal-error.c
+++ b/common/xdg-app-portal-error.c
@@ -36,7 +36,7 @@ static const GDBusErrorEntry xdg_app_error_entries[] = {
 };
 
 GQuark
-xdg_app_error_quark (void)
+xdg_app_portal_error_quark (void)
 {
   static volatile gsize quark_volatile = 0;
 
diff --git a/common/xdg-app-portal-error.h b/common/xdg-app-portal-error.h
index ad7812ca..1dd1c2f7 100644
--- a/common/xdg-app-portal-error.h
+++ b/common/xdg-app-portal-error.h
@@ -40,9 +40,9 @@ typedef enum {
 } XdgAppErrorEnum;
 
 
-#define XDG_APP_PORTAL_ERROR xdg_app_error_quark()
+#define XDG_APP_PORTAL_ERROR xdg_app_portal_error_quark()
 
-XDG_APP_EXTERN GQuark  xdg_app_error_quark      (void);
+XDG_APP_EXTERN GQuark  xdg_app_portal_error_quark      (void);
 
 G_END_DECLS
 
diff --git a/lib/xdg-app-error.c b/lib/xdg-app-error.c
index 76984bcf..37a2d637 100644
--- a/lib/xdg-app-error.c
+++ b/lib/xdg-app-error.c
@@ -21,7 +21,7 @@
 
 #include "config.h"
 
-#include "xdg-app-portal-error.h"
+#include "xdg-app-error.h"
 
 #include <gio/gio.h>
 
@@ -31,4 +31,4 @@
  *
  */
 
-G_DEFINE_QUARK (xdg-app-error-quark, g_io_error)
+G_DEFINE_QUARK (xdg-app-error-quark, xdg_app_error)
diff --git a/lib/xdg-app-error.h b/lib/xdg-app-error.h
index 4cbda5b1..b83385c6 100644
--- a/lib/xdg-app-error.h
+++ b/lib/xdg-app-error.h
@@ -40,7 +40,7 @@ typedef enum {
 
 #define XDG_APP_ERROR xdg_app_error_quark()
 
-GQuark  xdg_app_error_quark      (void);
+XDG_APP_EXTERN GQuark  xdg_app_error_quark      (void);
 
 G_END_DECLS