Rename all non-autogenerated symbols to flatpak

3 files changed, 102 insertions, 102 deletions

diff --git a/tests/Makefile.am.inc b/tests/Makefile.am.inc
index a59a87a..e9af7ab 100644
--- a/tests/Makefile.am.inc
+++ b/tests/Makefile.am.inc
@@ -1,7 +1,7 @@
 TESTS_ENVIRONMENT += OT_TESTS_DEBUG=1 \
-	XDG_APP_TRIGGERSDIR=$$(cd $(top_srcdir) && pwd)/triggers \
-	XDG_APP_BWRAP=$$(cd $(top_builddir) && pwd)/bwrap \
-	XDG_APP_DBUSPROXY=$$(cd $(top_builddir) && pwd)/xdg-dbus-proxy \
+	FLATPAK_TRIGGERSDIR=$$(cd $(top_srcdir) && pwd)/triggers \
+	FLATPAK_BWRAP=$$(cd $(top_builddir) && pwd)/bwrap \
+	FLATPAK_DBUSPROXY=$$(cd $(top_builddir) && pwd)/xdg-dbus-proxy \
 	GI_TYPELIB_PATH=$$(cd $(top_builddir) && pwd) \
 	LD_LIBRARY_PATH=$$(cd $(top_builddir)/.libs && pwd) \
 	PATH=$$(cd $(top_builddir) && pwd):$${PATH} \
diff --git a/tests/test-basic.sh b/tests/test-basic.sh
index 89466ba..fc88a12 100755
--- a/tests/test-basic.sh
+++ b/tests/test-basic.sh
@@ -26,7 +26,7 @@ echo "1..3"
 ${XDG_APP} --version > version_out
 
 VERSION=`cat $(dirname $0)/package_version.txt`
-assert_file_has_content version_out "^xdg-app $VERSION$"
+assert_file_has_content version_out "^flatpak $VERSION$"
 
 echo "ok version"
 
diff --git a/tests/testdb.c b/tests/testdb.c
index c14e268..d5d2cf9 100644
--- a/tests/testdb.c
+++ b/tests/testdb.c
@@ -5,144 +5,144 @@
 
 /*
 static void
-dump_db (XdgAppDb *db)
+dump_db (FlatpakDb *db)
 {
-  g_autofree char *s = xdg_app_db_print (db);
+  g_autofree char *s = flatpak_db_print (db);
   g_printerr ("\n%s\n", s);
 }
 */
 
-static XdgAppDb *
+static FlatpakDb *
 create_test_db (gboolean serialized)
 {
-  XdgAppDb *db;
-
-  g_autoptr(XdgAppDbEntry) entry1 = NULL;
-  g_autoptr(XdgAppDbEntry) entry2 = NULL;
-  g_autoptr(XdgAppDbEntry) entry3 = NULL;
-  g_autoptr(XdgAppDbEntry) entry4 = NULL;
-  g_autoptr(XdgAppDbEntry) entry5 = NULL;
-  g_autoptr(XdgAppDbEntry) entry6 = NULL;
-  g_autoptr(XdgAppDbEntry) entry7 = NULL;
+  FlatpakDb *db;
+
+  g_autoptr(FlatpakDbEntry) entry1 = NULL;
+  g_autoptr(FlatpakDbEntry) entry2 = NULL;
+  g_autoptr(FlatpakDbEntry) entry3 = NULL;
+  g_autoptr(FlatpakDbEntry) entry4 = NULL;
+  g_autoptr(FlatpakDbEntry) entry5 = NULL;
+  g_autoptr(FlatpakDbEntry) entry6 = NULL;
+  g_autoptr(FlatpakDbEntry) entry7 = NULL;
   GError *error = NULL;
   const char *permissions1[] = { "read", "write", NULL };
   const char *permissions2[] = { "read", NULL };
   const char *permissions3[] = { "write", NULL };
 
-  db = xdg_app_db_new (NULL, FALSE, &error);
+  db = flatpak_db_new (NULL, FALSE, &error);
   g_assert_no_error (error);
   g_assert (db != NULL);
 
   {
-    g_auto(GStrv) ids = xdg_app_db_list_ids (db);
+    g_auto(GStrv) ids = flatpak_db_list_ids (db);
     g_assert (ids != NULL);
     g_assert (ids[0] == NULL);
   }
 
   {
-    g_auto(GStrv) apps = xdg_app_db_list_apps (db);
+    g_auto(GStrv) apps = flatpak_db_list_apps (db);
     g_assert (apps != NULL);
     g_assert (apps[0] == NULL);
   }
 
-  entry1 = xdg_app_db_entry_new (g_variant_new_string ("foo-data"));
-  entry2 = xdg_app_db_entry_set_app_permissions (entry1, "org.test.bapp", permissions2);
-  entry3 = xdg_app_db_entry_set_app_permissions (entry2, "org.test.app", permissions1);
-  entry4 = xdg_app_db_entry_set_app_permissions (entry3, "org.test.capp", permissions1);
+  entry1 = flatpak_db_entry_new (g_variant_new_string ("foo-data"));
+  entry2 = flatpak_db_entry_set_app_permissions (entry1, "org.test.bapp", permissions2);
+  entry3 = flatpak_db_entry_set_app_permissions (entry2, "org.test.app", permissions1);
+  entry4 = flatpak_db_entry_set_app_permissions (entry3, "org.test.capp", permissions1);
 
-  xdg_app_db_set_entry (db, "foo", entry4);
+  flatpak_db_set_entry (db, "foo", entry4);
 
-  entry5 = xdg_app_db_entry_new (g_variant_new_string ("bar-data"));
-  entry6 = xdg_app_db_entry_set_app_permissions (entry5, "org.test.app", permissions2);
-  entry7 = xdg_app_db_entry_set_app_permissions (entry6, "org.test.dapp", permissions3);
+  entry5 = flatpak_db_entry_new (g_variant_new_string ("bar-data"));
+  entry6 = flatpak_db_entry_set_app_permissions (entry5, "org.test.app", permissions2);
+  entry7 = flatpak_db_entry_set_app_permissions (entry6, "org.test.dapp", permissions3);
 
-  xdg_app_db_set_entry (db, "bar", entry7);
+  flatpak_db_set_entry (db, "bar", entry7);
 
   if (serialized)
-    xdg_app_db_update (db);
+    flatpak_db_update (db);
 
   return db;
 }
 
 static void
-verify_test_db (XdgAppDb *db)
+verify_test_db (FlatpakDb *db)
 {
   g_auto(GStrv) ids;
   g_autofree const char **apps1 = NULL;
   g_autofree const char **apps2 = NULL;
   g_auto(GStrv) all_apps = NULL;
 
-  ids = xdg_app_db_list_ids (db);
+  ids = flatpak_db_list_ids (db);
   g_assert (g_strv_length (ids) == 2);
   g_assert (g_strv_contains ((const char **) ids, "foo"));
   g_assert (g_strv_contains ((const char **) ids, "bar"));
 
   {
-    g_autoptr(XdgAppDbEntry) entry = NULL;
+    g_autoptr(FlatpakDbEntry) entry = NULL;
     g_autofree const char **permissions1 = NULL;
     g_autofree const char **permissions2 = NULL;
     g_autofree const char **permissions3 = NULL;
     g_autofree const char **permissions4 = NULL;
     g_autoptr(GVariant) data1 = NULL;
 
-    entry = xdg_app_db_lookup (db, "foo");
+    entry = flatpak_db_lookup (db, "foo");
     g_assert (entry != NULL);
-    data1 = xdg_app_db_entry_get_data (entry);
+    data1 = flatpak_db_entry_get_data (entry);
     g_assert (data1 != NULL);
     g_assert_cmpstr (g_variant_get_type_string (data1), ==, "s");
     g_assert_cmpstr (g_variant_get_string (data1, NULL), ==, "foo-data");
-    apps1 = xdg_app_db_entry_list_apps (entry);
+    apps1 = flatpak_db_entry_list_apps (entry);
     g_assert (g_strv_length ((char **) apps1) == 3);
     g_assert (g_strv_contains (apps1, "org.test.app"));
     g_assert (g_strv_contains (apps1, "org.test.bapp"));
     g_assert (g_strv_contains (apps1, "org.test.capp"));
-    permissions1 = xdg_app_db_entry_list_permissions (entry, "org.test.app");
+    permissions1 = flatpak_db_entry_list_permissions (entry, "org.test.app");
     g_assert (g_strv_length ((char **) permissions1) == 2);
     g_assert (g_strv_contains (permissions1, "read"));
     g_assert (g_strv_contains (permissions1, "write"));
-    permissions2 = xdg_app_db_entry_list_permissions (entry, "org.test.bapp");
+    permissions2 = flatpak_db_entry_list_permissions (entry, "org.test.bapp");
     g_assert (g_strv_length ((char **) permissions2) == 1);
     g_assert (g_strv_contains (permissions2, "read"));
-    permissions3 = xdg_app_db_entry_list_permissions (entry, "org.test.capp");
+    permissions3 = flatpak_db_entry_list_permissions (entry, "org.test.capp");
     g_assert (g_strv_length ((char **) permissions3) == 2);
     g_assert (g_strv_contains (permissions3, "read"));
     g_assert (g_strv_contains (permissions3, "write"));
-    permissions4 = xdg_app_db_entry_list_permissions (entry, "org.test.noapp");
+    permissions4 = flatpak_db_entry_list_permissions (entry, "org.test.noapp");
     g_assert (permissions4 != NULL);
     g_assert (g_strv_length ((char **) permissions4) == 0);
   }
 
   {
-    g_autoptr(XdgAppDbEntry) entry = NULL;
+    g_autoptr(FlatpakDbEntry) entry = NULL;
     g_autofree const char **permissions5 = NULL;
     g_autofree const char **permissions6 = NULL;
     g_autoptr(GVariant) data2 = NULL;
 
-    entry = xdg_app_db_lookup (db, "bar");
+    entry = flatpak_db_lookup (db, "bar");
     g_assert (entry != NULL);
-    data2 = xdg_app_db_entry_get_data (entry);
+    data2 = flatpak_db_entry_get_data (entry);
     g_assert (data2 != NULL);
     g_assert_cmpstr (g_variant_get_type_string (data2), ==, "s");
     g_assert_cmpstr (g_variant_get_string (data2, NULL), ==, "bar-data");
-    apps2 = xdg_app_db_entry_list_apps (entry);
+    apps2 = flatpak_db_entry_list_apps (entry);
     g_assert (g_strv_length ((char **) apps2) == 2);
     g_assert (g_strv_contains (apps2, "org.test.app"));
     g_assert (g_strv_contains (apps2, "org.test.dapp"));
-    permissions5 = xdg_app_db_entry_list_permissions (entry, "org.test.app");
+    permissions5 = flatpak_db_entry_list_permissions (entry, "org.test.app");
     g_assert (g_strv_length ((char **) permissions5) == 1);
     g_assert (g_strv_contains (permissions5, "read"));
-    permissions6 = xdg_app_db_entry_list_permissions (entry, "org.test.dapp");
+    permissions6 = flatpak_db_entry_list_permissions (entry, "org.test.dapp");
     g_assert (g_strv_length ((char **) permissions6) == 1);
     g_assert (g_strv_contains (permissions6, "write"));
   }
 
   {
-    g_autoptr(XdgAppDbEntry) entry = NULL;
-    entry = xdg_app_db_lookup (db, "gazonk");
+    g_autoptr(FlatpakDbEntry) entry = NULL;
+    entry = flatpak_db_lookup (db, "gazonk");
     g_assert (entry == NULL);
   }
 
-  all_apps = xdg_app_db_list_apps (db);
+  all_apps = flatpak_db_list_apps (db);
   g_assert (g_strv_length (all_apps) == 4);
   g_assert (g_strv_contains ((const char **) all_apps, "org.test.app"));
   g_assert (g_strv_contains ((const char **) all_apps, "org.test.bapp"));
@@ -154,20 +154,20 @@ static void
 test_db_open (void)
 {
   GError *error = NULL;
-  XdgAppDb *db;
+  FlatpakDb *db;
 
-  db = xdg_app_db_new (DB_DIR "/does_not_exist", TRUE, &error);
+  db = flatpak_db_new (DB_DIR "/does_not_exist", TRUE, &error);
   g_assert_error (error, G_FILE_ERROR, G_FILE_ERROR_NOENT);
   g_assert (db == NULL);
   g_clear_error (&error);
 
-  db = xdg_app_db_new (DB_DIR "/does_not_exist", FALSE, &error);
+  db = flatpak_db_new (DB_DIR "/does_not_exist", FALSE, &error);
   g_assert_no_error (error);
   g_assert (db != NULL);
   g_clear_error (&error);
   g_object_unref (db);
 
-  db = xdg_app_db_new (DB_DIR "/no_tables", TRUE, &error);
+  db = flatpak_db_new (DB_DIR "/no_tables", TRUE, &error);
   g_assert_error (error, G_FILE_ERROR, G_FILE_ERROR_INVAL);
   g_assert (db == NULL);
   g_clear_error (&error);
@@ -176,8 +176,8 @@ test_db_open (void)
 static void
 test_serialize (void)
 {
-  g_autoptr(XdgAppDb) db = NULL;
-  g_autoptr(XdgAppDb) db2 = NULL;
+  g_autoptr(FlatpakDb) db = NULL;
+  g_autoptr(FlatpakDb) db2 = NULL;
   g_autofree char *dump1 = NULL;
   g_autofree char *dump2 = NULL;
   g_autofree char *dump3 = NULL;
@@ -189,33 +189,33 @@ test_serialize (void)
 
   verify_test_db (db);
 
-  dump1 = xdg_app_db_print (db);
+  dump1 = flatpak_db_print (db);
 
-  g_assert (xdg_app_db_is_dirty (db));
+  g_assert (flatpak_db_is_dirty (db));
 
-  xdg_app_db_update (db);
+  flatpak_db_update (db);
 
   verify_test_db (db);
 
-  g_assert (!xdg_app_db_is_dirty (db));
+  g_assert (!flatpak_db_is_dirty (db));
 
-  dump2 = xdg_app_db_print (db);
+  dump2 = flatpak_db_print (db);
 
   g_assert_cmpstr (dump1, ==, dump2);
 
   fd = g_mkstemp (tmpfile);
   close (fd);
 
-  xdg_app_db_set_path (db, tmpfile);
+  flatpak_db_set_path (db, tmpfile);
 
-  xdg_app_db_save_content (db, &error);
+  flatpak_db_save_content (db, &error);
   g_assert_no_error (error);
 
-  db2 = xdg_app_db_new (tmpfile, TRUE, &error);
+  db2 = flatpak_db_new (tmpfile, TRUE, &error);
   g_assert_no_error (error);
   g_assert (db2 != NULL);
 
-  dump3 = xdg_app_db_print (db2);
+  dump3 = flatpak_db_print (db2);
 
   g_assert_cmpstr (dump1, ==, dump3);
 
@@ -225,7 +225,7 @@ test_serialize (void)
 static void
 test_modify (void)
 {
-  g_autoptr(XdgAppDb) db = NULL;
+  g_autoptr(FlatpakDb) db = NULL;
   const char *permissions[] = { "read", "write", "execute", NULL };
   const char *no_permissions[] = { NULL };
 
@@ -233,68 +233,68 @@ test_modify (void)
 
   /* Add permission */
   {
-    g_autoptr(XdgAppDbEntry) entry1 = NULL;
-    g_autoptr(XdgAppDbEntry) entry2 = NULL;
+    g_autoptr(FlatpakDbEntry) entry1 = NULL;
+    g_autoptr(FlatpakDbEntry) entry2 = NULL;
 
-    entry1 = xdg_app_db_lookup (db, "foo");
-    entry2 = xdg_app_db_entry_set_app_permissions (entry1, "org.test.app", permissions);
-    xdg_app_db_set_entry (db, "foo", entry2);
+    entry1 = flatpak_db_lookup (db, "foo");
+    entry2 = flatpak_db_entry_set_app_permissions (entry1, "org.test.app", permissions);
+    flatpak_db_set_entry (db, "foo", entry2);
   }
 
   /* Add entry */
   {
-    g_autoptr(XdgAppDbEntry) entry1 = NULL;
-    g_autoptr(XdgAppDbEntry) entry2 = NULL;
+    g_autoptr(FlatpakDbEntry) entry1 = NULL;
+    g_autoptr(FlatpakDbEntry) entry2 = NULL;
 
-    entry1 = xdg_app_db_entry_new (g_variant_new_string ("gazonk-data"));
-    entry2 = xdg_app_db_entry_set_app_permissions (entry1, "org.test.eapp", permissions);
-    xdg_app_db_set_entry (db, "gazonk", entry2);
+    entry1 = flatpak_db_entry_new (g_variant_new_string ("gazonk-data"));
+    entry2 = flatpak_db_entry_set_app_permissions (entry1, "org.test.eapp", permissions);
+    flatpak_db_set_entry (db, "gazonk", entry2);
   }
 
   /* Remove permission */
   {
-    g_autoptr(XdgAppDbEntry) entry1 = NULL;
-    g_autoptr(XdgAppDbEntry) entry2 = NULL;
+    g_autoptr(FlatpakDbEntry) entry1 = NULL;
+    g_autoptr(FlatpakDbEntry) entry2 = NULL;
 
-    entry1 = xdg_app_db_lookup (db, "bar");
-    entry2 = xdg_app_db_entry_set_app_permissions (entry1, "org.test.dapp", no_permissions);
-    xdg_app_db_set_entry (db, "bar", entry2);
+    entry1 = flatpak_db_lookup (db, "bar");
+    entry2 = flatpak_db_entry_set_app_permissions (entry1, "org.test.dapp", no_permissions);
+    flatpak_db_set_entry (db, "bar", entry2);
   }
 
   /* Verify */
   {
-    g_autoptr(XdgAppDbEntry) entry5 = NULL;
-    g_autoptr(XdgAppDbEntry) entry6 = NULL;
-    g_autoptr(XdgAppDbEntry) entry7 = NULL;
+    g_autoptr(FlatpakDbEntry) entry5 = NULL;
+    g_autoptr(FlatpakDbEntry) entry6 = NULL;
+    g_autoptr(FlatpakDbEntry) entry7 = NULL;
     g_autofree const char **apps2 = NULL;
     g_auto(GStrv) apps3 = NULL;
     g_autofree const char **permissions1 = NULL;
     g_autofree const char **permissions2 = NULL;
     g_autofree const char **permissions3 = NULL;
 
-    entry5 = xdg_app_db_lookup (db, "foo");
-    permissions1 = xdg_app_db_entry_list_permissions (entry5, "org.test.app");
+    entry5 = flatpak_db_lookup (db, "foo");
+    permissions1 = flatpak_db_entry_list_permissions (entry5, "org.test.app");
     g_assert (g_strv_length ((char **) permissions1) == 3);
     g_assert (g_strv_contains (permissions1, "read"));
     g_assert (g_strv_contains (permissions1, "write"));
     g_assert (g_strv_contains (permissions1, "execute"));
 
-    entry6 = xdg_app_db_lookup (db, "bar");
-    permissions2 = xdg_app_db_entry_list_permissions (entry6, "org.test.dapp");
+    entry6 = flatpak_db_lookup (db, "bar");
+    permissions2 = flatpak_db_entry_list_permissions (entry6, "org.test.dapp");
     g_assert (g_strv_length ((char **) permissions2) == 0);
 
-    entry7 = xdg_app_db_lookup (db, "gazonk");
-    permissions3 = xdg_app_db_entry_list_permissions (entry7, "org.test.eapp");
+    entry7 = flatpak_db_lookup (db, "gazonk");
+    permissions3 = flatpak_db_entry_list_permissions (entry7, "org.test.eapp");
     g_assert (g_strv_length ((char **) permissions3) == 3);
     g_assert (g_strv_contains (permissions3, "read"));
     g_assert (g_strv_contains (permissions3, "write"));
     g_assert (g_strv_contains (permissions3, "execute"));
 
-    apps2 = xdg_app_db_entry_list_apps (entry6);
+    apps2 = flatpak_db_entry_list_apps (entry6);
     g_assert_cmpint (g_strv_length ((char **) apps2), ==, 1);
     g_assert (g_strv_contains (apps2, "org.test.app"));
 
-    apps3 = xdg_app_db_list_apps (db);
+    apps3 = flatpak_db_list_apps (db);
     g_assert_cmpint (g_strv_length (apps3), ==, 4);
     g_assert (g_strv_contains ((const char **) apps3, "org.test.app"));
     g_assert (g_strv_contains ((const char **) apps3, "org.test.bapp"));
@@ -302,42 +302,42 @@ test_modify (void)
     g_assert (g_strv_contains ((const char **) apps3, "org.test.eapp"));
   }
 
-  xdg_app_db_update (db);
+  flatpak_db_update (db);
 
   /* Verify after serialize */
   {
-    g_autoptr(XdgAppDbEntry) entry5 = NULL;
-    g_autoptr(XdgAppDbEntry) entry6 = NULL;
-    g_autoptr(XdgAppDbEntry) entry7 = NULL;
+    g_autoptr(FlatpakDbEntry) entry5 = NULL;
+    g_autoptr(FlatpakDbEntry) entry6 = NULL;
+    g_autoptr(FlatpakDbEntry) entry7 = NULL;
     g_autofree const char **apps2 = NULL;
     g_auto(GStrv) apps3 = NULL;
     g_autofree const char **permissions1 = NULL;
     g_autofree const char **permissions2 = NULL;
     g_autofree const char **permissions3 = NULL;
 
-    entry5 = xdg_app_db_lookup (db, "foo");
-    permissions1 = xdg_app_db_entry_list_permissions (entry5, "org.test.app");
+    entry5 = flatpak_db_lookup (db, "foo");
+    permissions1 = flatpak_db_entry_list_permissions (entry5, "org.test.app");
     g_assert (g_strv_length ((char **) permissions1) == 3);
     g_assert (g_strv_contains (permissions1, "read"));
     g_assert (g_strv_contains (permissions1, "write"));
     g_assert (g_strv_contains (permissions1, "execute"));
 
-    entry6 = xdg_app_db_lookup (db, "bar");
-    permissions2 = xdg_app_db_entry_list_permissions (entry6, "org.test.dapp");
+    entry6 = flatpak_db_lookup (db, "bar");
+    permissions2 = flatpak_db_entry_list_permissions (entry6, "org.test.dapp");
     g_assert (g_strv_length ((char **) permissions2) == 0);
 
-    entry7 = xdg_app_db_lookup (db, "gazonk");
-    permissions3 = xdg_app_db_entry_list_permissions (entry7, "org.test.eapp");
+    entry7 = flatpak_db_lookup (db, "gazonk");
+    permissions3 = flatpak_db_entry_list_permissions (entry7, "org.test.eapp");
     g_assert (g_strv_length ((char **) permissions3) == 3);
     g_assert (g_strv_contains (permissions3, "read"));
     g_assert (g_strv_contains (permissions3, "write"));
     g_assert (g_strv_contains (permissions3, "execute"));
 
-    apps2 = xdg_app_db_entry_list_apps (entry6);
+    apps2 = flatpak_db_entry_list_apps (entry6);
     g_assert_cmpint (g_strv_length ((char **) apps2), ==, 1);
     g_assert (g_strv_contains (apps2, "org.test.app"));
 
-    apps3 = xdg_app_db_list_apps (db);
+    apps3 = flatpak_db_list_apps (db);
     g_assert_cmpint (g_strv_length (apps3), ==, 4);
     g_assert (g_strv_contains ((const char **) apps3, "org.test.app"));
     g_assert (g_strv_contains ((const char **) apps3, "org.test.bapp"));