Rename everything but the on-disk location to flatpak

3 files changed, 11 insertions, 11 deletions

diff --git a/app/Makefile.am.inc b/app/Makefile.am.inc
index 19cbd6e..fa678ce 100644
--- a/app/Makefile.am.inc
+++ b/app/Makefile.am.inc
@@ -1,8 +1,8 @@
 bin_PROGRAMS += \
-	xdg-app \
+	flatpak \
 	$(NULL)
 
-xdg_app_SOURCES = \
+flatpak_SOURCES = \
 	app/flatpak-main.c \
 	app/flatpak-builtins.h \
 	app/flatpak-builtins-add-remote.c \
@@ -30,5 +30,5 @@ xdg_app_SOURCES = \
 	$(xdp_dbus_built_sources)	\
 	$(NULL)
 
-xdg_app_LDADD = $(BASE_LIBS) $(OSTREE_LIBS) $(SOUP_LIBS) $(LIBARCHIVE_LIBS) libglnx.la libflatpak-common.la
-xdg_app_CFLAGS = $(BASE_CFLAGS) $(OSTREE_CFLAGS) $(SOUP_CFLAGS) $(LIBARCHIVE_CFLAGS)
+flatpak_LDADD = $(BASE_LIBS) $(OSTREE_LIBS) $(SOUP_LIBS) $(LIBARCHIVE_LIBS) libglnx.la libflatpak-common.la
+flatpak_CFLAGS = $(BASE_CFLAGS) $(OSTREE_CFLAGS) $(SOUP_CFLAGS) $(LIBARCHIVE_CFLAGS)
diff --git a/app/flatpak-builtins-build-bundle.c b/app/flatpak-builtins-build-bundle.c
index bdc7e9e..cc99843 100644
--- a/app/flatpak-builtins-build-bundle.c
+++ b/app/flatpak-builtins-build-bundle.c
@@ -50,7 +50,7 @@ static GOptionEntry options[] = {
   { "arch", 0, 0, G_OPTION_ARG_STRING, &opt_arch, "Arch to bundle for", "ARCH" },
   { "repo-url", 0, 0, G_OPTION_ARG_STRING, &opt_repo_url, "Url for repo", "URL" },
   { "gpg-keys", 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &opt_gpg_file, "Add GPG key from FILE (- for stdin)", "FILE" },
-  { "oci", 0, 0, G_OPTION_ARG_NONE, &opt_oci, "Export oci image instead of xdg-app bundle"},
+  { "oci", 0, 0, G_OPTION_ARG_NONE, &opt_oci, "Export oci image instead of flatpak bundle"},
 
   { NULL }
 };
@@ -132,7 +132,7 @@ build_bundle (OstreeRepo *repo, GFile *file,
    * later.  Furthermore, the use of an uint32 lets use detect
    * byteorder issues.
    */
-  g_variant_builder_add (&metadata_builder, "{sv}", "xdg-app",
+  g_variant_builder_add (&metadata_builder, "{sv}", "flatpak",
                          g_variant_new_uint32 (0xe5890001));
 
   g_variant_builder_add (&metadata_builder, "{sv}", "ref", g_variant_new_string (full_branch));
@@ -180,7 +180,7 @@ build_bundle (OstreeRepo *repo, GFile *file,
           int i;
           g_autoptr(GFile) icons_dir =
             g_file_resolve_relative_path (root,
-                                          "files/share/app-info/icons/xdg-app");
+                                          "files/share/app-info/icons/flatpak");
           const char *icon_sizes[] = { "64x64", "128x128" };
           const char *icon_sizes_key[] = { "icon-64", "icon-128" };
           g_autofree char *icon_name = g_strconcat (name, ".png", NULL);
@@ -749,7 +749,7 @@ build_oci (OstreeRepo *repo, GFile *file,
   return FALSE;
 #elif !defined(HAVE_LIBARCHIVE)
   g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
-               "This version of xdg-app is not compiled with libarchive support");
+               "This version of flatpak is not compiled with libarchive support");
   return FALSE;
 #else
   struct free_write_archive archive *a = NULL;
@@ -876,7 +876,7 @@ build_oci (OstreeRepo *repo, GFile *file,
   if (archive_write_close (a) != ARCHIVE_OK)
     return propagate_libarchive_error (error, a);
 
-  g_print ("WARNING: the oci format produced by xdg-app is experimental and unstable.\n"
+  g_print ("WARNING: the oci format produced by flatpak is experimental and unstable.\n"
            "Don't use this for anything but experiments for now\n");
 
   return TRUE;
diff --git a/app/flatpak-builtins-build-import-bundle.c b/app/flatpak-builtins-build-import-bundle.c
index 5312a89..b7e0d7e 100644
--- a/app/flatpak-builtins-build-import-bundle.c
+++ b/app/flatpak-builtins-build-import-bundle.c
@@ -36,7 +36,7 @@ static gboolean opt_oci = FALSE;
 
 static GOptionEntry options[] = {
   { "ref", 0, 0, G_OPTION_ARG_STRING, &opt_ref, "Override the ref used for the imported bundle", "REF" },
-  { "oci", 0, 0, G_OPTION_ARG_NONE, &opt_oci, "Import oci image instead of xdg-app bundle"},
+  { "oci", 0, 0, G_OPTION_ARG_NONE, &opt_oci, "Import oci image instead of flatpak bundle"},
   { NULL }
 };
 
@@ -52,7 +52,7 @@ import_oci (OstreeRepo *repo, GFile *file,
   return FALSE;
 #elif !defined(HAVE_LIBARCHIVE)
   g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
-               "This version of xdg-app is not compiled with libarchive support");
+               "This version of flatpak is not compiled with libarchive support");
   return FALSE;
 #else
   g_autoptr(OstreeMutableTree) archive_mtree = NULL;