- work on dbus interface

diff --git a/server/Client.cc b/server/Client.cc
index d52e403dc8c689962aad0494bec86369b7f78119..fb2ced9228f3b6ea446b1416c149fa41a86f664f 100644 (file)
--- a/server/Client.cc
+++ b/server/Client.cc
@@ -61,10 +61,8 @@ Client::find_comparison(Snapper* snapper, Snapshots::const_iterator snapshot1,
 
 
 Comparison*
-Client::find_comparison(const string& config_name, unsigned int number1, unsigned int number2)
+Client::find_comparison(Snapper* snapper, unsigned int number1, unsigned int number2)
 {
-    MetaSnappers::iterator it = meta_snappers.find(config_name);
-    Snapper* snapper = it->getSnapper();
     Snapshots& snapshots = snapper->getSnapshots();
     Snapshots::const_iterator snapshot1 = snapshots.find(number1);
     Snapshots::const_iterator snapshot2 = snapshots.find(number2);

diff --git a/server/Client.h b/server/Client.h
index 9cd883db5290c3a9c281d2f59b068187e58fc978..47a6f6b1c2f3e6cd2ef87b1e5f2a96357505f6b4 100644 (file)
--- a/server/Client.h
+++ b/server/Client.h
@@ -91,8 +91,7 @@ public:
     Client(const string& name);
     ~Client();
 
-    Comparison* find_comparison(const string& config_name, unsigned int number1,
-                               unsigned int number2);
+    Comparison* find_comparison(Snapper* snapper, unsigned int number1, unsigned int number2);
 
     Comparison* find_comparison(Snapper* snapper, Snapshots::const_iterator snapshot1,
                                Snapshots::const_iterator snapshot2);

diff --git a/server/snapperd.cc b/server/snapperd.cc
index 8e3508ff6406e4f620eaac670e96c12fec1732c9..f5bb5545b438ac5f74e41cc881d77ab67cf85275 100644 (file)
--- a/server/snapperd.cc
+++ b/server/snapperd.cc
@@ -830,7 +830,7 @@ Client::get_files(DBus::Connection& conn, DBus::Message& msg)
 
     check_permission(conn, msg, *it);
 
-    Comparison* comparison = find_comparison(config_name, num1, num2);
+    Comparison* comparison = find_comparison(it->getSnapper(), num1, num2);
 
     const Files& files = comparison->getFiles();
 
@@ -861,7 +861,7 @@ Client::get_diff(DBus::Connection& conn, DBus::Message& msg)
 
     check_permission(conn, msg, *it);
 
-    Comparison* comparison = find_comparison(config_name, num1, num2);
+    Comparison* comparison = find_comparison(it->getSnapper(), num1, num2);
 
     Files& files = comparison->getFiles();
 
@@ -896,7 +896,7 @@ Client::set_undo(DBus::Connection& conn, DBus::Message& msg)
 
     check_permission(conn, msg, *it);
 
-    Comparison* comparison = find_comparison(config_name, num1, num2);
+    Comparison* comparison = find_comparison(it->getSnapper(), num1, num2);
 
     Files& files = comparison->getFiles();
 
@@ -932,7 +932,7 @@ Client::set_undo_all(DBus::Connection& conn, DBus::Message& msg)
 
     check_permission(conn, msg, *it);
 
-    Comparison* comparison = find_comparison(config_name, num1, num2);
+    Comparison* comparison = find_comparison(it->getSnapper(), num1, num2);
 
     Files& files = comparison->getFiles();
 
@@ -963,7 +963,7 @@ Client::get_undo_steps(DBus::Connection& conn, DBus::Message& msg)
 
     check_permission(conn, msg, *it);
 
-    Comparison* comparison = find_comparison(config_name, num1, num2);
+    Comparison* comparison = find_comparison(it->getSnapper(), num1, num2);
 
     vector<UndoStep> undo_steps = comparison->getUndoSteps();
 
@@ -992,7 +992,7 @@ Client::do_undo_step(DBus::Connection& conn, DBus::Message& msg)
 
     check_permission(conn, msg, *it);
 
-    Comparison* comparison = find_comparison(config_name, num1, num2);
+    Comparison* comparison = find_comparison(it->getSnapper(), num1, num2);
 
     bool ret = comparison->doUndoStep(undo_step);