Rename everything but the on-disk location to flatpak

9 files changed, 42 insertions, 42 deletions

diff --git a/system-helper/Makefile.am.inc b/system-helper/Makefile.am.inc
index 7b34696..32cb7e7 100644
--- a/system-helper/Makefile.am.inc
+++ b/system-helper/Makefile.am.inc
@@ -1,34 +1,34 @@
 libexec_PROGRAMS += \
-	xdg-app-system-helper \
+	flatpak-system-helper \
 	$(NULL)
 
 dbussystemservicedir = $(datadir)/dbus-1/system-services
-service_in_files += system-helper/org.freedesktop.XdgApp.SystemHelper.service.in
-dbussystemservice_DATA = system-helper/org.freedesktop.XdgApp.SystemHelper.service
+service_in_files += system-helper/org.freedesktop.Flatpak.SystemHelper.service.in
+dbussystemservice_DATA = system-helper/org.freedesktop.Flatpak.SystemHelper.service
 
 dbusconfdir = ${sysconfdir}/dbus-1/system.d
-dbusconf_DATA = system-helper/org.freedesktop.XdgApp.SystemHelper.conf
+dbusconf_DATA = system-helper/org.freedesktop.Flatpak.SystemHelper.conf
 
-service_in_files += system-helper/xdg-app-system-helper.service.in
-systemdsystemunit_DATA = system-helper/xdg-app-system-helper.service
+service_in_files += system-helper/flatpak-system-helper.service.in
+systemdsystemunit_DATA = system-helper/flatpak-system-helper.service
 
-xdg_app_system_helper_SOURCES = \
+flatpak_system_helper_SOURCES = \
 	system-helper/flatpak-system-helper.c	\
 	lib/flatpak-error.c	\
 	$(NULL)
 
-xdg_app_system_helper_LDADD = $(BASE_LIBS) $(OSTREE_LIBS) $(POLKIT_LIBS) libflatpak-common.la
-xdg_app_system_helper_CFLAGS = $(BASE_CFLAGS) $(OSTREE_CFLAGS) $(POLKIT_CFLAGS)
+flatpak_system_helper_LDADD = $(BASE_LIBS) $(OSTREE_LIBS) $(POLKIT_LIBS) libflatpak-common.la
+flatpak_system_helper_CFLAGS = $(BASE_CFLAGS) $(OSTREE_CFLAGS) $(POLKIT_CFLAGS)
 
 polkit_rulesdir = $(datadir)/polkit-1/rules.d
 dist_polkit_rules_DATA =					\
-	system-helper/org.freedesktop.XdgApp.rules
+	system-helper/org.freedesktop.Flatpak.rules
 
 polkit_policydir = $(datadir)/polkit-1/actions
 dist_polkit_policy_DATA =					\
-	system-helper/org.freedesktop.XdgApp.policy
+	system-helper/org.freedesktop.Flatpak.policy
 
 @INTLTOOL_POLICY_RULE@
 
-EXTRA_DIST += system-helper/org.freedesktop.XdgApp.policy.in system-helper/org.freedesktop.XdgApp.SystemHelper.conf
-DISTCLEANFILES += system-helper/org.freedesktop.XdgApp.policy
+EXTRA_DIST += system-helper/org.freedesktop.Flatpak.policy.in system-helper/org.freedesktop.Flatpak.SystemHelper.conf
+DISTCLEANFILES += system-helper/org.freedesktop.Flatpak.policy
diff --git a/system-helper/flatpak-system-helper.c b/system-helper/flatpak-system-helper.c
index 44ce798..fd03ccb 100644
--- a/system-helper/flatpak-system-helper.c
+++ b/system-helper/flatpak-system-helper.c
@@ -43,7 +43,7 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC (AutoPolkitDetails, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (AutoPolkitSubject, g_object_unref)
 
 static gboolean
-handle_deploy (XdgAppSystemHelper    *object,
+handle_deploy (FlatpakSystemHelper   *object,
                GDBusMethodInvocation *invocation,
                const gchar           *arg_repo_path,
                guint32                arg_flags,
@@ -155,7 +155,7 @@ handle_deploy (XdgAppSystemHelper    *object,
         }
     }
 
-  xdg_app_system_helper_complete_deploy (object, invocation);
+  flatpak_system_helper_complete_deploy (object, invocation);
 
   return TRUE;
 }
@@ -249,10 +249,10 @@ on_bus_acquired (GDBusConnection *connection,
                  const gchar     *name,
                  gpointer         user_data)
 {
-  XdgAppSystemHelper *helper;
+  FlatpakSystemHelper *helper;
   GError *error = NULL;
 
-  helper = xdg_app_system_helper_skeleton_new ();
+  helper = flatpak_system_helper_skeleton_new ();
 
   g_dbus_interface_skeleton_set_flags (G_DBUS_INTERFACE_SKELETON (helper),
                                        G_DBUS_INTERFACE_SKELETON_FLAGS_HANDLE_METHOD_INVOCATIONS_IN_THREAD);
diff --git a/system-helper/flatpak-system-helper.service.in b/system-helper/flatpak-system-helper.service.in
new file mode 100644
index 0000000..7c7cf67
--- /dev/null
+++ b/system-helper/flatpak-system-helper.service.in
@@ -0,0 +1,7 @@
+[Unit]
+Description=flatpak system helper
+
+[Service]
+BusName=org.freedesktop.Flatpak.SystemHelper
+ExecStart=@libexecdir@/flatpak-system-helper
+Type=dbus
diff --git a/system-helper/org.freedesktop.XdgApp.SystemHelper.conf b/system-helper/org.freedesktop.Flatpak.SystemHelper.conf
index 6b6a646..4aac5b8 100644
--- a/system-helper/org.freedesktop.XdgApp.SystemHelper.conf
+++ b/system-helper/org.freedesktop.Flatpak.SystemHelper.conf
@@ -6,19 +6,19 @@
 <busconfig>
 
   <!-- This configuration file specifies the required security policies
-       for the the xdg-app system helper to work. -->
+       for the the flatpak system helper to work. -->
 
   <policy user="root">
-    <allow own="org.freedesktop.XdgApp.SystemHelper"/>
+    <allow own="org.freedesktop.Flatpak.SystemHelper"/>
   </policy>
 
  <!-- Allow anyone to call into the service - we'll reject callers using PolicyKit -->
   <policy context="default">
-    <allow send_destination="org.freedesktop.XdgApp.SystemHelper"
-           send_interface="org.freedesktop.XdgApp.SystemHelper"/>
-    <allow send_destination="org.freedesktop.XdgApp.SystemHelper"
+    <allow send_destination="org.freedesktop.Flatpak.SystemHelper"
+           send_interface="org.freedesktop.Flatpak.SystemHelper"/>
+    <allow send_destination="org.freedesktop.Flatpak.SystemHelper"
            send_interface="org.freedesktop.DBus.Introspectable"/>
-    <allow send_destination="org.freedesktop.ColorManager"
+    <allow send_destination="org.freedesktop.Flatpak.SystemHelper"
            send_interface="org.freedesktop.DBus.Peer"/>
   </policy>
 
diff --git a/system-helper/org.freedesktop.Flatpak.SystemHelper.service.in b/system-helper/org.freedesktop.Flatpak.SystemHelper.service.in
new file mode 100644
index 0000000..4e9293a
--- /dev/null
+++ b/system-helper/org.freedesktop.Flatpak.SystemHelper.service.in
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=org.freedesktop.Flatpak.SystemHelper
+Exec=@libexecdir@/flatpak-system-helper
+SystemdService=flatpak-system-helper.service
diff --git a/system-helper/org.freedesktop.XdgApp.policy.in b/system-helper/org.freedesktop.Flatpak.policy.in
index f5f2272..a420339 100644
--- a/system-helper/org.freedesktop.XdgApp.policy.in
+++ b/system-helper/org.freedesktop.Flatpak.policy.in
@@ -5,15 +5,15 @@
 <policyconfig>
 
   <!--
-    Policy definitions for XdgApp system actions.
+    Policy definitions for Flatpak system actions.
     Copyright (c) 2016 Alexander Larsson <alexl@redhat.com>
   -->
 
-  <vendor>The XdgApp Project</vendor>
+  <vendor>The Flatpak Project</vendor>
   <vendor_url>https://cgit.freedesktop.org/xdg-app/xdg-app/</vendor_url>
   <icon_name>package-x-generic</icon_name>
 
-  <action id="org.freedesktop.XdgApp.app-install">
+  <action id="org.freedesktop.Flatpak.app-install">
     <!-- SECURITY:
           - Normal users do not need authentication to install signed applications
             from signed repositories, as this cannot exploit a system.
@@ -30,7 +30,7 @@
     </defaults>
   </action>
 
-  <action id="org.freedesktop.XdgApp.runtime-install">
+  <action id="org.freedesktop.Flatpak.runtime-install">
     <!-- SECURITY:
           - Normal users do not need authentication to install signed applications
             from signed repositories, as this cannot exploit a system.
@@ -47,7 +47,7 @@
     </defaults>
   </action>
 
-  <action id="org.freedesktop.XdgApp.app-update">
+  <action id="org.freedesktop.Flatpak.app-update">
     <!-- SECURITY:
           - Normal users do not require admin authentication to update an
             app as the commit will be signed, and the action is required
@@ -65,7 +65,7 @@
     </defaults>
   </action>
 
-  <action id="org.freedesktop.XdgApp.runtime-update">
+  <action id="org.freedesktop.Flatpak.runtime-update">
     <!-- SECURITY:
           - Normal users do not require admin authentication to update a
             runtime as the commit will be signed, and the action is required
diff --git a/system-helper/org.freedesktop.XdgApp.rules b/system-helper/org.freedesktop.Flatpak.rules
index 113306b..c1ce8ee 100644
--- a/system-helper/org.freedesktop.XdgApp.rules
+++ b/system-helper/org.freedesktop.Flatpak.rules
@@ -1,6 +1,6 @@
 polkit.addRule(function(action, subject) {
-    if ((action.id == "org.freedesktop.XdgApp.app-install" ||
-         action.id == "org.freedesktop.XdgApp.runtime-install") &&
+    if ((action.id == "org.freedesktop.Flatpak.app-install" ||
+         action.id == "org.freedesktop.Flatpak.runtime-install") &&
         subject.active == true && subject.local == true &&
         subject.isInGroup("wheel")) {
             return polkit.Result.YES;
diff --git a/system-helper/org.freedesktop.XdgApp.SystemHelper.service.in b/system-helper/org.freedesktop.XdgApp.SystemHelper.service.in
deleted file mode 100644
index c6ef627..0000000
--- a/system-helper/org.freedesktop.XdgApp.SystemHelper.service.in
+++ /dev/null
@@ -1,4 +0,0 @@
-[D-BUS Service]
-Name=org.freedesktop.XdgApp.SystemHelper
-Exec=@libexecdir@/xdg-app-system-helper
-SystemdService=xdg-app-system-helper.service
diff --git a/system-helper/xdg-app-system-helper.service.in b/system-helper/xdg-app-system-helper.service.in
deleted file mode 100644
index 5f1e6ce..0000000
--- a/system-helper/xdg-app-system-helper.service.in
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=xdg-app system helper
-
-[Service]
-BusName=org.freedesktop.XdgApp.SystemHelper
-ExecStart=@libexecdir@/xdg-app-system-helper
-Type=dbus