Move 'validate-event' into only module using it.

2 files changed, 13 insertions, 17 deletions

diff --git a/module/vcomponent/util/instance/methods.scm b/module/vcomponent/util/instance/methods.scm
index fef83958..3c531c67 100644
--- a/module/vcomponent/util/instance/methods.scm
+++ b/module/vcomponent/util/instance/methods.scm
@@ -14,6 +14,8 @@
   :use-module (oop goops)
 
   :use-module (calp translation)
+  :use-module ((hnh util exceptions)
+               :select (warning))
 
   :export (load-calendars
 
@@ -173,9 +175,19 @@
 
 
 
+(define (validate-event component)
+  (unless (date/-time<=
+           (prop component 'DTSTART)
+           (prop component 'DTEND))
+    (warning (G_ "end (~a) must be equal to or greater than start (~a)")
+             (prop component 'DTEND)
+             (prop component 'DTSTART)))
+  )
+
+
 (define-method (add-and-save-event (this <events>) calendar event)
 
-  ((@ (vcomponent validate) validate-event) event)
+  (validate-event event)
 
   (cond
    [(get-event-by-uid this (prop event 'UID))
diff --git a/module/vcomponent/validate.scm b/module/vcomponent/validate.scm
deleted file mode 100644
index 8881c95f..00000000
--- a/module/vcomponent/validate.scm
+++ /dev/null
@@ -1,16 +0,0 @@
-(define-module (vcomponent validate)
-  :use-module (vcomponent)
-  :use-module (datetime)
-  :use-module ((hnh util exceptions)
-               :select (warning))
-  :use-module (calp translation)
-  :export (validate-event))
-
-(define (validate-event component)
-  (unless (date/-time<=
-           (prop component 'DTSTART)
-           (prop component 'DTEND))
-    (warning (G_ "end (~a) must be equal to or greater than start (~a)")
-             (prop component 'DTEND)
-             (prop component 'DTSTART)))
-  )