Rename all non-autogenerated symbols to flatpak

9 files changed, 49 insertions, 49 deletions

diff --git a/builder/builder-context.c b/builder/builder-context.c
index 4167de4..07d0e05 100644
--- a/builder/builder-context.c
+++ b/builder/builder-context.c
@@ -248,7 +248,7 @@ const char *
 builder_context_get_arch (BuilderContext *self)
 {
   if (self->arch == NULL)
-    self->arch = g_strdup (xdg_app_get_arch ());
+    self->arch = g_strdup (flatpak_get_arch ());
 
   return (const char *) self->arch;
 }
diff --git a/builder/builder-manifest.c b/builder/builder-manifest.c
index e6da205..d6e1545 100644
--- a/builder/builder-manifest.c
+++ b/builder/builder-manifest.c
@@ -826,7 +826,7 @@ xdg_app (GError **error,
   va_list ap;
 
   va_start (ap, error);
-  res = xdg_app_spawn (NULL, &output, error, "xdg-app", ap);
+  res = flatpak_spawn (NULL, &output, error, "xdg-app", ap);
   va_end (ap);
 
   if (res)
@@ -849,14 +849,14 @@ builder_manifest_start (BuilderManifest *self,
   self->sdk_commit = xdg_app (NULL, "info", arch_option, "--show-commit", self->sdk,
                               builder_manifest_get_runtime_version (self), NULL);
   if (self->sdk_commit == NULL)
-    return xdg_app_fail (error, "Unable to find sdk %s version %s",
+    return flatpak_fail (error, "Unable to find sdk %s version %s",
                          self->sdk,
                          builder_manifest_get_runtime_version (self));
 
   self->runtime_commit = xdg_app (NULL, "info", arch_option, "--show-commit", self->runtime,
                                   builder_manifest_get_runtime_version (self), NULL);
   if (self->runtime_commit == NULL)
-    return xdg_app_fail (error, "Unable to find runtime %s version %s",
+    return flatpak_fail (error, "Unable to find runtime %s version %s",
                          self->runtime,
                          builder_manifest_get_runtime_version (self));
 
diff --git a/builder/builder-module.c b/builder/builder-module.c
index c2fb37a..ad0d815 100644
--- a/builder/builder-module.c
+++ b/builder/builder-module.c
@@ -563,7 +563,7 @@ build (GFile          *app_dir,
        BuilderContext *context,
        GFile          *source_dir,
        const char     *cwd_subdir,
-       char          **xdg_app_opts,
+       char          **flatpak_opts,
        char          **env_vars,
        GError        **error,
        const gchar    *argv1,
@@ -608,10 +608,10 @@ build (GFile          *app_dir,
       g_ptr_array_add (args, g_strdup_printf ("--bind-mount=/run/ccache=%s", ccache_dir_path));
     }
 
-  if (xdg_app_opts)
+  if (flatpak_opts)
     {
-      for (i = 0; xdg_app_opts[i] != NULL; i++)
-        g_ptr_array_add (args, g_strdup (xdg_app_opts[i]));
+      for (i = 0; flatpak_opts[i] != NULL; i++)
+        g_ptr_array_add (args, g_strdup (flatpak_opts[i]));
     }
 
   if (env_vars)
@@ -681,7 +681,7 @@ builder_module_handle_debuginfo (BuilderModule  *self,
   for (i = 0; i < modified->len; i++)
     g_ptr_array_add (added_or_modified, g_ptr_array_index (modified, i));
 
-  g_ptr_array_sort (added_or_modified, xdg_app_strcmp0_ptr);
+  g_ptr_array_sort (added_or_modified, flatpak_strcmp0_ptr);
 
   for (i = 0; i < added_or_modified->len; i++)
     {
@@ -988,10 +988,10 @@ builder_module_build (BuilderModule  *self,
       if (use_builddir)
         {
           if (source_subdir_relative)
-            build_dir_relative = g_build_filename (source_subdir_relative, "_xdg_app_build", NULL);
+            build_dir_relative = g_build_filename (source_subdir_relative, "_flatpak_build", NULL);
           else
-            build_dir_relative = g_strdup ("_xdg_app_build");
-          build_dir = g_file_get_child (source_subdir, "_xdg_app_build");
+            build_dir_relative = g_strdup ("_flatpak_build");
+          build_dir = g_file_get_child (source_subdir, "_flatpak_build");
 
           if (!g_file_make_directory (build_dir, NULL, error))
             return FALSE;
@@ -1198,7 +1198,7 @@ collect_cleanup_for_path (const char **patterns,
     return;
 
   for (i = 0; patterns[i] != NULL; i++)
-    xdg_app_collect_matches_for_path_pattern (path, patterns[i], add_prefix, to_remove_ht);
+    flatpak_collect_matches_for_path_pattern (path, patterns[i], add_prefix, to_remove_ht);
 }
 
 static gboolean
@@ -1212,7 +1212,7 @@ matches_cleanup_for_path (const char **patterns,
 
   for (i = 0; patterns[i] != NULL; i++)
     {
-      if (xdg_app_matches_path_pattern (path, patterns[i]))
+      if (flatpak_matches_path_pattern (path, patterns[i]))
         return TRUE;
     }
 
diff --git a/builder/builder-source-archive.c b/builder/builder-source-archive.c
index 747e974..89a2423 100644
--- a/builder/builder-source-archive.c
+++ b/builder/builder-source-archive.c
@@ -388,7 +388,7 @@ tar (GFile   *dir,
   va_list ap;
 
   va_start (ap, error);
-  res = xdg_app_spawn (dir, NULL, error, "tar", ap);
+  res = flatpak_spawn (dir, NULL, error, "tar", ap);
   va_end (ap);
 
   return res;
@@ -403,7 +403,7 @@ unzip (GFile   *dir,
   va_list ap;
 
   va_start (ap, error);
-  res = xdg_app_spawn (dir, NULL, error, "unzip", ap);
+  res = flatpak_spawn (dir, NULL, error, "unzip", ap);
   va_end (ap);
 
   return res;
diff --git a/builder/builder-source-bzr.c b/builder/builder-source-bzr.c
index 8fa0869..eee4687 100644
--- a/builder/builder-source-bzr.c
+++ b/builder/builder-source-bzr.c
@@ -124,7 +124,7 @@ bzr (GFile   *dir,
   va_list ap;
 
   va_start (ap, error);
-  res = xdg_app_spawn (dir, output, error, "bzr", ap);
+  res = flatpak_spawn (dir, output, error, "bzr", ap);
   va_end (ap);
 
   return res;
diff --git a/builder/builder-source-git.c b/builder/builder-source-git.c
index f7c7f65..d190f6e 100644
--- a/builder/builder-source-git.c
+++ b/builder/builder-source-git.c
@@ -132,7 +132,7 @@ git (GFile   *dir,
   va_list ap;
 
   va_start (ap, error);
-  res = xdg_app_spawn (dir, output, error, "git", ap);
+  res = flatpak_spawn (dir, output, error, "git", ap);
   va_end (ap);
 
   return res;
diff --git a/builder/builder-source-patch.c b/builder/builder-source-patch.c
index 0e49e40..04811b1 100644
--- a/builder/builder-source-patch.c
+++ b/builder/builder-source-patch.c
@@ -157,7 +157,7 @@ patch (GFile   *dir,
   va_list ap;
 
   va_start (ap, error);
-  res = xdg_app_spawn (dir, NULL, error, "patch", ap);
+  res = flatpak_spawn (dir, NULL, error, "patch", ap);
   va_end (ap);
 
   return res;
diff --git a/builder/builder-utils.c b/builder/builder-utils.c
index c4cef7f..8e6a88f 100644
--- a/builder/builder-utils.c
+++ b/builder/builder-utils.c
@@ -77,7 +77,7 @@ inplace_basename (const char *path)
  * path, otherwise just the basename.
  */
 void
-xdg_app_collect_matches_for_path_pattern (const char *path,
+flatpak_collect_matches_for_path_pattern (const char *path,
                                           const char *pattern,
                                           const char *add_prefix,
                                           GHashTable *to_remove_ht)
@@ -86,7 +86,7 @@ xdg_app_collect_matches_for_path_pattern (const char *path,
 
   if (pattern[0] != '/')
     {
-      rest = xdg_app_path_match_prefix (pattern, inplace_basename (path));
+      rest = flatpak_path_match_prefix (pattern, inplace_basename (path));
       if (rest != NULL)
         g_hash_table_insert (to_remove_ht, g_strconcat (add_prefix ? add_prefix : "", path, NULL), GINT_TO_POINTER (1));
     }
@@ -96,7 +96,7 @@ xdg_app_collect_matches_for_path_pattern (const char *path,
        * files, as a prefix match should remove all files below that
        * (in this module) */
 
-      rest = xdg_app_path_match_prefix (pattern, path);
+      rest = flatpak_path_match_prefix (pattern, path);
       while (rest != NULL)
         {
           const char *slash;
@@ -115,13 +115,13 @@ xdg_app_collect_matches_for_path_pattern (const char *path,
 }
 
 gboolean
-xdg_app_matches_path_pattern (const char *path,
+flatpak_matches_path_pattern (const char *path,
                               const char *pattern)
 {
   if (pattern[0] != '/')
     path = inplace_basename (path);
 
-  return xdg_app_path_match_prefix (pattern, path) != NULL;
+  return flatpak_path_match_prefix (pattern, path) != NULL;
 }
 
 gboolean
@@ -132,7 +132,7 @@ strip (GError **error,
   va_list ap;
 
   va_start (ap, error);
-  res = xdg_app_spawn (NULL, NULL, error, "strip", ap);
+  res = flatpak_spawn (NULL, NULL, error, "strip", ap);
   va_end (ap);
 
   return res;
@@ -146,7 +146,7 @@ eu_strip (GError **error,
   va_list ap;
 
   va_start (ap, error);
-  res = xdg_app_spawn (NULL, NULL, error, "eu-strip", ap);
+  res = flatpak_spawn (NULL, NULL, error, "eu-strip", ap);
   va_end (ap);
 
   return res;
@@ -296,8 +296,8 @@ migrate_locale_dir (GFile      *source_dir,
                                          NULL, error))
             return FALSE;
 
-          if (!xdg_app_cp_a (child, locale_subdir,
-                             XDG_APP_CP_FLAGS_MERGE | XDG_APP_CP_FLAGS_MOVE,
+          if (!flatpak_cp_a (child, locale_subdir,
+                             FLATPAK_CP_FLAGS_MERGE | FLATPAK_CP_FLAGS_MOVE,
                              NULL, error))
             return FALSE;
 
@@ -676,19 +676,19 @@ handle_dwarf2_line (DebuginfoData *data, uint32_t off, char *comp_dir, GHashTabl
   endcu = ptr + 4;
   endcu += read_32 (ptr);
   if (endcu == ptr + 0xffffffff)
-    return xdg_app_fail (error, "%s: 64-bit DWARF not supported", data->filename);
+    return flatpak_fail (error, "%s: 64-bit DWARF not supported", data->filename);
 
   if (endcu > endsec)
-    return xdg_app_fail (error, "%s: .debug_line CU does not fit into section", data->filename);
+    return flatpak_fail (error, "%s: .debug_line CU does not fit into section", data->filename);
 
   value = read_16 (ptr);
   if (value != 2 && value != 3 && value != 4)
-    return xdg_app_fail (error, "%s: DWARF version %d unhandled", data->filename, value);
+    return flatpak_fail (error, "%s: DWARF version %d unhandled", data->filename, value);
 
   endprol = ptr + 4;
   endprol += read_32 (ptr);
   if (endprol > endcu)
-    return xdg_app_fail (error, "%s: .debug_line CU prologue does not fit into CU", data->filename);
+    return flatpak_fail (error, "%s: .debug_line CU prologue does not fit into CU", data->filename);
 
   opcode_base = ptr[4 + (value >= 4)];
   ptr = dir = ptr + 4 + (value >= 4) + opcode_base;
@@ -723,7 +723,7 @@ handle_dwarf2_line (DebuginfoData *data, uint32_t off, char *comp_dir, GHashTabl
       value = read_uleb128 (ptr);
 
       if (value >= dirt_cnt)
-        return xdg_app_fail (error, "%s: Wrong directory table index %u",  data->filename, value);
+        return flatpak_fail (error, "%s: Wrong directory table index %u",  data->filename, value);
 
       file_len = strlen (file);
       dir_len = strlen ((char *) dirt[value]);
@@ -978,7 +978,7 @@ handle_dwarf2_section (DebuginfoData *data, GHashTable *files, GError **error)
     }
   else
     {
-      return xdg_app_fail (0, 0, "%s: Wrong ELF data enconding", data->filename);
+      return flatpak_fail (0, 0, "%s: Wrong ELF data enconding", data->filename);
     }
 
   debug_sections = data->debug_sections;
@@ -1098,7 +1098,7 @@ handle_dwarf2_section (DebuginfoData *data, GHashTable *files, GError **error)
 
                 default:
 fail:
-                  return xdg_app_fail (error, "%s: Unhandled relocation %d in .debug_info section",
+                  return flatpak_fail (error, "%s: Unhandled relocation %d in .debug_info section",
                                        data->filename, rtype);
                 }
               relend->ptr = debug_sections[DEBUG_INFO].data
@@ -1126,38 +1126,38 @@ fail:
           g_autoptr(GHashTable) abbrev = NULL;
 
           if (ptr + 11 > endsec)
-            return xdg_app_fail (error, "%s: .debug_info CU header too small", data->filename);
+            return flatpak_fail (error, "%s: .debug_info CU header too small", data->filename);
 
           endcu = ptr + 4;
           endcu += read_32 (ptr);
           if (endcu == ptr + 0xffffffff)
-            return xdg_app_fail (error, "%s: 64-bit DWARF not supported", data->filename);
+            return flatpak_fail (error, "%s: 64-bit DWARF not supported", data->filename);
 
           if (endcu > endsec)
-            return xdg_app_fail (error, "%s: .debug_info too small", data->filename);
+            return flatpak_fail (error, "%s: .debug_info too small", data->filename);
 
           cu_version = read_16 (ptr);
           if (cu_version != 2 && cu_version != 3 && cu_version != 4)
-            return xdg_app_fail (error, "%s: DWARF version %d unhandled", data->filename, cu_version);
+            return flatpak_fail (error, "%s: DWARF version %d unhandled", data->filename, cu_version);
 
           value = read_32_relocated (ptr);
           if (value >= debug_sections[DEBUG_ABBREV].size)
             {
               if (debug_sections[DEBUG_ABBREV].data == NULL)
-                return xdg_app_fail (error, "%s: .debug_abbrev not present", data->filename);
+                return flatpak_fail (error, "%s: .debug_abbrev not present", data->filename);
               else
-                return xdg_app_fail (error, "%s: DWARF CU abbrev offset too large", data->filename);
+                return flatpak_fail (error, "%s: DWARF CU abbrev offset too large", data->filename);
             }
 
           if (ptr_size == 0)
             {
               ptr_size = read_1 (ptr);
               if (ptr_size != 4 && ptr_size != 8)
-                return xdg_app_fail (error, "%s: Invalid DWARF pointer size %d", data->filename, ptr_size);
+                return flatpak_fail (error, "%s: Invalid DWARF pointer size %d", data->filename, ptr_size);
             }
           else if (read_1 (ptr) != ptr_size)
             {
-              return xdg_app_fail (error, "%s: DWARF pointer size differs between CUs", data->filename);
+              return flatpak_fail (error, "%s: DWARF pointer size differs between CUs", data->filename);
             }
 
           abbrev = read_abbrev (data,
@@ -1233,25 +1233,25 @@ builder_get_debuginfo_file_references (const char *filename, GError **error)
   elf = elf_begin (fd, ELF_C_RDWR_MMAP, NULL);
   if (elf == NULL)
     {
-      xdg_app_fail (error, "cannot open ELF file: %s", elf_errmsg (-1));
+      flatpak_fail (error, "cannot open ELF file: %s", elf_errmsg (-1));
       return NULL;
     }
 
   if (elf_kind (elf) != ELF_K_ELF)
     {
-      xdg_app_fail (error, "\"%s\" is not an ELF file", filename);
+      flatpak_fail (error, "\"%s\" is not an ELF file", filename);
       return NULL;
     }
 
   if (gelf_getehdr (elf, &ehdr) == NULL)
     {
-      xdg_app_fail (error, "cannot get the ELF header: %s", elf_errmsg (-1));
+      flatpak_fail (error, "cannot get the ELF header: %s", elf_errmsg (-1));
       return NULL;
     }
 
   if (ehdr.e_type != ET_DYN && ehdr.e_type != ET_EXEC && ehdr.e_type != ET_REL)
     {
-      xdg_app_fail (error, "\"%s\" is not a shared library", filename);
+      flatpak_fail (error, "\"%s\" is not a shared library", filename);
       return NULL;
     }
 
diff --git a/builder/builder-utils.h b/builder/builder-utils.h
index c192e2b..bd31c03 100644
--- a/builder/builder-utils.h
+++ b/builder/builder-utils.h
@@ -44,9 +44,9 @@ char ** builder_get_debuginfo_file_references (const char *filename,
 
 gboolean directory_is_empty (const char *path);
 
-gboolean xdg_app_matches_path_pattern (const char *path,
+gboolean flatpak_matches_path_pattern (const char *path,
                                        const char *pattern);
-void     xdg_app_collect_matches_for_path_pattern (const char *path,
+void     flatpak_collect_matches_for_path_pattern (const char *path,
                                                    const char *pattern,
                                                    const char *add_prefix,
                                                    GHashTable *to_remove_ht);