From: Arvin Schnell <aschnell@suse.de>
Date: Fri, 20 Jul 2012 14:49:01 +0000 (+0200)
Subject: - work on dbus interface
X-Git-Tag: v0.1.3~201
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=0400a09e2bf818402e1a5cc51037ea084a425135;p=thirdparty%2Fsnapper.git

- work on dbus interface
---

diff --git a/dbus/DBusConnection.cc b/dbus/DBusConnection.cc
index 05430c29..49651dc9 100644
--- a/dbus/DBusConnection.cc
+++ b/dbus/DBusConnection.cc
@@ -130,6 +130,7 @@ namespace DBus
 
 	if (dbus_error_is_set(&err))
 	{
+	    dbus_error_free(&err);
 	    throw FatalException();
 	}
     }
diff --git a/server/snapperd.cc b/server/snapperd.cc
index 3af7bac0..715aaa72 100644
--- a/server/snapperd.cc
+++ b/server/snapperd.cc
@@ -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)