filechooser: Support current_folder with OpenFile

Closes flatpak#796
sophie-h · Aug 29, 2022 · f9e70c7 · f9e70c7
1 parent eef818e
commit f9e70c7
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/data/org.freedesktop.impl.portal.FileChooser.xml b/data/org.freedesktop.impl.portal.FileChooser.xml
@@ -118,6 +118,12 @@
               Whether the file is opened with write access. Default is no.
             </para></listitem>
           </varlistentry>
+          <varlistentry>
+            <term>current_folder ay</term>
+            <listitem><para>
+              A suggested folder to open the files from.
+            </para></listitem>
+          </varlistentry>
         </variablelist>
     -->
     <method name="OpenFile">

diff --git a/data/org.freedesktop.portal.FileChooser.xml b/data/org.freedesktop.portal.FileChooser.xml
@@ -273,6 +273,15 @@
             </para>
           </listitem>
         </varlistentry>
+        <varlistentry>
+          <term>current_folder ay</term>
+          <listitem>
+            <para>
+              Suggested folder to select the files from. The byte array is
+              expected to be null-terminated.
+            </para>
+          </listitem>
+        </varlistentry>
       </variablelist>
     -->
     <method name="SaveFile">

diff --git a/src/file-chooser.c b/src/file-chooser.c
@@ -455,7 +455,8 @@ static XdpOptionKey open_file_options[] = {
   { "directory", G_VARIANT_TYPE_BOOLEAN, NULL },
   { "filters", (const GVariantType *)"a(sa(us))", validate_filters },
   { "current_filter", (const GVariantType *)"(sa(us))", validate_current_filter },
-  { "choices", (const GVariantType *)"a(ssa(ss)s)", validate_choices }
+  { "choices", (const GVariantType *)"a(ssa(ss)s)", validate_choices },
+  { "current_folder", G_VARIANT_TYPE_BYTESTRING, NULL }
 };
 
 static gboolean