openSUSE/snapper
1
0
Fork 0
mirror of https://github.com/openSUSE/snapper.git synced 2026-02-05 15:46:00 +01:00
Code Issues Releases Wiki Activity

- work on dbus interface

Browse Source
This commit is contained in:
Arvin Schnell
2012-06-05 17:00:56 +02:00
parent 026b5b8b62
commit fc0affc16d
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
client/snapper.cc
View File

@@ -1221,13 +1221,15 @@ main(int argc, char** argv)
catch (const DBus::ErrorException& e)
{
if (strcmp(e.name(), "error.no_permissions") == 0)
cerr << "failed (no permissions)" << endl;
cerr << _("No permissions.") << endl;
else if (strcmp(e.name(), "error.invalid_userdata") == 0)
cerr << _("Invalid userdata.") << endl;
else
cerr << "failed (" << e.what() << ")" << endl;
cerr << _("Failure") << " (" << e.what() << ")." << endl;
}
catch (const DBus::FatalException& e)
{
cerr << "failed (" << e.what() << ")" << endl;
cerr << _("Failure") << " (" << e.what() << ")." << endl;
}
exit(EXIT_SUCCESS);

2
dbus/DBusMessage.h
View File

@@ -50,7 +50,7 @@ namespace DBus
struct ErrorException : public Exception
{
explicit ErrorException(const DBusError err) throw() : err(err) {}
~ErrorException() throw() { dbus_error_free(&err); }
virtual ~ErrorException() throw() { dbus_error_free(&err); }
virtual const char* what() const throw() { return "dbus error exception"; }
virtual const char* name() const throw() { return err.name; }
virtual const char* message() const throw() { return err.message; }

5
server/snapperd.cc
View File

@@ -1068,6 +1068,11 @@ dispatch(DBus::Connection& conn, DBus::Message& msg)
DBus::MessageError reply(msg, "error.illegal_snapshot", DBUS_ERROR_FAILED);
conn.send(reply);
}
catch (const InvalidUserdataException& e)
{
DBus::MessageError reply(msg, "error.invalid_userdata", DBUS_ERROR_FAILED);
conn.send(reply);
}
catch (...)
{
DBus::MessageError reply(msg, "error.something", DBUS_ERROR_FAILED);