From be8d97f11eba6040a6066854b035b8a43089fbba Mon Sep 17 00:00:00 2001
From: djcb <djcb@localhost.localdomain>
Date: Fri, 13 Jan 2012 00:49:30 +0200
Subject: [PATCH] * guile - updates in most guile modules

---
 guile/mu.scm         | 21 +++------------------
 guile/mu/Makefile.am |  4 +++-
 guile/mu/contact.scm |  1 +
 guile/mu/message.scm |  9 +++++----
 guile/mu/stats.scm   |  3 +--
 5 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/guile/mu.scm b/guile/mu.scm
index 84ce4bc7..dd83aae9 100644
--- a/guile/mu.scm
+++ b/guile/mu.scm
@@ -18,24 +18,9 @@
 
 (define-module (mu)
   :export
-  ( mu:initialize))
+  (mu:initialize))
 
-;; :use-module (oop goops)
-  ;; :export
-  ;; (mu:for-each-contact
-  ;;  mu:for-each-message
-  ;;  mu:message-list
-  ;;  mu:tabulate-messages
-  ;;  mu:average-messages
-  ;;   <mu-message>
-  ;;   ;; message funcs
-  ;;   body
-  ;;   header
-  ;;   contacts
-
-  ;;   ;; classes
-  ;;   <mu-contact>
-  ;;   ;; contact methods
-  ;;   name email timestamp frequency last-seen
+;; this is needed for guile < 2.0.4
+(setlocale LC_ALL "")
 
 (load-extension "libguile-mu" "mu_guile_init")
diff --git a/guile/mu/Makefile.am b/guile/mu/Makefile.am
index 73eb4934..57b60b2e 100644
--- a/guile/mu/Makefile.am
+++ b/guile/mu/Makefile.am
@@ -22,6 +22,8 @@ scmdir=${prefix}/share/guile/site/2.0/mu/
 scm_DATA=		\
 	message.scm	\
 	contact.scm	\
-	stats.scm
+	part.scm	\
+	stats.scm	\
+	plot.scm
 
 EXTRA_DIST=$(scm_DATA)
diff --git a/guile/mu/contact.scm b/guile/mu/contact.scm
index eb2fe7ff..30ca1267 100644
--- a/guile/mu/contact.scm
+++ b/guile/mu/contact.scm
@@ -52,6 +52,7 @@ list of <mu-contact> objects."
 objects."
   (contacts msg #t))
 
+
 (define-class <mu-contact-with-stats> (<mu-contact>)
   (tstamp #:init-value 0 #:accessor timestamp #:init-keyword #:timestamp)
   (last-seen #:init-value 0 #:accessor last-seen)
diff --git a/guile/mu/message.scm b/guile/mu/message.scm
index 644fb11f..5d573286 100644
--- a/guile/mu/message.scm
+++ b/guile/mu/message.scm
@@ -25,6 +25,7 @@
 	    ;; internal
 	    mu:get-header
 	    mu:get-field
+	    mu:for-each-msg-internal
 	    ;; message funcs
 	    body
 	    header
@@ -83,10 +84,10 @@
 (define* (mu:for-each-message func #:optional (expr #t))
   "Execute function FUNC for each message that matches mu search expression EXPR.
 If EXPR is not provided, match /all/ messages in the store."
-  (let ((my-func
-	  (lambda (msg)
-	    (func (make <mu-message> #:msg msg)))))
-    (mu:for-each-msg-internal my-func expr)))
+    (mu:for-each-msg-internal
+      (lambda (msg)
+	(func (make <mu-message> #:msg msg)))
+      expr))
 
 (define* (mu:message-list #:optional (expr #t))
   "Return a list of all messages matching mu search expression
diff --git a/guile/mu/stats.scm b/guile/mu/stats.scm
index 7f1ee96b..b7ea0552 100644
--- a/guile/mu/stats.scm
+++ b/guile/mu/stats.scm
@@ -19,8 +19,7 @@
 (define-module (mu stats)
   :use-module (oop goops)
   :use-module (mu message)
-  :export (
-	    mu:tabulate-messages
+  :export ( mu:tabulate-messages
 	    mu:average-messages))