client: Add fallback to session bus also for synchronous API

Asynchronous API fallbacks to session bus when peer-to-peer connection
fails, however, synchronous API fails in the same case. Let's add
fallback to session bus also for the synchronous case.

3 files changed, 30 insertions, 11 deletions

diff --git a/client/gdaemonfile.c b/client/gdaemonfile.c
index 6111b7bd..2ea6cd7c 100644
--- a/client/gdaemonfile.c
+++ b/client/gdaemonfile.c
@@ -441,12 +441,17 @@ create_proxy_for_file2 (GFile *file1,
   if (connection == NULL)
     {
       g_dbus_error_strip_remote_error (local_error);
-      g_warning ("The peer-to-peer connection failed: %s. Your application is "
-                 "probably missing --filesystem=xdg-run/gvfsd privileges.",
-                 local_error->message);
-      goto out;
+      g_warning ("The peer-to-peer connection failed: %s. Falling back to the "
+                 "session bus. Your application is probably missing "
+                 "--filesystem=xdg-run/gvfsd privileges.", local_error->message);
+      g_clear_error (&local_error);
+
+      connection = g_bus_get_sync (G_BUS_TYPE_SESSION, cancellable, &local_error);
     }
 
+  if (connection == NULL)
+    goto out;
+
   proxy = gvfs_dbus_mount_proxy_new_sync (connection,
                                           G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES | G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS,
                                           mount_info1->dbus_id,
diff --git a/client/gdaemonfilemonitor.c b/client/gdaemonfilemonitor.c
index 6c80c6ab..99e356af 100644
--- a/client/gdaemonfilemonitor.c
+++ b/client/gdaemonfilemonitor.c
@@ -181,9 +181,18 @@ g_daemon_file_monitor_new (const char *remote_id,
   if (connection == NULL)
     {
       g_dbus_error_strip_remote_error (error);
-      g_warning ("The peer-to-peer connection failed: %s. Your application is "
-                 "probably missing --filesystem=xdg-run/gvfsd privileges.",
-                 error->message);
+      g_warning ("The peer-to-peer connection failed: %s. Falling back to the "
+                 "session bus. Your application is probably missing "
+                 "--filesystem=xdg-run/gvfsd privileges.", error->message);
+      g_clear_error (&error);
+
+      connection = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error);
+    }
+
+  if (connection == NULL)
+    {
+      g_printerr ("Error getting connection for monitoring: %s (%s, %d)\n",
+                  error->message, g_quark_to_string (error->domain), error->code);
       g_error_free (error);
     }
   else
diff --git a/client/gvfsiconloadable.c b/client/gvfsiconloadable.c
index 45fb6c2c..f1e6cd08 100644
--- a/client/gvfsiconloadable.c
+++ b/client/gvfsiconloadable.c
@@ -61,12 +61,17 @@ create_proxy_for_icon (GVfsIcon *vfs_icon,
   if (connection == NULL)
     {
       g_dbus_error_strip_remote_error (local_error);
-      g_warning ("The peer-to-peer connection failed: %s. Your application is "
-                 "probably missing --filesystem=xdg-run/gvfsd privileges.",
-                 local_error->message);
-      goto out;
+      g_warning ("The peer-to-peer connection failed: %s. Falling back to the "
+                 "session bus. Your application is probably missing "
+                 "--filesystem=xdg-run/gvfsd privileges.", local_error->message);
+      g_clear_error (&local_error);
+
+      connection = g_bus_get_sync (G_BUS_TYPE_SESSION, cancellable, &local_error);
     }
 
+  if (connection == NULL)
+    goto out;
+
   proxy = gvfs_dbus_mount_proxy_new_sync (connection,
                                           G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES | G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS,
                                           mount_info->dbus_id,