Rename everything but the on-disk location to flatpak

7 files changed, 69 insertions, 69 deletions

diff --git a/session-helper/Makefile.am.inc b/session-helper/Makefile.am.inc
index 5c93161..89dca77 100644
--- a/session-helper/Makefile.am.inc
+++ b/session-helper/Makefile.am.inc
@@ -1,18 +1,18 @@
 libexec_PROGRAMS += \
-	xdg-app-session-helper \
+	flatpak-session-helper \
 	$(NULL)
 
-service_in_files += session-helper/xdg-app-session-helper.service.in
-systemduserunit_DATA += session-helper/xdg-app-session-helper.service
+service_in_files += session-helper/flatpak-session-helper.service.in
+systemduserunit_DATA += session-helper/flatpak-session-helper.service
 
-service_in_files += session-helper/org.freedesktop.XdgApp.service.in
-dbus_service_DATA += session-helper/org.freedesktop.XdgApp.service
+service_in_files += session-helper/org.freedesktop.Flatpak.service.in
+dbus_service_DATA += session-helper/org.freedesktop.Flatpak.service
 
-xdg_app_session_helper_SOURCES = \
+flatpak_session_helper_SOURCES = \
 	session-helper/flatpak-session-helper.c	\
 	session-helper/flatpak-permission-store.c	\
 	session-helper/flatpak-permission-store.h	\
 	$(NULL)
 
-xdg_app_session_helper_LDADD = $(BASE_LIBS) libflatpak-common.la
-xdg_app_session_helper_CFLAGS = $(BASE_CFLAGS)
+flatpak_session_helper_LDADD = $(BASE_LIBS) libflatpak-common.la
+flatpak_session_helper_CFLAGS = $(BASE_CFLAGS)
diff --git a/session-helper/flatpak-permission-store.c b/session-helper/flatpak-permission-store.c
index 7cab93f..89da8e2 100644
--- a/session-helper/flatpak-permission-store.c
+++ b/session-helper/flatpak-permission-store.c
@@ -144,9 +144,9 @@ ensure_writeout (Table                 *table,
 }
 
 static gboolean
-handle_list (XdgAppPermissionStore *object,
-             GDBusMethodInvocation *invocation,
-             const gchar           *table_name)
+handle_list (FlatpakPermissionStore *object,
+             GDBusMethodInvocation  *invocation,
+             const gchar            *table_name)
 {
   Table *table;
 
@@ -158,7 +158,7 @@ handle_list (XdgAppPermissionStore *object,
 
   ids = flatpak_db_list_ids (table->db);
 
-  xdg_app_permission_store_complete_list (object, invocation, (const char * const *) ids);
+  flatpak_permission_store_complete_list (object, invocation, (const char * const *) ids);
 
   return TRUE;
 }
@@ -186,10 +186,10 @@ get_app_permissions (FlatpakDbEntry *entry)
 }
 
 static gboolean
-handle_lookup (XdgAppPermissionStore *object,
-               GDBusMethodInvocation *invocation,
-               const gchar           *table_name,
-               const gchar           *id)
+handle_lookup (FlatpakPermissionStore *object,
+               GDBusMethodInvocation  *invocation,
+               const gchar            *table_name,
+               const gchar            *id)
 {
   Table *table;
 
@@ -213,7 +213,7 @@ handle_lookup (XdgAppPermissionStore *object,
   data = flatpak_db_entry_get_data (entry);
   permissions = get_app_permissions (entry);
 
-  xdg_app_permission_store_complete_lookup (object, invocation,
+  flatpak_permission_store_complete_lookup (object, invocation,
                                             permissions,
                                             g_variant_new_variant (data));
 
@@ -221,10 +221,10 @@ handle_lookup (XdgAppPermissionStore *object,
 }
 
 static void
-emit_deleted (XdgAppPermissionStore *object,
-              const gchar           *table_name,
-              const gchar           *id,
-              FlatpakDbEntry        *entry)
+emit_deleted (FlatpakPermissionStore *object,
+              const gchar            *table_name,
+              const gchar            *id,
+              FlatpakDbEntry         *entry)
 {
   g_autoptr(GVariant) data = NULL;
   g_autoptr(GVariant) permissions = NULL;
@@ -232,7 +232,7 @@ emit_deleted (XdgAppPermissionStore *object,
   data = flatpak_db_entry_get_data (entry);
   permissions = g_variant_ref_sink (g_variant_new_array (G_VARIANT_TYPE ("{sas}"), NULL, 0));
 
-  xdg_app_permission_store_emit_changed (object,
+  flatpak_permission_store_emit_changed (object,
                                          table_name, id,
                                          TRUE,
                                          g_variant_new_variant (data),
@@ -241,10 +241,10 @@ emit_deleted (XdgAppPermissionStore *object,
 
 
 static void
-emit_changed (XdgAppPermissionStore *object,
-              const gchar           *table_name,
-              const gchar           *id,
-              FlatpakDbEntry        *entry)
+emit_changed (FlatpakPermissionStore *object,
+              const gchar            *table_name,
+              const gchar            *id,
+              FlatpakDbEntry         *entry)
 {
   g_autoptr(GVariant) data = NULL;
   g_autoptr(GVariant) permissions = NULL;
@@ -252,7 +252,7 @@ emit_changed (XdgAppPermissionStore *object,
   data = flatpak_db_entry_get_data (entry);
   permissions = get_app_permissions (entry);
 
-  xdg_app_permission_store_emit_changed (object,
+  flatpak_permission_store_emit_changed (object,
                                          table_name, id,
                                          FALSE,
                                          g_variant_new_variant (data),
@@ -260,10 +260,10 @@ emit_changed (XdgAppPermissionStore *object,
 }
 
 static gboolean
-handle_delete (XdgAppPermissionStore *object,
-               GDBusMethodInvocation *invocation,
-               const gchar           *table_name,
-               const gchar           *id)
+handle_delete (FlatpakPermissionStore *object,
+               GDBusMethodInvocation  *invocation,
+               const gchar            *table_name,
+               const gchar            *id)
 {
   Table *table;
 
@@ -291,13 +291,13 @@ handle_delete (XdgAppPermissionStore *object,
 }
 
 static gboolean
-handle_set (XdgAppPermissionStore *object,
-            GDBusMethodInvocation *invocation,
-            const gchar           *table_name,
-            gboolean               create,
-            const gchar           *id,
-            GVariant              *app_permissions,
-            GVariant              *data)
+handle_set (FlatpakPermissionStore *object,
+            GDBusMethodInvocation  *invocation,
+            const gchar            *table_name,
+            gboolean                create,
+            const gchar            *id,
+            GVariant               *app_permissions,
+            GVariant               *data)
 {
   Table *table;
   GVariantIter iter;
@@ -349,13 +349,13 @@ handle_set (XdgAppPermissionStore *object,
 }
 
 static gboolean
-handle_set_permission (XdgAppPermissionStore *object,
-                       GDBusMethodInvocation *invocation,
-                       const gchar           *table_name,
-                       gboolean               create,
-                       const gchar           *id,
-                       const gchar           *app,
-                       const gchar *const    *permissions)
+handle_set_permission (FlatpakPermissionStore *object,
+                       GDBusMethodInvocation  *invocation,
+                       const gchar            *table_name,
+                       gboolean                create,
+                       const gchar            *id,
+                       const gchar            *app,
+                       const gchar *const     *permissions)
 {
   Table *table;
 
@@ -392,12 +392,12 @@ handle_set_permission (XdgAppPermissionStore *object,
 }
 
 static gboolean
-handle_set_value (XdgAppPermissionStore *object,
-                  GDBusMethodInvocation *invocation,
-                  const gchar           *table_name,
-                  gboolean               create,
-                  const gchar           *id,
-                  GVariant              *data)
+handle_set_value (FlatpakPermissionStore *object,
+                  GDBusMethodInvocation  *invocation,
+                  const gchar            *table_name,
+                  gboolean                create,
+                  const gchar            *id,
+                  GVariant               *data)
 {
   Table *table;
 
@@ -439,13 +439,13 @@ handle_set_value (XdgAppPermissionStore *object,
 void
 flatpak_permission_store_start (GDBusConnection *connection)
 {
-  XdgAppPermissionStore *store;
+  FlatpakPermissionStore *store;
   GError *error = NULL;
 
   tables = g_hash_table_new_full (g_str_hash, g_str_equal,
                                   g_free, (GDestroyNotify) table_free);
 
-  store = xdg_app_permission_store_skeleton_new ();
+  store = flatpak_permission_store_skeleton_new ();
 
   g_signal_connect (store, "handle-list", G_CALLBACK (handle_list), NULL);
   g_signal_connect (store, "handle-lookup", G_CALLBACK (handle_lookup), NULL);
diff --git a/session-helper/flatpak-session-helper.c b/session-helper/flatpak-session-helper.c
index d9ba8b3..54ec63e 100644
--- a/session-helper/flatpak-session-helper.c
+++ b/session-helper/flatpak-session-helper.c
@@ -30,11 +30,11 @@
 static char *monitor_dir;
 
 static gboolean
-handle_request_monitor (XdgAppSessionHelper   *object,
+handle_request_monitor (FlatpakSessionHelper   *object,
                         GDBusMethodInvocation *invocation,
                         gpointer               user_data)
 {
-  xdg_app_session_helper_complete_request_monitor (object, invocation,
+  flatpak_session_helper_complete_request_monitor (object, invocation,
                                                    monitor_dir);
 
   return TRUE;
@@ -45,12 +45,12 @@ on_bus_acquired (GDBusConnection *connection,
                  const gchar     *name,
                  gpointer         user_data)
 {
-  XdgAppSessionHelper *helper;
+  FlatpakSessionHelper *helper;
   GError *error = NULL;
 
   flatpak_permission_store_start (connection);
 
-  helper = xdg_app_session_helper_skeleton_new ();
+  helper = flatpak_session_helper_skeleton_new ();
 
   g_signal_connect (helper, "handle-request-monitor", G_CALLBACK (handle_request_monitor), NULL);
 
@@ -134,7 +134,7 @@ main (int    argc,
 
   g_set_prgname (argv[0]);
 
-  monitor_dir = g_build_filename (g_get_user_runtime_dir (), "xdg-app-monitor", NULL);
+  monitor_dir = g_build_filename (g_get_user_runtime_dir (), "flatpak-monitor", NULL);
   if (g_mkdir_with_parents (monitor_dir, 0755) != 0)
     {
       g_print ("Can't create %s\n", monitor_dir);
diff --git a/session-helper/flatpak-session-helper.service.in b/session-helper/flatpak-session-helper.service.in
new file mode 100644
index 0000000..e14cc27
--- /dev/null
+++ b/session-helper/flatpak-session-helper.service.in
@@ -0,0 +1,7 @@
+[Unit]
+Description=flatpak session helper
+
+[Service]
+BusName=org.freedesktop.Flatpak
+ExecStart=@libexecdir@/flatpak-session-helper
+Type=dbus
diff --git a/session-helper/org.freedesktop.Flatpak.service.in b/session-helper/org.freedesktop.Flatpak.service.in
new file mode 100644
index 0000000..e02215e
--- /dev/null
+++ b/session-helper/org.freedesktop.Flatpak.service.in
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=org.freedesktop.Flatpak
+Exec=@libexecdir@/flatpak-session-helper
+SystemdService=flatpak-session-helper.service
diff --git a/session-helper/org.freedesktop.XdgApp.service.in b/session-helper/org.freedesktop.XdgApp.service.in
deleted file mode 100644
index 3ad6f64..0000000
--- a/session-helper/org.freedesktop.XdgApp.service.in
+++ /dev/null
@@ -1,4 +0,0 @@
-[D-BUS Service]
-Name=org.freedesktop.XdgApp
-Exec=@libexecdir@/xdg-app-session-helper
-SystemdService=xdg-app-session-helper.service
diff --git a/session-helper/xdg-app-session-helper.service.in b/session-helper/xdg-app-session-helper.service.in
deleted file mode 100644
index 7279a3a..0000000
--- a/session-helper/xdg-app-session-helper.service.in
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=xdg-app session helper
-
-[Service]
-BusName=org.freedesktop.XdgApp
-ExecStart=@libexecdir@/xdg-app-session-helper
-Type=dbus