[gvfs/wip/oholy/gtask: 40/56] client: Do not modify caller's errors



commit 669f1e508fef82ce41f66523cbc75d10b0c1ce2b
Author: Ondrej Holy <oholy redhat com>
Date:   Mon Dec 12 09:48:53 2016 +0100

    client: Do not modify caller's errors
    
    Caller's errors are modified by g_dbus_error_strip_remote_error. Strip
    the dbus error in the caller directly.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=747412

 client/gdaemonfile.c      |    2 --
 client/gdaemonvfs.c       |    2 ++
 client/gvfsiconloadable.c |    1 -
 3 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/client/gdaemonfile.c b/client/gdaemonfile.c
index 4befb85..abc81cf 100644
--- a/client/gdaemonfile.c
+++ b/client/gdaemonfile.c
@@ -658,7 +658,6 @@ async_got_mount_info (GMountInfo *mount_info,
 
   if (error != NULL)
     {
-      g_dbus_error_strip_remote_error (error);
       g_task_return_error (data->task, g_error_copy (error));
       async_proxy_create_free (data);
       return;
@@ -3325,7 +3324,6 @@ find_enclosing_mount_cb (GMountInfo *mount_info,
 
   if (error)
     {
-      g_dbus_error_strip_remote_error (error);
       g_task_return_error (task, g_error_copy (error));
       goto out;
     }
diff --git a/client/gdaemonvfs.c b/client/gdaemonvfs.c
index a61c024..0cf11e6 100644
--- a/client/gdaemonvfs.c
+++ b/client/gdaemonvfs.c
@@ -844,6 +844,7 @@ async_get_mount_info_response (GVfsDBusMountTracker *proxy,
                                                           &error))
     {
       /* g_warning ("Error from org.gtk.vfs.MountTracker.lookupMount(): %s", error->message); */
+      g_dbus_error_strip_remote_error (error);
       data->callback (NULL, data->user_data, error);
       g_error_free (error);
     }
@@ -885,6 +886,7 @@ get_mount_info_async_got_proxy_cb (GObject *source_object,
   if (proxy == NULL)
     {
       g_warning ("Error creating MountTracker proxy: %s", error->message);
+      g_dbus_error_strip_remote_error (error);
       data->callback (NULL, data->user_data, error);
       free_get_mount_info_data (data);
       g_error_free (error);
diff --git a/client/gvfsiconloadable.c b/client/gvfsiconloadable.c
index dfb36ae..7a9bf97 100644
--- a/client/gvfsiconloadable.c
+++ b/client/gvfsiconloadable.c
@@ -220,7 +220,6 @@ async_got_mount_info (GMountInfo *mount_info,
 
   if (error != NULL)
     {
-      g_dbus_error_strip_remote_error (error);
       g_task_return_error (data->task, g_error_copy (error));
       async_path_call_free (data);
       return;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]