- work on dbus interface

diff --git a/dbus/DBusMainLoop.cc b/dbus/DBusMainLoop.cc
index 9fcde768cd07f8ac2593586404df1f65e0fa110a..aafc5f20472ecc8c26b5521a0eec612b66f4e2ca 100644 (file)
--- a/dbus/DBusMainLoop.cc
+++ b/dbus/DBusMainLoop.cc
@@ -104,14 +104,12 @@ namespace DBus
 
            periodic();
 
+           for (vector<struct pollfd>::const_iterator it2 = pollfds.begin(); it2 != pollfds.end(); ++it2)
            {
-               for (vector<struct pollfd>::const_iterator it2 = pollfds.begin(); it2 != pollfds.end(); ++it2)
+               if (it2->fd == wakeup_pipe[0] && (it2->revents & POLLIN))
                {
-                   if (it2->fd == wakeup_pipe[0] && (it2->revents & POLLIN))
-                   {
-                       char arbitrary;
-                       read(wakeup_pipe[0], &arbitrary, 1);
-                   }
+                   char arbitrary;
+                   read(wakeup_pipe[0], &arbitrary, 1);
                }
            }
 

diff --git a/dbus/DBusMainLoop.h b/dbus/DBusMainLoop.h
index 5254576794d97ca0d7d552e3d7f2cd2ada40753e..5ac88010384f053491d886e856d63308df6e7fb5 100644 (file)
--- a/dbus/DBusMainLoop.h
+++ b/dbus/DBusMainLoop.h
@@ -51,7 +51,7 @@ namespace DBus
        virtual int periodic_timeout() = 0;
        virtual void periodic() = 0;
 
-    protected:
+    private:
 
        struct Watch
        {

diff --git a/server/snapperd.cc b/server/snapperd.cc
index b59d3e8953fe82cdf4d8e31826bf73f9df65b09c..b1ab6eb941eaf6775cedc4af55eb9df1751223f4 100644 (file)
--- a/server/snapperd.cc
+++ b/server/snapperd.cc
@@ -193,10 +193,6 @@ main(int argc, char** argv)
     setLogQuery(&log_query);
 #endif
 
-    y2mil("Loading snapper configs");
-
-    meta_snappers.init();
-
     dbus_threads_init_default();
 
     MyMainLoop mainloop(DBUS_BUS_SYSTEM);
@@ -207,6 +203,10 @@ main(int argc, char** argv)
 
     mainloop.request_name(SERVICE, DBUS_NAME_FLAG_REPLACE_EXISTING);
 
+    y2mil("Loading snapper configs");
+
+    meta_snappers.init();
+
     y2mil("Listening for method calls and signals");
 
     mainloop.run();