Merge branch 'procmule'

toys/muile/Makefile.am

@@ -29,7 +29,20 @@ noinst_PROGRAMS=				\
 	muile
 
 muile_SOURCES=					\
-	muile.cc
+	muile.c					\
+	dummy.cc
+
+# we need to use dummy.cc to enforce c++ linking...
+BUILT_SOURCES=						\
+	dummy.cc
+
+dummy.cc:
+	touch dummy.cc
+
+DISTCLEANFILES=						\
+	$(BUILT_SOURCES)
+
+
 
 muile_LDFLAGS=					\
 	${top_builddir}/libmuguile/libmuguile.la

toys/muile/README

@@ -8,7 +8,9 @@
   `guile'[1] is an interpreter/library for the Scheme programming language[2],
   specifically meant for extending other programs. It is, in fact, the
   official GNU language for doing so. 'muile' requires guile 2.x to get the full
-  support; older versions will not support e.g. the 'mu-stats.scm' things
+  support. 
+
+older versions will not support e.g. the 'mu-stats.scm' things
   discussed below.
 
   The combination of mu + guile is called `muile', and allows you to write
@@ -53,14 +55,17 @@
    | scheme@(guile-user)> (mu:msg:subject msg)
    | $1 = "See me in bikini :-)"
    | scheme@(guile-user)> (mu:msg:flags msg)
-   | $2 = (attach unread)
+   | $2 = (mu:attach mu:unread)
    `----
    
    and so on. Note, it's probably easiest to explore the various mu: methods
-   using autocompletion; to enable that make sure you have 
+   using autocompletion; to enable that make sure you have
 
-     (use-modules (ice-9 readline))
-     (activate-readline)
+   
+   ,----
+   | (use-modules (ice-9 readline))
+   | (activate-readline)
+   `----
 
    in your ~/.guile configuration.  
 

toys/muile/muile.c

@@ -23,9 +23,8 @@
 #include <mu-runtime.h>
 #include <glib-object.h>
 
-#include <libguile.h>
+#include <libmuguile/mu-guile-common.h>
 #include <libmuguile/mu-guile-msg.h>
-#include <libmuguile/mu-guile-store.h>
 
 struct _MuileConfig {
 	const char *muhome;
@@ -97,13 +96,13 @@ main (int argc, char *argv[])
 		goto error;
 	}
 		
-	if (!mu_runtime_init (opts->muhome /* NULL is okay */)) {
+	if (!mu_runtime_init (opts->muhome /* NULL is okay */,
+			      "muile")) {
 		usage ();
 		goto error;
 	}
 
-	scm_with_guile (&mu_guile_msg_init, NULL);
-	scm_with_guile (&mu_guile_store_init, NULL);
+	mu_guile_init (); /* initialize mu guile modules */
 	
 	if (opts->msgpath) {
 		if (!(gboolean)scm_with_guile