]> git.ipfire.org Git - thirdparty/snapper.git/commitdiff
- work on dbus interface
authorArvin Schnell <aschnell@suse.de>
Fri, 20 Jul 2012 14:49:01 +0000 (16:49 +0200)
committerArvin Schnell <aschnell@suse.de>
Fri, 20 Jul 2012 14:49:01 +0000 (16:49 +0200)
dbus/DBusConnection.cc
server/snapperd.cc

index 05430c298cf987ce21ba84f79b3a62859a1b9606..49651dc9337223400d3e8e8679840ff3199ba250 100644 (file)
@@ -130,6 +130,7 @@ namespace DBus
 
        if (dbus_error_is_set(&err))
        {
+           dbus_error_free(&err);
            throw FatalException();
        }
     }
index 3af7bac026307d8fc98013f87b543830e23e12ad..715aaa7289ef64f3260b07bcc7d171b4f3533165 100644 (file)
@@ -1128,12 +1128,12 @@ Commands::dispatch(DBus::Connection& conn, DBus::Message& msg)
     }
     catch (const DBus::MarshallingException& e)
     {
-       DBus::MessageError reply(msg, "error.marshalling", DBUS_ERROR_FAILED);
+       DBus::MessageError reply(msg, "error.dbus.marshalling", DBUS_ERROR_FAILED);
        conn.send(reply);
     }
     catch (const DBus::FatalException& e)
     {
-       DBus::MessageError reply(msg, "error.dbus_fatal", DBUS_ERROR_FAILED);
+       DBus::MessageError reply(msg, "error.dbus.fatal", DBUS_ERROR_FAILED);
        conn.send(reply);
     }
     catch (const UnknownConfig& e)