Rename source files to flatpak

25 files changed, 100 insertions, 100 deletions

diff --git a/lib/Makefile.am.inc b/lib/Makefile.am.inc
index bfd2b51..fa75fa6 100644
--- a/lib/Makefile.am.inc
+++ b/lib/Makefile.am.inc
@@ -2,58 +2,58 @@ lib_LTLIBRARIES += libxdg-app.la
 noinst_PROGRAMS += test-libxdg-app
 
 public_headers = \
-	lib/xdg-app.h \
-	lib/xdg-app-ref.h \
-	lib/xdg-app-error.h \
-	lib/xdg-app-installed-ref.h \
-	lib/xdg-app-remote-ref.h \
-	lib/xdg-app-bundle-ref.h \
-	lib/xdg-app-installation.h \
-	lib/xdg-app-remote.h \
-	lib/xdg-app-version-macros.h \
+	lib/flatpak.h \
+	lib/flatpak-ref.h \
+	lib/flatpak-error.h \
+	lib/flatpak-installed-ref.h \
+	lib/flatpak-remote-ref.h \
+	lib/flatpak-bundle-ref.h \
+	lib/flatpak-installation.h \
+	lib/flatpak-remote.h \
+	lib/flatpak-version-macros.h \
 	$(NULL)
 
 generated_public_headers = \
-	lib/xdg-app-enum-types.h \
+	lib/flatpak-enum-types.h \
 	$(NULL)
 
-BUILT_SOURCES += 		\
-	lib/xdg-app-enum-types.c \
-	lib/xdg-app-enum-types.h \
+BUILT_SOURCES += \
+	lib/flatpak-enum-types.c \
+	lib/flatpak-enum-types.h \
 	$(NULL)
 
-DISTCLEANFILES += 		\
-	lib/xdg-app-enum-types.c \
-	lib/xdg-app-enum-types.h \
+DISTCLEANFILES += \
+	lib/flatpak-enum-types.c \
+	lib/flatpak-enum-types.h \
 	$(NULL)
 
 
-lib/xdg-app-enum-types.h: $(public_headers) lib/xdg-app-enum-types.h.template
+lib/flatpak-enum-types.h: $(public_headers) lib/flatpak-enum-types.h.template
 	$(AM_V_GEN) $(GLIB_MKENUMS) --template $(filter %.template,$^) $(filter-out %.template,$^) > \
-	    lib/xdg-app-enum-types.h.tmp && mv lib/xdg-app-enum-types.h.tmp lib/xdg-app-enum-types.h
+	    lib/flatpak-enum-types.h.tmp && mv lib/flatpak-enum-types.h.tmp lib/flatpak-enum-types.h
 
-lib/xdg-app-enum-types.c: $(public_headers) lib/xdg-app-enum-types.c.template
+lib/flatpak-enum-types.c: $(public_headers) lib/flatpak-enum-types.c.template
 	$(AM_V_GEN) $(GLIB_MKENUMS) --template $(filter %.template,$^) $(filter-out %.template,$^) > \
-	    lib/xdg-app-enum-types.c.tmp && mv lib/xdg-app-enum-types.c.tmp lib/xdg-app-enum-types.c
+	    lib/flatpak-enum-types.c.tmp && mv lib/flatpak-enum-types.c.tmp lib/flatpak-enum-types.c
 
-EXTRA_DIST += lib/xdg-app-enum-types.c.template lib/xdg-app-enum-types.h.template
+EXTRA_DIST += lib/flatpak-enum-types.c.template lib/flatpak-enum-types.h.template
 
 xdgappincludedir = $(includedir)/xdg-app
 xdgappinclude_HEADERS = $(public_headers) $(generated_public_headers)
 
 sources = \
-	lib/xdg-app.c \
-	lib/xdg-app-enum-types.c \
-	lib/xdg-app-ref.c \
-	lib/xdg-app-installed-ref.c \
-	lib/xdg-app-installed-ref-private.h \
-	lib/xdg-app-remote-ref.c \
-	lib/xdg-app-bundle-ref.c \
-	lib/xdg-app-remote-ref-private.h \
-	lib/xdg-app-remote-private.h \
-	lib/xdg-app-remote.c \
-	lib/xdg-app-error.c \
-	lib/xdg-app-installation.c \
+	lib/flatpak.c \
+	lib/flatpak-enum-types.c \
+	lib/flatpak-ref.c \
+	lib/flatpak-installed-ref.c \
+	lib/flatpak-installed-ref-private.h \
+	lib/flatpak-remote-ref.c \
+	lib/flatpak-bundle-ref.c \
+	lib/flatpak-remote-ref-private.h \
+	lib/flatpak-remote-private.h \
+	lib/flatpak-remote.c \
+	lib/flatpak-error.c \
+	lib/flatpak-installation.c \
 	$(NULL)
 
 libxdg_app_la_SOURCES = \
@@ -120,8 +120,8 @@ Flatpak_1_0_gir_CFLAGS = $(libxdg_app_la_CFLAGS)
 Flatpak_1_0_gir_INCLUDES = GObject-2.0 Gio-2.0
 Flatpak_1_0_gir_SCANNERFLAGS = \
         --warn-all \
-        --c-include='xdg-app.h' \
-        --pkg-export=xdg-app
+        --c-include='flatpak.h' \
+        --pkg-export=flatpak
 
 INTROSPECTION_GIRS += Flatpak-1.0.gir
 
diff --git a/lib/xdg-app-bundle-ref.c b/lib/flatpak-bundle-ref.c
index 44e9c75..ba3955e 100644
--- a/lib/xdg-app-bundle-ref.c
+++ b/lib/flatpak-bundle-ref.c
@@ -22,9 +22,9 @@
 
 #include <string.h>
 
-#include "xdg-app-utils.h"
-#include "xdg-app-bundle-ref.h"
-#include "xdg-app-enum-types.h"
+#include "flatpak-utils.h"
+#include "flatpak-bundle-ref.h"
+#include "flatpak-enum-types.h"
 
 typedef struct _FlatpakBundleRefPrivate FlatpakBundleRefPrivate;
 
diff --git a/lib/xdg-app-bundle-ref.h b/lib/flatpak-bundle-ref.h
index 32b7875..e61cb0f 100644
--- a/lib/xdg-app-bundle-ref.h
+++ b/lib/flatpak-bundle-ref.h
@@ -19,7 +19,7 @@
  */
 
 #if !defined(__FLATPAK_H_INSIDE__) && !defined(FLATPAK_COMPILATION)
-#error "Only <xdg-app.h> can be included directly."
+#error "Only <flatpak.h> can be included directly."
 #endif
 
 #ifndef __FLATPAK_BUNDLE_REF_H__
@@ -28,7 +28,7 @@
 typedef struct _FlatpakBundleRef FlatpakBundleRef;
 
 #include <gio/gio.h>
-#include <xdg-app-ref.h>
+#include <flatpak-ref.h>
 
 #define FLATPAK_TYPE_BUNDLE_REF flatpak_bundle_ref_get_type ()
 #define FLATPAK_BUNDLE_REF(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), FLATPAK_TYPE_BUNDLE_REF, FlatpakBundleRef))
diff --git a/lib/xdg-app-enum-types.c.template b/lib/flatpak-enum-types.c.template
index dac7564..f811888 100644
--- a/lib/xdg-app-enum-types.c.template
+++ b/lib/flatpak-enum-types.c.template
@@ -1,8 +1,8 @@
 /*** BEGIN file-header ***/
 #include "config.h"
-#include <xdg-app-utils.h>
-#include <xdg-app.h>
-#include <xdg-app-enum-types.h>
+#include <flatpak-utils.h>
+#include <flatpak.h>
+#include <flatpak-enum-types.h>
 #include <gio/gio.h>
 
 /*** END file-header ***/
diff --git a/lib/xdg-app-enum-types.h.template b/lib/flatpak-enum-types.h.template
index 5b67b9c..5b67b9c 100644
--- a/lib/xdg-app-enum-types.h.template
+++ b/lib/flatpak-enum-types.h.template
diff --git a/lib/xdg-app-error.c b/lib/flatpak-error.c
index 47ffeba..806fbe9 100644
--- a/lib/xdg-app-error.c
+++ b/lib/flatpak-error.c
@@ -21,7 +21,7 @@
 
 #include "config.h"
 
-#include "xdg-app-error.h"
+#include "flatpak-error.h"
 
 #include <gio/gio.h>
 
diff --git a/lib/xdg-app-error.h b/lib/flatpak-error.h
index 9c7b593..9c7b593 100644
--- a/lib/xdg-app-error.h
+++ b/lib/flatpak-error.h
diff --git a/lib/xdg-app-installation.c b/lib/flatpak-installation.c
index ca9c14c..5e9d949 100644
--- a/lib/xdg-app-installation.c
+++ b/lib/flatpak-installation.c
@@ -23,15 +23,15 @@
 #include <string.h>
 
 #include "libgsystem.h"
-#include "xdg-app-utils.h"
-#include "xdg-app-installation.h"
-#include "xdg-app-installed-ref-private.h"
-#include "xdg-app-remote-private.h"
-#include "xdg-app-remote-ref-private.h"
-#include "xdg-app-enum-types.h"
-#include "xdg-app-dir.h"
-#include "xdg-app-run.h"
-#include "xdg-app-error.h"
+#include "flatpak-utils.h"
+#include "flatpak-installation.h"
+#include "flatpak-installed-ref-private.h"
+#include "flatpak-remote-private.h"
+#include "flatpak-remote-ref-private.h"
+#include "flatpak-enum-types.h"
+#include "flatpak-dir.h"
+#include "flatpak-run.h"
+#include "flatpak-error.h"
 
 /**
  * SECTION:xdg-app-installation
diff --git a/lib/xdg-app-installation.h b/lib/flatpak-installation.h
index e30194b..c3a1b19 100644
--- a/lib/xdg-app-installation.h
+++ b/lib/flatpak-installation.h
@@ -19,7 +19,7 @@
  */
 
 #if !defined(__FLATPAK_H_INSIDE__) && !defined(FLATPAK_COMPILATION)
-#error "Only <xdg-app.h> can be included directly."
+#error "Only <flatpak.h> can be included directly."
 #endif
 
 #ifndef __FLATPAK_INSTALLATION_H__
@@ -28,8 +28,8 @@
 typedef struct _FlatpakInstallation FlatpakInstallation;
 
 #include <gio/gio.h>
-#include <xdg-app-installed-ref.h>
-#include <xdg-app-remote.h>
+#include <flatpak-installed-ref.h>
+#include <flatpak-remote.h>
 
 #define FLATPAK_TYPE_INSTALLATION flatpak_installation_get_type ()
 #define FLATPAK_INSTALLATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), FLATPAK_TYPE_INSTALLATION, FlatpakInstallation))
diff --git a/lib/xdg-app-installed-ref-private.h b/lib/flatpak-installed-ref-private.h
index e24acc3..2dc36e6 100644
--- a/lib/xdg-app-installed-ref-private.h
+++ b/lib/flatpak-installed-ref-private.h
@@ -19,14 +19,14 @@
  */
 
 #if !defined(__FLATPAK_H_INSIDE__) && !defined(FLATPAK_COMPILATION)
-#error "Only <xdg-app.h> can be included directly."
+#error "Only <flatpak.h> can be included directly."
 #endif
 
 #ifndef __FLATPAK_INSTALLED_REF_PRIVATE_H__
 #define __FLATPAK_INSTALLED_REF_PRIVATE_H__
 
-#include <xdg-app-installed-ref.h>
-#include <xdg-app-dir.h>
+#include <flatpak-installed-ref.h>
+#include <flatpak-dir.h>
 
 FlatpakInstalledRef *flatpak_installed_ref_new (const char  *full_ref,
                                                 const char  *commit,
diff --git a/lib/xdg-app-installed-ref.c b/lib/flatpak-installed-ref.c
index 0ed231a..4915064 100644
--- a/lib/xdg-app-installed-ref.c
+++ b/lib/flatpak-installed-ref.c
@@ -22,9 +22,9 @@
 
 #include <string.h>
 
-#include "xdg-app-utils.h"
-#include "xdg-app-installed-ref.h"
-#include "xdg-app-enum-types.h"
+#include "flatpak-utils.h"
+#include "flatpak-installed-ref.h"
+#include "flatpak-enum-types.h"
 
 /**
  * SECTION:xdg-app-installed-ref
diff --git a/lib/xdg-app-installed-ref.h b/lib/flatpak-installed-ref.h
index 863a066..7fb8629 100644
--- a/lib/xdg-app-installed-ref.h
+++ b/lib/flatpak-installed-ref.h
@@ -19,7 +19,7 @@
  */
 
 #if !defined(__FLATPAK_H_INSIDE__) && !defined(FLATPAK_COMPILATION)
-#error "Only <xdg-app.h> can be included directly."
+#error "Only <flatpak.h> can be included directly."
 #endif
 
 #ifndef __FLATPAK_INSTALLED_REF_H__
@@ -28,7 +28,7 @@
 typedef struct _FlatpakInstalledRef FlatpakInstalledRef;
 
 #include <gio/gio.h>
-#include <xdg-app-ref.h>
+#include <flatpak-ref.h>
 
 #define FLATPAK_TYPE_INSTALLED_REF flatpak_installed_ref_get_type ()
 #define FLATPAK_INSTALLED_REF(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), FLATPAK_TYPE_INSTALLED_REF, FlatpakInstalledRef))
diff --git a/lib/xdg-app-ref.c b/lib/flatpak-ref.c
index b5137f7..686940b 100644
--- a/lib/xdg-app-ref.c
+++ b/lib/flatpak-ref.c
@@ -20,9 +20,9 @@
 
 #include "config.h"
 
-#include "xdg-app-utils.h"
-#include "xdg-app-ref.h"
-#include "xdg-app-enum-types.h"
+#include "flatpak-utils.h"
+#include "flatpak-ref.h"
+#include "flatpak-enum-types.h"
 
 /**
  * SECTION:xdg-app-ref
diff --git a/lib/xdg-app-ref.h b/lib/flatpak-ref.h
index 7e54739..201fd01 100644
--- a/lib/xdg-app-ref.h
+++ b/lib/flatpak-ref.h
@@ -19,7 +19,7 @@
  */
 
 #if !defined(__FLATPAK_H_INSIDE__) && !defined(FLATPAK_COMPILATION)
-#error "Only <xdg-app.h> can be included directly."
+#error "Only <flatpak.h> can be included directly."
 #endif
 
 #ifndef __FLATPAK_REF_H__
diff --git a/lib/xdg-app-remote-private.h b/lib/flatpak-remote-private.h
index 0a62841..9f79679 100644
--- a/lib/xdg-app-remote-private.h
+++ b/lib/flatpak-remote-private.h
@@ -19,14 +19,14 @@
  */
 
 #if !defined(__FLATPAK_H_INSIDE__) && !defined(FLATPAK_COMPILATION)
-#error "Only <xdg-app.h> can be included directly."
+#error "Only <flatpak.h> can be included directly."
 #endif
 
 #ifndef __FLATPAK_REMOTE_PRIVATE_H__
 #define __FLATPAK_REMOTE_PRIVATE_H__
 
-#include <xdg-app-remote.h>
-#include <xdg-app-dir.h>
+#include <flatpak-remote.h>
+#include <flatpak-dir.h>
 #include <ostree.h>
 
 FlatpakRemote *flatpak_remote_new (FlatpakDir *dir,
diff --git a/lib/xdg-app-remote-ref-private.h b/lib/flatpak-remote-ref-private.h
index 1971711..4a53995 100644
--- a/lib/xdg-app-remote-ref-private.h
+++ b/lib/flatpak-remote-ref-private.h
@@ -19,14 +19,14 @@
  */
 
 #if !defined(__FLATPAK_H_INSIDE__) && !defined(FLATPAK_COMPILATION)
-#error "Only <xdg-app.h> can be included directly."
+#error "Only <flatpak.h> can be included directly."
 #endif
 
 #ifndef __FLATPAK_REMOTE_REF_PRIVATE_H__
 #define __FLATPAK_REMOTE_REF_PRIVATE_H__
 
-#include <xdg-app-remote-ref.h>
-#include <xdg-app-dir.h>
+#include <flatpak-remote-ref.h>
+#include <flatpak-dir.h>
 
 FlatpakRemoteRef *flatpak_remote_ref_new (const char *full_ref,
                                           const char *commit,
diff --git a/lib/xdg-app-remote-ref.c b/lib/flatpak-remote-ref.c
index 081b11c..bfaad1b 100644
--- a/lib/xdg-app-remote-ref.c
+++ b/lib/flatpak-remote-ref.c
@@ -22,10 +22,10 @@
 
 #include <string.h>
 
-#include "xdg-app-utils.h"
-#include "xdg-app-remote-ref-private.h"
-#include "xdg-app-remote-ref.h"
-#include "xdg-app-enum-types.h"
+#include "flatpak-utils.h"
+#include "flatpak-remote-ref-private.h"
+#include "flatpak-remote-ref.h"
+#include "flatpak-enum-types.h"
 
 /**
  * SECTION:xdg-app-remote-ref
diff --git a/lib/xdg-app-remote-ref.h b/lib/flatpak-remote-ref.h
index da18f7e..9d7df22 100644
--- a/lib/xdg-app-remote-ref.h
+++ b/lib/flatpak-remote-ref.h
@@ -19,7 +19,7 @@
  */
 
 #if !defined(__FLATPAK_H_INSIDE__) && !defined(FLATPAK_COMPILATION)
-#error "Only <xdg-app.h> can be included directly."
+#error "Only <flatpak.h> can be included directly."
 #endif
 
 #ifndef __FLATPAK_REMOTE_REF_H__
@@ -28,7 +28,7 @@
 typedef struct _FlatpakRemoteRef FlatpakRemoteRef;
 
 #include <gio/gio.h>
-#include <xdg-app-ref.h>
+#include <flatpak-ref.h>
 
 #define FLATPAK_TYPE_REMOTE_REF flatpak_remote_ref_get_type ()
 #define FLATPAK_REMOTE_REF(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), FLATPAK_TYPE_REMOTE_REF, FlatpakRemoteRef))
diff --git a/lib/xdg-app-remote.c b/lib/flatpak-remote.c
index 6b73ac2..1e1528a 100644
--- a/lib/xdg-app-remote.c
+++ b/lib/flatpak-remote.c
@@ -20,10 +20,10 @@
 
 #include "config.h"
 
-#include "xdg-app-utils.h"
-#include "xdg-app-remote-private.h"
-#include "xdg-app-remote-ref-private.h"
-#include "xdg-app-enum-types.h"
+#include "flatpak-utils.h"
+#include "flatpak-remote-private.h"
+#include "flatpak-remote-ref-private.h"
+#include "flatpak-enum-types.h"
 
 #include <string.h>
 
diff --git a/lib/xdg-app-remote.h b/lib/flatpak-remote.h
index 87e5149..dca8fc6 100644
--- a/lib/xdg-app-remote.h
+++ b/lib/flatpak-remote.h
@@ -19,7 +19,7 @@
  */
 
 #if !defined(__FLATPAK_H_INSIDE__) && !defined(FLATPAK_COMPILATION)
-#error "Only <xdg-app.h> can be included directly."
+#error "Only <flatpak.h> can be included directly."
 #endif
 
 #ifndef __FLATPAK_REMOTE_H__
@@ -28,7 +28,7 @@
 typedef struct _FlatpakRemote FlatpakRemote;
 
 #include <gio/gio.h>
-#include <xdg-app-remote-ref.h>
+#include <flatpak-remote-ref.h>
 
 #define FLATPAK_TYPE_REMOTE flatpak_remote_get_type ()
 #define FLATPAK_REMOTE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), FLATPAK_TYPE_REMOTE, FlatpakRemote))
diff --git a/lib/xdg-app-version-macros.h.in b/lib/flatpak-version-macros.h.in
index 74eb77a..c010a5c 100644
--- a/lib/xdg-app-version-macros.h.in
+++ b/lib/flatpak-version-macros.h.in
@@ -19,7 +19,7 @@
  */
 
 #if !defined (__FLATPAK_H_INSIDE__) && !defined (FLATPAK_COMPILATION)
-#error "Only <xdg-app.h> can be included directly."
+#error "Only <flatpak.h> can be included directly."
 #endif
 
 #ifndef __FLATPAK_VERSION_MACROS_H__
diff --git a/lib/flatpak.c b/lib/flatpak.c
new file mode 100644
index 0000000..91c5098
--- /dev/null
+++ b/lib/flatpak.c
@@ -0,0 +1,3 @@
+#include "config.h"
+
+#include "flatpak-version-macros.h"
diff --git a/lib/xdg-app.h b/lib/flatpak.h
index f1cbee1..08c92b2 100644
--- a/lib/xdg-app.h
+++ b/lib/flatpak.h
@@ -25,15 +25,15 @@
 
 #include <gio/gio.h>
 
-#include <xdg-app-version-macros.h>
-#include <xdg-app-enum-types.h>
-#include <xdg-app-error.h>
-#include <xdg-app-ref.h>
-#include <xdg-app-installed-ref.h>
-#include <xdg-app-remote-ref.h>
-#include <xdg-app-bundle-ref.h>
-#include <xdg-app-remote.h>
-#include <xdg-app-installation.h>
+#include <flatpak-version-macros.h>
+#include <flatpak-enum-types.h>
+#include <flatpak-error.h>
+#include <flatpak-ref.h>
+#include <flatpak-installed-ref.h>
+#include <flatpak-remote-ref.h>
+#include <flatpak-bundle-ref.h>
+#include <flatpak-remote.h>
+#include <flatpak-installation.h>
 
 #undef __FLATPAK_H_INSIDE__
 
diff --git a/lib/test-lib.c b/lib/test-lib.c
index 16599fb..869807e 100644
--- a/lib/test-lib.c
+++ b/lib/test-lib.c
@@ -2,7 +2,7 @@
 
 #include "libglnx/libglnx.h"
 
-#include <xdg-app.h>
+#include <flatpak.h>
 #include <gio/gunixoutputstream.h>
 
 
diff --git a/lib/xdg-app.c b/lib/xdg-app.c
deleted file mode 100644
index 4a71720..0000000
--- a/lib/xdg-app.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "config.h"
-
-#include "xdg-app-version-macros.h"