portals: Move portal implementations to new directory

swick · Nov 1, 2024 · d15811b · d15811b
1 parent 8c4caf0
commit d15811b
Show file tree

Hide file tree

Showing 62 changed files with 82 additions and 76 deletions.
diff --git a/po/POTFILES.in b/po/POTFILES.in
@@ -1,8 +1,8 @@
 # List of source files containing translatable strings.
-src/background.c
-src/camera.c
-src/dynamic-launcher.c
-src/location.c
-src/screenshot.c
-src/settings.c
-src/wallpaper.c
+src/portals/background.c
+src/portals/camera.c
+src/portals/dynamic-launcher.c
+src/portals/location.c
+src/portals/screenshot.c
+src/portals/settings.c
+src/portals/wallpaper.c
diff --git a/src/helpers/rewrite-launchers.c b/src/helpers/rewrite-launchers.c
@@ -25,7 +25,7 @@
 #include <glib.h>
 #include <gio/gdesktopappinfo.h>
 
-#include "dynamic-launcher.h"
+#include "portals/dynamic-launcher.h"
 #include "xdp-utils.h"
 
 static char *

diff --git a/src/meson.build b/src/meson.build
@@ -24,7 +24,7 @@ background_monitor_built_sources = gnome.gdbus_codegen(
 if have_geoclue
   geoclue_built_sources = gnome.gdbus_codegen(
     'geoclue-dbus',
-    sources: 'org.freedesktop.GeoClue2.Client.xml',
+    sources: 'portals/org.freedesktop.GeoClue2.Client.xml',
     interface_prefix: 'org.freedesktop.GeoClue2',
     namespace: 'Geoclue',
   )
@@ -52,50 +52,59 @@ xdp_method_info_sources = files('xdp-method-info.c') + xdp_method_info_built_sou
 xdp_utils_deps = []
 xdp_utils_includes = include_directories('.')
 xdp_utils_sources = files(
-  'xdp-utils.c',
   'xdp-app-info.c',
-  'xdp-sealed-fd.c',
   'xdp-app-info-host.c',
   'xdp-app-info-flatpak.c',
   'xdp-app-info-snap.c',
   'xdp-app-info-test.c',
+  'xdp-sealed-fd.c',
+  'xdp-utils.c',
 )
 
 if have_libsystemd
   xdp_utils_sources += sd_escape_sources
   xdp_utils_deps += [libsystemd_dep]
 endif
 
-xdg_desktop_portal_sources = files(
-  'account.c',
-  'background.c',
-  'camera.c',
-  'clipboard.c',
-  'dynamic-launcher.c',
-  'email.c',
-  'file-chooser.c',
+xdp_portals_sources = files(
+  'portals/account.c',
+  'portals/background.c',
+  'portals/camera.c',
+  'portals/clipboard.c',
+  'portals/dynamic-launcher.c',
+  'portals/email.c',
+  'portals/file-chooser.c',
+  'portals/gamemode.c',
+  'portals/global-shortcuts.c',
+  'portals/inhibit.c',
+  'portals/input-capture.c',
+  'portals/memory-monitor.c',
+  'portals/network-monitor.c',
+  'portals/notification.c',
+  'portals/open-uri.c',
+  'portals/pipewire.c',
+  'portals/power-profile-monitor.c',
+  'portals/print.c',
+  'portals/proxy-resolver.c',
+  'portals/realtime.c',
+  'portals/remote-desktop.c',
+  'portals/screenshot.c',
+  'portals/screen-cast.c',
+  'portals/secret.c',
+  'portals/settings.c',
+  'portals/trash.c',
+  'portals/wallpaper.c',
+)
+
+if have_geoclue
+  xdp_portals_sources += files(
+    'portals/location.c',
+  )
+endif
+
+xdp_sources = files(
   'flatpak-instance.c',
-  'gamemode.c',
   'glib-backports.c',
-  'global-shortcuts.c',
-  'inhibit.c',
-  'input-capture.c',
-  'memory-monitor.c',
-  'network-monitor.c',
-  'notification.c',
-  'open-uri.c',
-  'pipewire.c',
-  'power-profile-monitor.c',
-  'print.c',
-  'proxy-resolver.c',
-  'realtime.c',
-  'remote-desktop.c',
-  'screen-cast.c',
-  'screenshot.c',
-  'secret.c',
-  'settings.c',
-  'trash.c',
-  'wallpaper.c',
   'xdg-desktop-portal.c',
   'xdp-app-launch-context.c',
   'xdp-background-monitor.c',
@@ -108,7 +117,8 @@ xdg_desktop_portal_sources = files(
   'xdp-session-persistence.c',
 )
 
-xdg_desktop_portal_sources += [
+xdp_sources += [
+  xdp_portals_sources,
   xdp_utils_sources,
   xdp_method_info_sources,
   portal_built_sources,
@@ -118,12 +128,6 @@ xdg_desktop_portal_sources += [
   built_resources,
 ]
 
-if have_geoclue
-  xdg_desktop_portal_sources += files(
-    'location.c',
-  )
-endif
-
 common_deps = [
   glib_dep,
   gio_dep,
@@ -145,7 +149,7 @@ incs_xdg_desktop_portal = [
 
 xdg_desktop_portal = executable(
   'xdg-desktop-portal',
-  xdg_desktop_portal_sources,
+  xdp_sources,
   dependencies: xdg_desktop_portal_deps,
   include_directories: incs_xdg_desktop_portal,
   install: true,

diff --git a/src/account.c → src/portals/account.c b/src/account.c → src/portals/account.c
diff --git a/src/account.h → src/portals/account.h b/src/account.h → src/portals/account.h
diff --git a/src/background.c → src/portals/background.c b/src/background.c → src/portals/background.c
diff --git a/src/background.h → src/portals/background.h b/src/background.h → src/portals/background.h
diff --git a/src/camera.c → src/portals/camera.c b/src/camera.c → src/portals/camera.c
diff --git a/src/camera.h → src/portals/camera.h b/src/camera.h → src/portals/camera.h
diff --git a/src/clipboard.c → src/portals/clipboard.c b/src/clipboard.c → src/portals/clipboard.c
diff --git a/src/clipboard.h → src/portals/clipboard.h b/src/clipboard.h → src/portals/clipboard.h
diff --git a/src/dynamic-launcher.c → src/portals/dynamic-launcher.c b/src/dynamic-launcher.c → src/portals/dynamic-launcher.c
diff --git a/src/dynamic-launcher.h → src/portals/dynamic-launcher.h b/src/dynamic-launcher.h → src/portals/dynamic-launcher.h
diff --git a/src/email.c → src/portals/email.c b/src/email.c → src/portals/email.c
diff --git a/src/email.h → src/portals/email.h b/src/email.h → src/portals/email.h
diff --git a/src/file-chooser.c → src/portals/file-chooser.c b/src/file-chooser.c → src/portals/file-chooser.c
diff --git a/src/file-chooser.h → src/portals/file-chooser.h b/src/file-chooser.h → src/portals/file-chooser.h
diff --git a/src/gamemode.c → src/portals/gamemode.c b/src/gamemode.c → src/portals/gamemode.c
diff --git a/src/gamemode.h → src/portals/gamemode.h b/src/gamemode.h → src/portals/gamemode.h
diff --git a/src/global-shortcuts.c → src/portals/global-shortcuts.c b/src/global-shortcuts.c → src/portals/global-shortcuts.c
diff --git a/src/global-shortcuts.h → src/portals/global-shortcuts.h b/src/global-shortcuts.h → src/portals/global-shortcuts.h
diff --git a/src/inhibit.c → src/portals/inhibit.c b/src/inhibit.c → src/portals/inhibit.c
diff --git a/src/inhibit.h → src/portals/inhibit.h b/src/inhibit.h → src/portals/inhibit.h
diff --git a/src/input-capture.c → src/portals/input-capture.c b/src/input-capture.c → src/portals/input-capture.c
diff --git a/src/input-capture.h → src/portals/input-capture.h b/src/input-capture.h → src/portals/input-capture.h
diff --git a/src/location.c → src/portals/location.c b/src/location.c → src/portals/location.c
diff --git a/src/location.h → src/portals/location.h b/src/location.h → src/portals/location.h
diff --git a/src/memory-monitor.c → src/portals/memory-monitor.c b/src/memory-monitor.c → src/portals/memory-monitor.c
diff --git a/src/memory-monitor.h → src/portals/memory-monitor.h b/src/memory-monitor.h → src/portals/memory-monitor.h
diff --git a/src/network-monitor.c → src/portals/network-monitor.c b/src/network-monitor.c → src/portals/network-monitor.c
diff --git a/src/network-monitor.h → src/portals/network-monitor.h b/src/network-monitor.h → src/portals/network-monitor.h
diff --git a/src/notification.c → src/portals/notification.c b/src/notification.c → src/portals/notification.c
diff --git a/src/notification.h → src/portals/notification.h b/src/notification.h → src/portals/notification.h
diff --git a/src/open-uri.c → src/portals/open-uri.c b/src/open-uri.c → src/portals/open-uri.c
diff --git a/src/open-uri.h → src/portals/open-uri.h b/src/open-uri.h → src/portals/open-uri.h
diff --git a/src/org.freedesktop.GeoClue2.Client.xml → ...rtals/org.freedesktop.GeoClue2.Client.xml b/src/org.freedesktop.GeoClue2.Client.xml → ...rtals/org.freedesktop.GeoClue2.Client.xml
diff --git a/src/pipewire.c → src/portals/pipewire.c b/src/pipewire.c → src/portals/pipewire.c
diff --git a/src/pipewire.h → src/portals/pipewire.h b/src/pipewire.h → src/portals/pipewire.h
diff --git a/src/power-profile-monitor.c → src/portals/power-profile-monitor.c b/src/power-profile-monitor.c → src/portals/power-profile-monitor.c
diff --git a/src/power-profile-monitor.h → src/portals/power-profile-monitor.h b/src/power-profile-monitor.h → src/portals/power-profile-monitor.h
diff --git a/src/print.c → src/portals/print.c b/src/print.c → src/portals/print.c
diff --git a/src/print.h → src/portals/print.h b/src/print.h → src/portals/print.h
diff --git a/src/proxy-resolver.c → src/portals/proxy-resolver.c b/src/proxy-resolver.c → src/portals/proxy-resolver.c
diff --git a/src/proxy-resolver.h → src/portals/proxy-resolver.h b/src/proxy-resolver.h → src/portals/proxy-resolver.h
diff --git a/src/realtime.c → src/portals/realtime.c b/src/realtime.c → src/portals/realtime.c
diff --git a/src/realtime.h → src/portals/realtime.h b/src/realtime.h → src/portals/realtime.h
diff --git a/src/remote-desktop.c → src/portals/remote-desktop.c b/src/remote-desktop.c → src/portals/remote-desktop.c
diff --git a/src/remote-desktop.h → src/portals/remote-desktop.h b/src/remote-desktop.h → src/portals/remote-desktop.h
diff --git a/src/screen-cast.c → src/portals/screen-cast.c b/src/screen-cast.c → src/portals/screen-cast.c
diff --git a/src/screen-cast.h → src/portals/screen-cast.h b/src/screen-cast.h → src/portals/screen-cast.h
diff --git a/src/screenshot.c → src/portals/screenshot.c b/src/screenshot.c → src/portals/screenshot.c
diff --git a/src/screenshot.h → src/portals/screenshot.h b/src/screenshot.h → src/portals/screenshot.h
diff --git a/src/secret.c → src/portals/secret.c b/src/secret.c → src/portals/secret.c
diff --git a/src/secret.h → src/portals/secret.h b/src/secret.h → src/portals/secret.h
diff --git a/src/settings.c → src/portals/settings.c b/src/settings.c → src/portals/settings.c
diff --git a/src/settings.h → src/portals/settings.h b/src/settings.h → src/portals/settings.h
diff --git a/src/trash.c → src/portals/trash.c b/src/trash.c → src/portals/trash.c
diff --git a/src/trash.h → src/portals/trash.h b/src/trash.h → src/portals/trash.h
diff --git a/src/wallpaper.c → src/portals/wallpaper.c b/src/wallpaper.c → src/portals/wallpaper.c
diff --git a/src/wallpaper.h → src/portals/wallpaper.h b/src/wallpaper.h → src/portals/wallpaper.h
diff --git a/src/xdg-desktop-portal.c b/src/xdg-desktop-portal.c
@@ -36,38 +36,38 @@
 #include "xdp-documents.h"
 #include "xdp-impl-dbus.h"
 #include "xdp-method-info.h"
+#include "xdp-permissions.h"
 #include "xdp-portal-impl.h"
+#include "xdp-request.h"
 #include "xdp-session-persistence.h"
 
-#include "account.h"
-#include "background.h"
-#include "camera.h"
-#include "clipboard.h"
-#include "dynamic-launcher.h"
-#include "email.h"
-#include "file-chooser.h"
-#include "gamemode.h"
-#include "global-shortcuts.h"
-#include "inhibit.h"
-#include "input-capture.h"
-#include "location.h"
-#include "memory-monitor.h"
-#include "network-monitor.h"
-#include "notification.h"
-#include "open-uri.h"
-#include "xdp-permissions.h"
-#include "power-profile-monitor.h"
-#include "print.h"
-#include "proxy-resolver.h"
-#include "realtime.h"
-#include "remote-desktop.h"
-#include "xdp-request.h"
-#include "screen-cast.h"
-#include "screenshot.h"
-#include "secret.h"
-#include "settings.h"
-#include "trash.h"
-#include "wallpaper.h"
+#include "portals/account.h"
+#include "portals/background.h"
+#include "portals/camera.h"
+#include "portals/clipboard.h"
+#include "portals/dynamic-launcher.h"
+#include "portals/email.h"
+#include "portals/file-chooser.h"
+#include "portals/gamemode.h"
+#include "portals/global-shortcuts.h"
+#include "portals/inhibit.h"
+#include "portals/input-capture.h"
+#include "portals/location.h"
+#include "portals/memory-monitor.h"
+#include "portals/network-monitor.h"
+#include "portals/notification.h"
+#include "portals/open-uri.h"
+#include "portals/power-profile-monitor.h"
+#include "portals/print.h"
+#include "portals/proxy-resolver.h"
+#include "portals/realtime.h"
+#include "portals/remote-desktop.h"
+#include "portals/screen-cast.h"
+#include "portals/screenshot.h"
+#include "portals/secret.h"
+#include "portals/settings.h"
+#include "portals/trash.h"
+#include "portals/wallpaper.h"
 
 static int global_exit_status = 0;
 static GMainLoop *loop = NULL;

diff --git a/src/xdp-documents.h b/src/xdp-documents.h
@@ -24,6 +24,8 @@
 
 #include <gio/gio.h>
 
+#include "xdp-app-info.h"
+
 typedef enum {
   XDP_DOCUMENT_FLAG_NONE      = 0,
   XDP_DOCUMENT_FLAG_FOR_SAVE  = (1 << 0),