From: Arvin Schnell <aschnell@suse.de>
Date: Sat, 28 Jul 2012 16:16:02 +0000 (+0200)
Subject: - work on dbus interface
X-Git-Tag: v0.1.3~190
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b8af9f8117355b23bee8576344200c8e7e862c84;p=thirdparty%2Fsnapper.git

- work on dbus interface
---

diff --git a/server/Client.cc b/server/Client.cc
index d52e403d..fb2ced92 100644
--- 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 9cd883db..47a6f6b1 100644
--- 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 8e3508ff..f5bb5545 100644
--- 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);