From: Arvin Schnell <aschnell@suse.de>
Date: Wed, 29 Aug 2012 13:52:01 +0000 (+0200)
Subject: - work on dbus interface
X-Git-Tag: v0.1.3~135
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ca982356aef99e1c36d74e1efdda585019f6a49;p=thirdparty%2Fsnapper.git

- work on dbus interface
---

diff --git a/snapper/Filesystem.cc b/snapper/Filesystem.cc
index 33986bce..f8b0ec66 100644
--- a/snapper/Filesystem.cc
+++ b/snapper/Filesystem.cc
@@ -79,6 +79,25 @@ namespace snapper
     }
 
 
+    SDir
+    Filesystem::openSubvolumeDir() const
+    {
+	SDir subvolume_dir(subvolume);
+
+	return subvolume_dir;
+    }
+
+
+    SDir
+    Filesystem::openInfoDir(unsigned int num) const
+    {
+	SDir infos_dir = openInfosDir();
+	SDir info_dir(infos_dir, decString(num));
+
+	return info_dir;
+    }
+
+
     Btrfs::Btrfs(const string& subvolume)
 	: Filesystem(subvolume)
     {
@@ -130,13 +149,6 @@ namespace snapper
     }
 
 
-    SDir
-    Btrfs::openSubvolumeDir() const
-    {
-	return SDir(subvolume);
-    }
-
-
     SDir
     Btrfs::openInfosDir() const
     {
@@ -159,16 +171,6 @@ namespace snapper
     }
 
 
-    SDir
-    Btrfs::openInfoDir(unsigned int num) const
-    {
-	SDir infos_dir = openInfosDir();
-	SDir info_dir(infos_dir, decString(num));
-
-	return info_dir;
-    }
-
-
     SDir
     Btrfs::openSnapshotDir(unsigned int num) const
     {
diff --git a/snapper/Filesystem.h b/snapper/Filesystem.h
index 4d0c876c..157e883e 100644
--- a/snapper/Filesystem.h
+++ b/snapper/Filesystem.h
@@ -54,7 +54,9 @@ namespace snapper
 	virtual string infosDir() const = 0;
 	virtual string snapshotDir(unsigned int num) const = 0;
 
+	virtual SDir openSubvolumeDir() const;
 	virtual SDir openInfosDir() const = 0;
+	virtual SDir openInfoDir(unsigned int num) const;
 	virtual SDir openSnapshotDir(unsigned int num) const = 0;
 
 	virtual void createSnapshot(unsigned int num) const = 0;
@@ -87,9 +89,7 @@ namespace snapper
 	virtual string infosDir() const;
 	virtual string snapshotDir(unsigned int num) const;
 
-	virtual SDir openSubvolumeDir() const;
 	virtual SDir openInfosDir() const;
-	virtual SDir openInfoDir(unsigned int num) const;
 	virtual SDir openSnapshotDir(unsigned int num) const;
 
 	virtual void createSnapshot(unsigned int num) const;
diff --git a/snapper/Snapper.cc b/snapper/Snapper.cc
index 26756eb3..3f063669 100644
--- a/snapper/Snapper.cc
+++ b/snapper/Snapper.cc
@@ -136,7 +136,7 @@ namespace snapper
     SDir
     Snapper::openSubvolumeDir() const
     {
-	return SDir(subvolume);
+	return filesystem->openSubvolumeDir();
     }