gardesk/garwarp / 5ae7093

Browse files

align portal interfaces

Authored by mfwolffe <wolffemf@dukes.jmu.edu>
SHA
5ae709326df183cc8c9ea0a921286e4dccd71287
Parents
7b4b1ca
Tree
4ea79a5

2 changed files

StatusFile+-
M garwarp/src/dbus.rs 7 6
M scripts/test-dbus-interfaces.sh 1 1
garwarp/src/dbus.rsmodified
@@ -15,7 +15,7 @@ impl SessionNameGuard {
1515
         {
1616
             let object_server = connection.object_server();
1717
             object_server.at(BACKEND_OBJECT_PATH, ScreenshotPortal)?;
18
-            object_server.at(BACKEND_OBJECT_PATH, OpenUriPortal)?;
18
+            object_server.at(BACKEND_OBJECT_PATH, FileChooserPortal)?;
1919
             object_server.at(BACKEND_OBJECT_PATH, AppChooserPortal)?;
2020
         }
2121
         Ok(Self {
@@ -36,10 +36,10 @@ impl ScreenshotPortal {
3636
 }
3737
3838
 #[derive(Debug)]
39
-struct OpenUriPortal;
39
+struct FileChooserPortal;
4040
41
-#[interface(name = "org.freedesktop.impl.portal.OpenURI")]
42
-impl OpenUriPortal {
41
+#[interface(name = "org.freedesktop.impl.portal.FileChooser")]
42
+impl FileChooserPortal {
4343
     #[zbus(property)]
4444
     fn version(&self) -> u32 {
4545
         INTERFACE_VERSION
@@ -60,7 +60,8 @@ impl AppChooserPortal {
6060
 #[cfg(test)]
6161
 mod tests {
6262
     use super::{
63
-        AppChooserPortal, BACKEND_OBJECT_PATH, INTERFACE_VERSION, OpenUriPortal, ScreenshotPortal,
63
+        AppChooserPortal, BACKEND_OBJECT_PATH, FileChooserPortal, INTERFACE_VERSION,
64
+        ScreenshotPortal,
6465
     };
6566
6667
     #[test]
@@ -71,7 +72,7 @@ mod tests {
7172
     #[test]
7273
     fn portal_interfaces_report_expected_version() {
7374
         assert_eq!(ScreenshotPortal.version(), INTERFACE_VERSION);
74
-        assert_eq!(OpenUriPortal.version(), INTERFACE_VERSION);
75
+        assert_eq!(FileChooserPortal.version(), INTERFACE_VERSION);
7576
         assert_eq!(AppChooserPortal.version(), INTERFACE_VERSION);
7677
     }
7778
 }
scripts/test-dbus-interfaces.shmodified
@@ -39,7 +39,7 @@ wait "$pid"
3939
 '
4040
4141
 rg -q "org.freedesktop.impl.portal.Screenshot" "$introspection_file"
42
-rg -q "org.freedesktop.impl.portal.OpenURI" "$introspection_file"
42
+rg -q "org.freedesktop.impl.portal.FileChooser" "$introspection_file"
4343
 rg -q "org.freedesktop.impl.portal.AppChooser" "$introspection_file"
4444
4545
 printf "dbus interface export smoke test passed\n"