- work on dbus interface

diff --git a/snapper/Filesystem.cc b/snapper/Filesystem.cc
index 33986bce5d74a2966c5c198ec21fa5a2e306ded5..f8b0ec66d9aee5f300b47e9d432a29352129db4a 100644 (file)
--- 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 4d0c876c4026359c137afdac5cb8940ba9984f90..157e883eee83d3a4ac35a9ce566a5114b23784db 100644 (file)
--- 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 26756eb340623b5d0cb67c8a73a34ec7dded18c9..3f0636694cd8910a73114758d61991e1dc09c45d 100644 (file)
--- a/snapper/Snapper.cc
+++ b/snapper/Snapper.cc
@@ -136,7 +136,7 @@ namespace snapper
     SDir
     Snapper::openSubvolumeDir() const
     {
-       return SDir(subvolume);
+       return filesystem->openSubvolumeDir();
     }