- work on dbus interface

diff --git a/client/commands.cc b/client/commands.cc
index 510b45cba34cca95a46a045d0f3b1d5afe571f8e..ce82ed90dc2c5c9742d76956401dc938ace9760f 100644 (file)
--- a/client/commands.cc
+++ b/client/commands.cc
@@ -20,11 +20,6 @@
  */
 
 
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <dbus/dbus.h>
-
 #include "commands.h"
 
 

diff --git a/client/commands.h b/client/commands.h
index 0d7ae154c24b5f6472075f9b78fc0cd0f94b92d0..5e8e5147d58a35d6f269d67a164591b62073a981 100644 (file)
--- a/client/commands.h
+++ b/client/commands.h
@@ -20,10 +20,6 @@
  */
 
 
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-
 #include <string>
 #include <vector>
 #include <list>

diff --git a/client/snapper.cc b/client/snapper.cc
index 515e3229fa59fe3175251b1d6b2ad77d285303f8..2c5b0392372e5ab8a96f30d76e3ac36f4fe1ffc4 100644 (file)
--- a/client/snapper.cc
+++ b/client/snapper.cc
@@ -1154,7 +1154,6 @@ main(int argc, char** argv)
     catch (const DBus::ErrorException& e)
     {
        string name = e.name();
-
        if (name == "error.unknown_config")
            cerr << _("Unknown config.") << endl;
        else if (name == "error.no_permissions")
@@ -1165,10 +1164,12 @@ main(int argc, char** argv)
            cerr << _("Illegal Snapshot.") << endl;
        else
            cerr << _("Failure") << " (" << name << ")." << endl;
+       exit(EXIT_FAILURE);
     }
     catch (const DBus::FatalException& e)
     {
        cerr << _("Failure") << " (" << e.what() << ")." << endl;
+       exit(EXIT_FAILURE);
     }
 
     exit(EXIT_SUCCESS);