[Xfce4-commits] <postler:master> Strip remote error from DBus errors properly

[Christian Dywan]

Updating branch refs/heads/master
         to 3eed2f1313405bdd2800e04cc08d3951e11a0447 (commit)
       from 5a67f674eaafac4c607207c10e5bdbc8d355a80c (commit)

commit 3eed2f1313405bdd2800e04cc08d3951e11a0447
Author: Christian Dywan <christian at twotoasts.de>
Date:   Wed Aug 17 19:14:06 2011 +0200

    Strip remote error from DBus errors properly

 postler/postler-client.vala |   20 +++++++++++++-------
 1 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/postler/postler-client.vala b/postler/postler-client.vala
index 64a658a..36b79f2 100644
--- a/postler/postler-client.vala
+++ b/postler/postler-client.vala
@@ -62,7 +62,13 @@ namespace Postler {
         public async int64[] unread_messages (string uri) throws GLib.Error {
             int64[] new_messages = { 0, 0 };
             return_val_if_fail (uri != null, new_messages);
-            return yield client.unread_messages (uri);
+            try {
+                return yield client.unread_messages (uri);
+            }
+            catch (GLib.Error error) {
+                g_dbus_error_strip_remote_error (error);
+                throw error;
+            }
         }
 
         public async void get_message (Message message, char flag,
@@ -71,8 +77,8 @@ namespace Postler {
             try {
                 message.from_hash_table (yield client.get_message (message.id, flag));
             } catch (GLib.Error error) {
-                message.from_error (error.message.replace (
-    "org.gtk.GDBus.UnmappedGError.Quark._g_2dfile_2derror_2dquark.Code24", "GLib.FileError"));
+                g_dbus_error_strip_remote_error (error);
+                message.from_error (error.message);
             }
             /* The path is null if the row was removed during the async call */
             Gtk.TreePath? path = row.get_path ();
@@ -94,9 +100,9 @@ namespace Postler {
                 }
             }
             catch (GLib.Error error) {
+                g_dbus_error_strip_remote_error (error);
                 var message = new Message.from_id ("error:");
-                message.from_error (error.message.replace (
-    "org.gtk.GDBus.UnmappedGError.Quark._g_2dfile_2derror_2dquark.Code24", "GLib.FileError"));
+                message.from_error (error.message);
                 messages.append (message);
             }
             return messages;
@@ -113,9 +119,9 @@ namespace Postler {
                     messages.append (new Message.from_id (message_id));
             }
             catch (GLib.Error error) {
+                g_dbus_error_strip_remote_error (error);
                 var message = new Message.from_id ("error:");
-                message.from_error (error.message.replace (
-    "org.gtk.GDBus.UnmappedGError.Quark._g_2dfile_2derror_2dquark.Code24", "GLib.FileError"));
+                message.from_error (error.message);
                 messages.append (message);
             }
             return messages;