- fixed empty-pre-post cleanup algorithm

diff --git a/client/cleanup.cc b/client/cleanup.cc
index 875fe796f322839926f4890260f40c27424f89c1..cd48e70db97ed9e07452613b8afcf1a25bd8d186 100644 (file)
--- a/client/cleanup.cc
+++ b/client/cleanup.cc
@@ -362,6 +362,8 @@ do_cleanup_empty_pre_post(DBus::Connection& conn, const string& config_name)
                    tmp.push_back(it1);
                    tmp.push_back(it2);
                }
+
+               command_delete_xcomparison(conn, config_name, it1->getNum(), it2->getNum());
            }
        }
     }

diff --git a/client/commands.cc b/client/commands.cc
index 8123f3058ca311110d5192f316d25a3fe466ad47..d849cd49c858ac05f3dd1c25132f526907d69af6 100644 (file)
--- a/client/commands.cc
+++ b/client/commands.cc
@@ -294,6 +294,19 @@ command_create_xcomparison(DBus::Connection& conn, const string& config_name, un
 }
 
 
+void
+command_delete_xcomparison(DBus::Connection& conn, const string& config_name, unsigned int number1,
+                          unsigned int number2)
+{
+    DBus::MessageMethodCall call(SERVICE, OBJECT, INTERFACE, "DeleteComparison");
+
+    DBus::Hoho hoho(call);
+    hoho << config_name << number1 << number2;
+
+    conn.send_with_reply_and_block(call);
+}
+
+
 list<XFile>
 command_get_xfiles(DBus::Connection& conn, const string& config_name, unsigned int number1,
                   unsigned int number2)

diff --git a/client/commands.h b/client/commands.h
index 51d1319bb28e93c03b2f8146b227cbece9185d47..dfc29a66eb7f66ca175e4d9b43e712b1939d4762 100644 (file)
--- a/client/commands.h
+++ b/client/commands.h
@@ -95,6 +95,10 @@ void
 command_create_xcomparison(DBus::Connection& conn, const string& config_name, unsigned int number1,
                           unsigned int number2);
 
+void
+command_delete_xcomparison(DBus::Connection& conn, const string& config_name, unsigned int number1,
+                          unsigned int number2);
+
 list<XFile>
 command_get_xfiles(DBus::Connection& conn, const string& config_name, unsigned int number1,
                   unsigned int number2);

diff --git a/package/snapper.changes b/package/snapper.changes
index d2ab78c4c32a0bae5ffeea1d24f3e9b19e65c4e7..2c7fb1eeca6b445fb63aa8496b6cbcc025ea7686 100644 (file)
--- a/package/snapper.changes
+++ b/package/snapper.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Mar 03 17:20:41 CET 2014 - aschnell@suse.de
+
+- fixed empty-pre-post cleanup algorithm
+
 -------------------------------------------------------------------
 Fri Feb 28 11:47:22 CET 2014 - aschnell@suse.de