DPF

commit 2e224d4a7fda99a705879648a3b335f6c12b131f
parent f26b8147d309f8b3cdcaa6b3e6d8dac773658009
Author: falkTX <falktx@falktx.com>
Date:   Mon, 28 Mar 2022 14:12:01 +0100

Try a DBus desktop portal property before assuming not available

Signed-off-by: falkTX <falktx@falktx.com>

Diffstat:
M
distrho/extra/FileBrowserDialog.cpp
 | 
105
+++++++++++++++++++++++++++++++++++++++++++++++++------------------------------

1 file changed, 65 insertions(+), 40 deletions(-)
diff --git a/distrho/extra/FileBrowserDialog.cpp b/distrho/extra/FileBrowserDialog.cpp
@@ -359,52 +359,77 @@ FileBrowserHandle fileBrowserCreate(const bool isEmbed,
     // optional, can be null
     DBusConnection* const dbuscon = handle->dbuscon;
 
-    if (dbuscon != nullptr && dbus_bus_name_has_owner(dbuscon, "org.freedesktop.portal.Desktop", nullptr))
+    // https://flatpak.github.io/xdg-desktop-portal/portal-docs.html#gdbus-org.freedesktop.portal.FileChooser
+    if (dbuscon != nullptr)
     {
-        // https://flatpak.github.io/xdg-desktop-portal/portal-docs.html#gdbus-org.freedesktop.portal.FileChooser
-        if (DBusMessage* const message = dbus_message_new_method_call("org.freedesktop.portal.Desktop",
-                                                                      "/org/freedesktop/portal/desktop",
-                                                                      "org.freedesktop.portal.FileChooser",
-                                                                      options.saving ? "SaveFile" : "OpenFile"))
+        // if this is the first time we are calling into DBus, check if things are working
+        static bool firstTry = true;
+
+        if (firstTry)
         {
-            char windowIdStr[32];
-            memset(windowIdStr, 0, sizeof(windowIdStr));
-# ifdef HAVE_X11
-            snprintf(windowIdStr, sizeof(windowIdStr)-1, "x11:%llx", (ulonglong)windowId);
-# endif
-            const char* windowIdStrPtr = windowIdStr;
-
-            dbus_message_append_args(message,
-                                    DBUS_TYPE_STRING, &windowIdStrPtr,
-                                    DBUS_TYPE_STRING, &windowTitle,
-                                    DBUS_TYPE_INVALID);
-
-            DBusMessageIter iter, array;
-            dbus_message_iter_init_append(message, &iter);
-            dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "{sv}", &array);
+            firstTry = false;
 
+            if (DBusMessage* const msg = dbus_message_new_method_call("org.freedesktop.portal.Desktop",
+                                                                      "/org/freedesktop/portal/desktop",
+                                                                      "org.freedesktop.portal.FileChooser",
+                                                                      "version"))
             {
-                DBusMessageIter dict, variant, variantArray;
-                const char* const current_folder_key = "current_folder";
-                const char* const current_folder_val = startDir.buffer();
-
-                dbus_message_iter_open_container(&array, DBUS_TYPE_DICT_ENTRY, nullptr, &dict);
-                dbus_message_iter_append_basic(&dict, DBUS_TYPE_STRING, &current_folder_key);
-                dbus_message_iter_open_container(&dict, DBUS_TYPE_VARIANT, "ay", &variant);
-                dbus_message_iter_open_container(&variant, DBUS_TYPE_ARRAY, "y", &variantArray);
-                dbus_message_iter_append_fixed_array(&variantArray, DBUS_TYPE_BYTE,
-                                                     &current_folder_val, startDir.length()+1);
-                dbus_message_iter_close_container(&variant, &variantArray);
-                dbus_message_iter_close_container(&dict, &variant);
-                dbus_message_iter_close_container(&array, &dict);
-            }
-
-            dbus_message_iter_close_container(&iter, &array);
+                if (DBusMessage* const reply = dbus_connection_send_with_reply_and_block(dbuscon, msg, 250, nullptr))
+                    dbus_message_unref(reply);
 
-            dbus_connection_send(dbuscon, message, nullptr);
+                dbus_message_unref(msg);
+            }
+        }
 
-            dbus_message_unref(message);
-            return handle.release();
+        // Any subsquent calls should have this DBus service active
+        if (dbus_bus_name_has_owner(dbuscon, "org.freedesktop.portal.Desktop", nullptr))
+        {
+            if (DBusMessage* const msg = dbus_message_new_method_call("org.freedesktop.portal.Desktop",
+                                                                      "/org/freedesktop/portal/desktop",
+                                                                      "org.freedesktop.portal.FileChooser",
+                                                                      options.saving ? "SaveFile" : "OpenFile"))
+            {
+               #ifdef HAVE_X11
+                char windowIdStr[32];
+                memset(windowIdStr, 0, sizeof(windowIdStr));
+                snprintf(windowIdStr, sizeof(windowIdStr)-1, "x11:%llx", (ulonglong)windowId);
+                const char* windowIdStrPtr = windowIdStr;
+               #endif
+
+                dbus_message_append_args(msg,
+                                        #ifdef HAVE_X11
+                                         DBUS_TYPE_STRING, &windowIdStrPtr,
+                                        #endif
+                                         DBUS_TYPE_STRING, &windowTitle,
+                                         DBUS_TYPE_INVALID);
+
+                DBusMessageIter iter, array;
+                dbus_message_iter_init_append(msg, &iter);
+                dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "{sv}", &array);
+
+                {
+                    DBusMessageIter dict, variant, variantArray;
+                    const char* const current_folder_key = "current_folder";
+                    const char* const current_folder_val = startDir.buffer();
+
+                    dbus_message_iter_open_container(&array, DBUS_TYPE_DICT_ENTRY, nullptr, &dict);
+                    dbus_message_iter_append_basic(&dict, DBUS_TYPE_STRING, &current_folder_key);
+                    dbus_message_iter_open_container(&dict, DBUS_TYPE_VARIANT, "ay", &variant);
+                    dbus_message_iter_open_container(&variant, DBUS_TYPE_ARRAY, "y", &variantArray);
+                    dbus_message_iter_append_fixed_array(&variantArray, DBUS_TYPE_BYTE,
+                                                         &current_folder_val, startDir.length()+1);
+                    dbus_message_iter_close_container(&variant, &variantArray);
+                    dbus_message_iter_close_container(&dict, &variant);
+                    dbus_message_iter_close_container(&array, &dict);
+                }
+
+                dbus_message_iter_close_container(&iter, &array);
+
+                dbus_connection_send(dbuscon, msg, nullptr);
+
+                dbus_message_unref(msg);
+                return handle.release();
+            }
         }
     }
 #endif