From: Arvin Schnell <aschnell@suse.de>
Date: Tue, 24 Jul 2012 08:19:52 +0000 (+0200)
Subject: - work on dbus interface
X-Git-Tag: v0.1.3~197
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=88ae558d0c7ff408c9466b170f7572f1c52be129;p=thirdparty%2Fsnapper.git

- work on dbus interface
---

diff --git a/client/commands.cc b/client/commands.cc
index 3b15c763..20173267 100644
--- a/client/commands.cc
+++ b/client/commands.cc
@@ -23,9 +23,9 @@
 #include "commands.h"
 
 
-#define SERVICE "org.opensuse.snapper"
-#define OBJECT "/org/opensuse/snapper"
-#define INTERFACE "org.opensuse.snapper"
+#define SERVICE "org.opensuse.Snapper"
+#define OBJECT "/org/opensuse/Snapper"
+#define INTERFACE "org.opensuse.Snapper"
 
 
 list<XConfigInfo>
diff --git a/data/Makefile.am b/data/Makefile.am
index 4074c8c8..95c0667c 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -3,7 +3,7 @@
 #
 
 EXTRA_DIST = sysconfig.snapper base.txt x11.txt snapper.logrotate default-config	\
-	org.opensuse.snapper.conf org.opensuse.snapper.service
+	org.opensuse.Snapper.conf org.opensuse.Snapper.service
 
 install-data-local:
 	install -D -m 644 snapper.logrotate $(DESTDIR)/etc/logrotate.d/snapper
@@ -12,5 +12,5 @@ install-data-local:
 	install -d -m 755 $(DESTDIR)/etc/snapper/filters
 	install -D -m 644 base.txt $(DESTDIR)/etc/snapper/filters/base.txt
 	install -D -m 644 x11.txt $(DESTDIR)/etc/snapper/filters/x11.txt
-	install -D -m 644 org.opensuse.snapper.conf $(DESTDIR)/etc/dbus-1/system.d/org.opensuse.snapper.conf
-	install -D -m 644 org.opensuse.snapper.service $(DESTDIR)/usr/share/dbus-1/system-services/org.opensuse.snapper.service
+	install -D -m 644 org.opensuse.Snapper.conf $(DESTDIR)/etc/dbus-1/system.d/org.opensuse.Snapper.conf
+	install -D -m 644 org.opensuse.Snapper.service $(DESTDIR)/usr/share/dbus-1/system-services/org.opensuse.Snapper.service
diff --git a/data/org.opensuse.Snapper.conf b/data/org.opensuse.Snapper.conf
new file mode 100644
index 00000000..2da757b8
--- /dev/null
+++ b/data/org.opensuse.Snapper.conf
@@ -0,0 +1,15 @@
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+
+  <policy user="root">
+    <allow own="org.opensuse.Snapper"/>
+    <allow send_destination="org.opensuse.Snapper" send_interface="org.opensuse.Snapper"/>
+    <allow send_destination="org.opensuse.Snapper" send_interface="org.freedesktop.DBus.Introspectable"/>
+  </policy>
+  <policy context="default">
+    <deny own="org.opensuse.Snapper"/>
+    <allow send_destination="org.opensuse.Snapper" send_interface="org.opensuse.Snapper"/>
+    <allow send_destination="org.opensuse.Snapper" send_interface="org.freedesktop.DBus.Introspectable"/>
+  </policy>
+
+</busconfig>
diff --git a/data/org.opensuse.snapper.service b/data/org.opensuse.Snapper.service
similarity index 76%
rename from data/org.opensuse.snapper.service
rename to data/org.opensuse.Snapper.service
index 63f35f21..39d7333c 100644
--- a/data/org.opensuse.snapper.service
+++ b/data/org.opensuse.Snapper.service
@@ -1,5 +1,5 @@
 # DBus service activation config
 [D-BUS Service]
-Name=org.opensuse.snapper
+Name=org.opensuse.Snapper
 Exec=/usr/sbin/snapperd
 User=root
diff --git a/data/org.opensuse.snapper.conf b/data/org.opensuse.snapper.conf
deleted file mode 100644
index 28242ffb..00000000
--- a/data/org.opensuse.snapper.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-
-  <policy user="root">
-    <allow own="org.opensuse.snapper"/>
-    <allow send_destination="org.opensuse.snapper" send_interface="org.opensuse.snapper"/>
-    <allow send_destination="org.opensuse.snapper" send_interface="org.freedesktop.DBus.Introspectable"/>
-  </policy>
-  <policy context="default">
-    <deny own="org.opensuse.snapper"/>
-    <allow send_destination="org.opensuse.snapper" send_interface="org.opensuse.snapper"/>
-    <allow send_destination="org.opensuse.snapper" send_interface="org.freedesktop.DBus.Introspectable"/>
-  </policy>
-
-</busconfig>
diff --git a/examples/python/comparison.py b/examples/python/comparison.py
index d75e4fa7..89ec73fd 100755
--- a/examples/python/comparison.py
+++ b/examples/python/comparison.py
@@ -4,8 +4,8 @@ import dbus
 
 bus = dbus.SystemBus()
 
-snapper = dbus.Interface(bus.get_object('org.opensuse.snapper', '/org/opensuse/snapper'),
-                         dbus_interface='org.opensuse.snapper')
+snapper = dbus.Interface(bus.get_object('org.opensuse.Snapper', '/org/opensuse/Snapper'),
+                         dbus_interface='org.opensuse.Snapper')
 
 
 config_name = "root"
@@ -21,18 +21,11 @@ for file in files:
     print file[0], file[1], file[2]
 
 
-undo = [ [ "/hello", False ], [ "/world", True ] ]
+snapper.SetUndoAll(config_name, num_pre, num_post, True)
 
-snapper.SetUndo(config_name, num_pre, num_post, undo)
 
+undo_steps = snapper.GetUndoSteps("root", num_pre, num_post)
 
-files = snapper.GetFiles("root", num_pre, num_post)
-
-for file in files:
-    print file[0], file[1], file[2]
-
-
-(num_create, num_modify, num_delete) = snapper.GetUndoStatistic(config_name, num_pre, num_post)
-
-print num_create, num_modify, num_delete
+for undo_step in undo_steps:
+    print undo_step[0], undo_step[1]
 
diff --git a/examples/python/create.py b/examples/python/create.py
index 36505950..3d739571 100755
--- a/examples/python/create.py
+++ b/examples/python/create.py
@@ -4,8 +4,8 @@ import dbus
 
 bus = dbus.SystemBus()
 
-snapper = dbus.Interface(bus.get_object('org.opensuse.snapper', '/org/opensuse/snapper'),
-                         dbus_interface='org.opensuse.snapper')
+snapper = dbus.Interface(bus.get_object('org.opensuse.Snapper', '/org/opensuse/Snapper'),
+                         dbus_interface='org.opensuse.Snapper')
 
 
 print snapper.CreateSingleSnapshot("root", "test", "", { "id" : "123" })
diff --git a/examples/python/debug.py b/examples/python/debug.py
index ef3b981f..9bd998c7 100755
--- a/examples/python/debug.py
+++ b/examples/python/debug.py
@@ -4,8 +4,8 @@ import dbus
 
 bus = dbus.SystemBus()
 
-snapper = dbus.Interface(bus.get_object('org.opensuse.snapper', '/org/opensuse/snapper'),
-                         dbus_interface='org.opensuse.snapper')
+snapper = dbus.Interface(bus.get_object('org.opensuse.Snapper', '/org/opensuse/Snapper'),
+                         dbus_interface='org.opensuse.Snapper')
 
 
 lines = snapper.Debug()
diff --git a/examples/python/delete.py b/examples/python/delete.py
index 4e2a1e9b..63b93d14 100755
--- a/examples/python/delete.py
+++ b/examples/python/delete.py
@@ -4,8 +4,8 @@ import dbus
 
 bus = dbus.SystemBus()
 
-snapper = dbus.Interface(bus.get_object('org.opensuse.snapper', '/org/opensuse/snapper'),
-                         dbus_interface='org.opensuse.snapper')
+snapper = dbus.Interface(bus.get_object('org.opensuse.Snapper', '/org/opensuse/Snapper'),
+                         dbus_interface='org.opensuse.Snapper')
 
 
 snapper.DeleteSnapshots("root", [ 510 ])
diff --git a/examples/python/get-config.py b/examples/python/get-config.py
index 92c6d2c1..c383c4ce 100755
--- a/examples/python/get-config.py
+++ b/examples/python/get-config.py
@@ -4,8 +4,8 @@ import dbus
 
 bus = dbus.SystemBus()
 
-snapper = dbus.Interface(bus.get_object('org.opensuse.snapper', '/org/opensuse/snapper'),
-                         dbus_interface='org.opensuse.snapper')
+snapper = dbus.Interface(bus.get_object('org.opensuse.Snapper', '/org/opensuse/Snapper'),
+                         dbus_interface='org.opensuse.Snapper')
 
 
 config = snapper.GetConfig("root")
diff --git a/examples/python/get-snapshot.py b/examples/python/get-snapshot.py
index bf5adad2..082dfeb1 100755
--- a/examples/python/get-snapshot.py
+++ b/examples/python/get-snapshot.py
@@ -4,8 +4,8 @@ import dbus
 
 bus = dbus.SystemBus()
 
-snapper = dbus.Interface(bus.get_object('org.opensuse.snapper', '/org/opensuse/snapper'),
-                         dbus_interface='org.opensuse.snapper')
+snapper = dbus.Interface(bus.get_object('org.opensuse.Snapper', '/org/opensuse/Snapper'),
+                         dbus_interface='org.opensuse.Snapper')
 
 
 snapshot = snapper.GetSnapshot("root", 1)
diff --git a/examples/python/list-configs.py b/examples/python/list-configs.py
index 7decf7bb..bc1ab981 100755
--- a/examples/python/list-configs.py
+++ b/examples/python/list-configs.py
@@ -4,8 +4,8 @@ import dbus
 
 bus = dbus.SystemBus()
 
-snapper = dbus.Interface(bus.get_object('org.opensuse.snapper', '/org/opensuse/snapper'),
-                         dbus_interface='org.opensuse.snapper')
+snapper = dbus.Interface(bus.get_object('org.opensuse.Snapper', '/org/opensuse/Snapper'),
+                         dbus_interface='org.opensuse.Snapper')
 
 
 configs = snapper.ListConfigs()
diff --git a/examples/python/list-snapshots.py b/examples/python/list-snapshots.py
index 897a19db..f21b70ae 100755
--- a/examples/python/list-snapshots.py
+++ b/examples/python/list-snapshots.py
@@ -4,8 +4,8 @@ import dbus
 
 bus = dbus.SystemBus()
 
-snapper = dbus.Interface(bus.get_object('org.opensuse.snapper', '/org/opensuse/snapper'),
-                         dbus_interface='org.opensuse.snapper')
+snapper = dbus.Interface(bus.get_object('org.opensuse.Snapper', '/org/opensuse/Snapper'),
+                         dbus_interface='org.opensuse.Snapper')
 
 
 snapshots = snapper.ListSnapshots("root")
diff --git a/examples/python/lock-config.py b/examples/python/lock-config.py
index b3de3b6e..89afe0d9 100755
--- a/examples/python/lock-config.py
+++ b/examples/python/lock-config.py
@@ -5,8 +5,8 @@ import dbus
 
 bus = dbus.SystemBus()
 
-snapper = dbus.Interface(bus.get_object('org.opensuse.snapper', '/org/opensuse/snapper'),
-                         dbus_interface='org.opensuse.snapper')
+snapper = dbus.Interface(bus.get_object('org.opensuse.Snapper', '/org/opensuse/Snapper'),
+                         dbus_interface='org.opensuse.Snapper')
 
 
 snapper.LockConfig("root")
diff --git a/examples/qt/client-qt.cc b/examples/qt/client-qt.cc
index 6ed65527..3bfc0b03 100644
--- a/examples/qt/client-qt.cc
+++ b/examples/qt/client-qt.cc
@@ -49,8 +49,8 @@ const QDBusArgument& operator>>(const QDBusArgument& argument, Snapshot& mystruc
 void
 command_list_snapshots()
 {
-    QDBusInterface dbus_iface("org.opensuse.snapper", "/org/opensuse/snapper",
-			      "org.opensuse.snapper", QDBusConnection::systemBus());
+    QDBusInterface dbus_iface("org.opensuse.Snapper", "/org/opensuse/Snapper",
+			      "org.opensuse.Snapper", QDBusConnection::systemBus());
 
     QDBusMessage reply = dbus_iface.call("ListSnapshots", "root");
     // qDebug() << reply;
diff --git a/scripts/zypp-plugin.py b/scripts/zypp-plugin.py
index b9a40bb5..e893bd9c 100755
--- a/scripts/zypp-plugin.py
+++ b/scripts/zypp-plugin.py
@@ -23,8 +23,8 @@ class MyPlugin(Plugin):
 
 bus = SystemBus()
 
-snapper = Interface(bus.get_object('org.opensuse.snapper', '/org/opensuse/snapper'),
-                    dbus_interface='org.opensuse.snapper')
+snapper = Interface(bus.get_object('org.opensuse.Snapper', '/org/opensuse/Snapper'),
+                    dbus_interface='org.opensuse.Snapper')
 
 plugin = MyPlugin()
 plugin.main()
diff --git a/server/snapperd.cc b/server/snapperd.cc
index 715aaa72..570dc28a 100644
--- a/server/snapperd.cc
+++ b/server/snapperd.cc
@@ -49,9 +49,9 @@ using namespace std;
 using namespace snapper;
 
 
-#define SERVICE "org.opensuse.snapper"
-#define PATH "/org/opensuse/snapper"
-#define INTERFACE "org.opensuse.snapper"
+#define SERVICE "org.opensuse.Snapper"
+#define PATH "/org/opensuse/Snapper"
+#define INTERFACE "org.opensuse.Snapper"
 
 
 Clients clients;
@@ -62,7 +62,7 @@ reply_to_introspect(DBus::Connection& conn, DBus::Message& msg)
 {
     const char* introspect =
 	DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE "\n"
-	"<node name='/org/opensuse/snapper'>\n"
+	"<node name='/org/opensuse/Snapper'>\n"
 	"  <interface name='" DBUS_INTERFACE_INTROSPECTABLE "'>\n"
 	"    <method name='Introspect'>\n"
 	"      <arg name='xml_data' type='s' direction='out'/>\n"
@@ -1179,7 +1179,7 @@ listen(DBus::Connection& conn)
 {
     y2mil("Requesting DBus name");
 
-    conn.request_name("org.opensuse.snapper", DBUS_NAME_FLAG_REPLACE_EXISTING);
+    conn.request_name("org.opensuse.Snapper", DBUS_NAME_FLAG_REPLACE_EXISTING);
 
     y2mil("Listening for method calls and signals");
 
diff --git a/snapper.spec.in b/snapper.spec.in
index 7a921ae7..a46663d0 100644
--- a/snapper.spec.in
+++ b/snapper.spec.in
@@ -90,8 +90,8 @@ rm -rf "$RPM_BUILD_ROOT"
 %config(noreplace) %{_sysconfdir}/logrotate.d/snapper
 /etc/cron.hourly/suse.de-snapper
 /etc/cron.daily/suse.de-snapper
-%config /etc/dbus-1/system.d/org.opensuse.snapper.conf
-%{prefix}/share/dbus-1/system-services/org.opensuse.snapper.service
+%config /etc/dbus-1/system.d/org.opensuse.Snapper.conf
+%{prefix}/share/dbus-1/system-services/org.opensuse.Snapper.service
 
 %package -n libsnapper@LIBVERSION_MAJOR@
 Summary:	Library for filesystem snapshot management