diff options
| author | Alexander Larsson <alexl@redhat.com> | 2016-05-12 16:33:48 +0200 |
|---|---|---|
| committer | Alexander Larsson <alexl@redhat.com> | 2016-05-12 16:33:48 +0200 |
| commit | e23bc2b7a6d7e4fe609f24762c5d48fc60ba42f4 (patch) | |
| tree | 403044c81e3c5c0c7afc3c9584e9dc6d4d07acf9 | |
| parent | 5ff8a00078d42532f4a4f103e53c30c0ab707019 (diff) | |
| download | xdg-app-e23bc2b7a6d7e4fe609f24762c5d48fc60ba42f4.tar.gz | |
Move flatpack_error quark to common so that the common code can use it
| -rw-r--r-- | common/flatpak-dir.c | 1 | ||||
| -rw-r--r-- | common/flatpak-utils.c | 4 | ||||
| -rw-r--r-- | lib/flatpak-error.c | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c index 4f30c22..db9328d 100644 --- a/common/flatpak-dir.c +++ b/common/flatpak-dir.c @@ -30,6 +30,7 @@ #include <gio/gio.h> #include "libgsystem.h" #include "libglnx/libglnx.h" +#include "lib/flatpak-error.h" #include "flatpak-dir.h" #include "flatpak-utils.h" diff --git a/common/flatpak-utils.c b/common/flatpak-utils.c index c477329..f20b9e3 100644 --- a/common/flatpak-utils.c +++ b/common/flatpak-utils.c @@ -21,6 +21,7 @@ #include "config.h" #include "flatpak-utils.h" +#include "lib/flatpak-error.h" #include "flatpak-dir.h" #include "flatpak-portal-error.h" @@ -39,6 +40,9 @@ #include "libglnx/libglnx.h" #include <libsoup/soup.h> +/* This is also here so the common code can report these errors to the lib */ +G_DEFINE_QUARK (flatpak-error-quark, flatpak_error) + GBytes * flatpak_read_stream (GInputStream *in, gboolean null_terminate, diff --git a/lib/flatpak-error.c b/lib/flatpak-error.c index c2b550b..781a9eb 100644 --- a/lib/flatpak-error.c +++ b/lib/flatpak-error.c @@ -31,4 +31,4 @@ * */ -G_DEFINE_QUARK (flatpak-error-quark, flatpak_error) +/* This is actually defined in common/flatpak-utils.c so the common code can report errors */ |