Read installed XML on start

1 files changed, 8 insertions, 6 deletions

diff --git a/src/slack-timedate.cpp b/src/slack-timedate.cpp
index 223ce78..41a4961 100644
--- a/src/slack-timedate.cpp
+++ b/src/slack-timedate.cpp
@@ -169,7 +169,9 @@ namespace dlackware::timedate
 
         try
         {
-            introspection_data = Gio::DBus::NodeInfo::create_for_xml(INTROSPECTION_XML);
+            auto introspection_xml = Glib::file_get_contents(dlackware::timedate::introspection_xml);
+
+            introspection_data = Gio::DBus::NodeInfo::create_for_xml(introspection_xml);
         }
         catch (Glib::Error& slack_err)
         {
@@ -303,19 +305,19 @@ gboolean slack_set_time(gint64 seconds_since_epoch, gboolean relative)
         {
             return FALSE;
         }
-        ts.tv_sec += static_cast<time_t>(seconds_since_epoch / USEC_PER_SEC);
-        ts.tv_nsec += (seconds_since_epoch % USEC_PER_SEC) * NSEC_PER_USEC;
+        ts.tv_sec += static_cast<time_t>(seconds_since_epoch / dlackware::timedate::usec_per_sec);
+        ts.tv_nsec += (seconds_since_epoch % dlackware::timedate::usec_per_sec) * dlackware::timedate::nsec_per_usec;
 
         if (ts.tv_nsec < 0)
         {
             --ts.tv_sec;
-            ts.tv_nsec += USEC_PER_SEC;
+            ts.tv_nsec += dlackware::timedate::usec_per_sec;
         }
     }
     else
     {
-        ts.tv_sec = static_cast<time_t>(seconds_since_epoch / USEC_PER_SEC);
-        ts.tv_nsec = (seconds_since_epoch % USEC_PER_SEC) * NSEC_PER_USEC;
+        ts.tv_sec = static_cast<time_t>(seconds_since_epoch / dlackware::timedate::usec_per_sec);
+        ts.tv_nsec = (seconds_since_epoch % dlackware::timedate::usec_per_sec) * dlackware::timedate::nsec_per_usec;
     }
     return clock_settime (CLOCK_REALTIME, &ts) == 0;
 }