Strip dbus error strings from GError after all dbus calls.

https://bugzilla.gnome.org/show_bug.cgi?id=682384

7 files changed, 8 insertions, 0 deletions

diff --git a/daemon/daemon-main.c b/daemon/daemon-main.c
index c52253d2..f4c3073f 100644
--- a/daemon/daemon-main.c
+++ b/daemon/daemon-main.c
@@ -147,6 +147,7 @@ call_spawned_cb (GVfsDBusSpawner *proxy,
 
   if (! gvfs_dbus_spawner_call_spawned_finish (proxy, res, &error))
     {
+      g_dbus_error_strip_remote_error (error);
       g_printerr ("call_spawned_cb: Error sending a message: %s (%s, %d)\n",
                   error->message, g_quark_to_string (error->domain), error->code);
       g_error_free (error);
diff --git a/daemon/gvfsbackendsftp.c b/daemon/gvfsbackendsftp.c
index e51c070b..6f9cd51e 100644
--- a/daemon/gvfsbackendsftp.c
+++ b/daemon/gvfsbackendsftp.c
@@ -404,6 +404,7 @@ setup_ssh_environment (void)
                                       &error);
   if (! iter)
     {
+      g_dbus_error_strip_remote_error (error);
       g_warning ("Failed to setup ssh evironment: %s (%s, %d)",
                  error->message, g_quark_to_string (error->domain), error->code);
       g_error_free (error);
diff --git a/daemon/gvfsjobenumerate.c b/daemon/gvfsjobenumerate.c
index 89890761..9411e1ee 100644
--- a/daemon/gvfsjobenumerate.c
+++ b/daemon/gvfsjobenumerate.c
@@ -139,6 +139,7 @@ send_infos_cb (GVfsDBusEnumerator *proxy,
   gvfs_dbus_enumerator_call_got_info_finish (proxy, res, &error);
   if (error != NULL)
     {
+      g_dbus_error_strip_remote_error (error);
       g_warning ("send_infos_cb: %s (%s, %d)\n", error->message, g_quark_to_string (error->domain), error->code);
       g_error_free (error);
     }
@@ -227,6 +228,7 @@ send_done_cb (GVfsDBusEnumerator *proxy,
   gvfs_dbus_enumerator_call_done_finish (proxy, res, &error);
   if (error != NULL)
     {
+      g_dbus_error_strip_remote_error (error);
       g_warning ("send_done_cb: %s (%s, %d)\n", error->message, g_quark_to_string (error->domain), error->code);
       g_error_free (error);
     }
diff --git a/daemon/gvfsjobmount.c b/daemon/gvfsjobmount.c
index da72444d..17fcde07 100644
--- a/daemon/gvfsjobmount.c
+++ b/daemon/gvfsjobmount.c
@@ -167,6 +167,7 @@ register_mount_callback (GVfsDBusMountTracker *proxy,
   
   if (! gvfs_dbus_mount_tracker_call_register_mount_finish (proxy, res, &error))
     {
+      g_dbus_error_strip_remote_error (error);
       mount_failed (op_job, error);
     }
   else
diff --git a/daemon/gvfsjobunmount.c b/daemon/gvfsjobunmount.c
index 2f2edf2c..3689754b 100644
--- a/daemon/gvfsjobunmount.c
+++ b/daemon/gvfsjobunmount.c
@@ -283,6 +283,7 @@ unregister_mount_callback (GVfsDBusMountTracker *proxy,
                                                               res,
                                                               &error))
     {
+      g_dbus_error_strip_remote_error (error);
       g_warning ("Error unregistering mount: %s (%s, %d)\n",
                   error->message, g_quark_to_string (error->domain), error->code);
       g_error_free (error);
diff --git a/daemon/gvfsmonitor.c b/daemon/gvfsmonitor.c
index 550eb8dd..12ec6b99 100644
--- a/daemon/gvfsmonitor.c
+++ b/daemon/gvfsmonitor.c
@@ -297,6 +297,7 @@ changed_cb (GVfsDBusMonitorClient *proxy,
 
   if (! gvfs_dbus_monitor_client_call_changed_finish (proxy, res, &error))
     {
+      g_dbus_error_strip_remote_error (error);
       g_printerr ("Error calling org.gtk.vfs.MonitorClient.Changed(): %s (%s, %d)\n",
                   error->message, g_quark_to_string (error->domain), error->code);
       g_error_free (error);
diff --git a/daemon/mount.c b/daemon/mount.c
index a736cde4..7b58dc4f 100644
--- a/daemon/mount.c
+++ b/daemon/mount.c
@@ -291,6 +291,7 @@ dbus_mount_reply (GVfsDBusMountable *proxy,
         mount_finish (data, NULL);
       else
         {
+          g_dbus_error_strip_remote_error (error);
           g_warning ("dbus_mount_reply: Error from org.gtk.vfs.Mountable.mount(): %s", error->message);
           mount_finish (data, error);
           g_error_free (error);