Permalink
Browse files

Merge remote-tracking branch 'upstream/master'

  • Loading branch information...
2 parents 9b2b57f + fdcd9bd commit a4e714d9ea376c8bf87d500328da08420c74b779 @tmalsburg-test tmalsburg-test committed Mar 17, 2013
View
@@ -110,6 +110,11 @@ AC_SUBST(GLIB_CFLAGS)
AC_SUBST(GLIB_LIBS)
glib_version="`$PKG_CONFIG --modversion glib-2.0`"
+PKG_CHECK_MODULES(GIO,gio-2.0,[have_gio=yes],[have_gio=no])
+AC_SUBST(GIO_CFLAGS)
+AC_SUBST(GIO_LIBS)
+gio_version="`$PKG_CONFIG --modversion gio-2.0`"
+
# gmime 2.4 or 2.6?
PKG_CHECK_MODULES(GMIME,gmime-2.6,[have_gmime_26=yes],[have_gmime_26=no])
AS_IF([test "x$have_gmime_26" = "xno"],[
@@ -169,82 +174,28 @@ AC_DEFINE(MU_STORE_SCHEMA_VERSION,["9.9"], ['Schema' version of the database])
###############################################################################
-# we need gtk (2 or 3) for some of the graphical tools
-#
-AC_ARG_WITH([gui],
- [AS_HELP_STRING([--with-gui=gtk2|gtk3|none])],
- [gui=$withval],[gui=auto])
-
-AS_IF([test "x$gui" != "xgtk2" -a "x$gui" != "xgtk3" -a "x$gui" != "xnone" \
- -a "x$gui" != "xauto"],
- AC_MSG_ERROR([the argument for --with-gui= must be either \
- gtk2|gtk3|auto|no ($gui)]))
-AS_IF([test "x$gui" != "xnone"],[
- # check for gtk3
- AS_IF([test "x$gui" = "xgtk3"],[
- PKG_CHECK_MODULES(GTK,gtk+-3.0,[have_gtk3=yes],[have_gtk3=no])
+# we need GTK+3 for some of the graphical tools
+# use --without-gtk to disable it
+AC_ARG_ENABLE([gtk],AS_HELP_STRING([--disable-gtk],[Disable GTK+]))
+AS_IF([test "x$enable_gtk" != "xno"],[
+ PKG_CHECK_MODULES(GTK,gtk+-3.0,[have_gtk=yes],[have_gtk=no])
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
- gtk_version="`$PKG_CONFIG --modversion gtk+-3.0`"
- ])
- AS_IF([test "x$gui"="gtk3" -a "x$have_gtk3" = "xno"],
- AC_MSG_ERROR([GTK+ 3.x not found]))
-
- # check for gtk2 if we did not find gtk3 already
- # (gtk3 is only sought if asked for it explicitly)
- AS_IF([test "x$gui" != "xno" -a "x$have_gtk3" != "xyes"],[
- PKG_CHECK_MODULES(GTK,gtk+-2.0,[have_gtk2=yes],[have_gtk2=no])
- AC_SUBST(GTK_CFLAGS)
- AC_SUBST(GTK_LIBS)
- gtk_version="`$PKG_CONFIG --modversion gtk+-2.0`"
- ])
- # only an error if we explicitly asked for it
- AS_IF([test "x$have_gtk2" = "xno" -a "x$gui" != "xauto"],
- AC_MSG_ERROR([GTK+ 2.x not found]))
-])
-
-AM_CONDITIONAL(HAVE_GTK,[test "x$have_gtk2" = "xyes" -o "x$have_gtk3" = "xyes" ])
-AS_IF([test "x$have_gtk2" = "xyes" -o "x$have_gtk3" = "xyes"],[buildgui=yes],
- [buildgui=no])
-AS_IF([test "x$have_gtk3" = "xyes"],
- [AC_DEFINE_UNQUOTED([HAVE_GTK3],1,[Whether we have GTK+ 3.x])])
+ gtk_version="`$PKG_CONFIG --modversion gtk+-3.0`"])
+AM_CONDITIONAL(HAVE_GTK,[test "x$have_gtk" = "xyes"])
# webkit? needed for the fancy web widget
# use --disable-webkit to disable it, even if you have it
-# note; gtk2 and gtk3 imply different webkit versions
-build_webkit=no
-AC_ARG_ENABLE([webkit],
- AS_HELP_STRING([--disable-webkit],[Disable webkit]))
-AS_IF([test "x$enable_webkit" != "xno"], [
- AS_IF([test "x$have_gtk2" = "xyes"],[
- PKG_CHECK_MODULES(WEBKIT,webkit-1.0 >= 1.0.3,[build_webkit=yes],[build_webkit=no])
- AS_IF([test "x$build_webkit" = "xyes"],[
- webkit_version="`$PKG_CONFIG --modversion webkit-1.0`"])
- AC_SUBST(WEBKIT_CFLAGS)
- AC_SUBST(WEBKIT_LIBS)])
-
- AS_IF([test "x$have_gtk3" = "xyes"],[
- PKG_CHECK_MODULES(WEBKIT,webkitgtk-3.0 >= 1.8.0, [build_webkit=yes],[build_webkit=no])
- AS_IF([test "x$build_webkit" = "xyes"],[
+AC_ARG_ENABLE([webkit],AS_HELP_STRING([--disable-webkit],[Disable webkit]))
+AS_IF([test "x$enable_webkit" != "xno"],[
+ PKG_CHECK_MODULES(WEBKIT,webkitgtk-3.0 >= 1.8.0,[have_webkit=yes],[have_webkit=no])
+ AS_IF([test "x$have_webkit" = "xyes"],[
webkit_version="`$PKG_CONFIG --modversion webkitgtk-3.0`"])
AC_SUBST(WEBKIT_CFLAGS)
- AC_SUBST(WEBKIT_LIBS)])
-])
-AM_CONDITIONAL(BUILD_WEBKIT, [test "x$build_webkit" = "xyes"])
-
-
-# gio is needed for some widget/ things
-AS_IF([test "x$buildgui"="xyes"],[
- PKG_CHECK_MODULES(GIO,gio-2.0,[have_gio=yes],[have_gio=no])
- AS_IF([test "x$have_gio" = "xyes"],[
- gio_version="`$PKG_CONFIG --modversion gio-2.0`"])
- AC_SUBST(GIO_CFLAGS)
- AC_SUBST(GIO_LIBS)
+ AC_SUBST(WEBKIT_LIBS)
])
-AM_CONDITIONAL(HAVE_GIO, [test "x$have_gio" = "xyes"])
-
-# should we build the gui toys?
-AM_CONDITIONAL(BUILD_GUI, [test "x$build_webkit" = "xyes" -a "x$have_gio" = "xyes"])
+AM_CONDITIONAL(HAVE_WEBKIT, [test "x$have_webkit" = "xyes"])
+AM_CONDITIONAL(BUILD_GUI,[test "x$have_webkit" = "xyes" -a "x$have_gtk" = "xyes"])
###############################################################################
@@ -344,21 +295,10 @@ echo "Xapian version : $xapian_version"
echo "GLib version : $glib_version"
echo "GMime version : $gmime_version"
-if test "x$buildgui" = "xyes"; then
+AM_COND_IF([BUILD_GUI],[
echo "GTK+ version : $gtk_version"
-fi
-
-if test "x$have_gio" = "xyes"; then
-echo "GIO version : $gio_version"
-fi
-
-if test "x$build_webkit" = "xyes"; then
echo "Webkit version : $webkit_version"
-fi
-
-if test "x$build_guile" = "xyes"; then
-echo "Guile version : $guile_version"
-fi
+])
if test "x$build_mu4e" = "xyes"; then
echo "Emacs version : $emacs_version"
@@ -368,7 +308,11 @@ echo
echo "Have wordexp : $ac_cv_header_wordexp_h"
echo "Build mu4e emacs frontend : $build_mu4e"
echo "Build crypto support (gmime >= 2.6) : $have_gmime_26"
-echo "Build 'mug' toy-ui (gtk+/webkit) : $buildgui"
+AM_COND_IF([BUILD_GUI],[
+echo "Build 'mug' toy-ui (gtk+/webkit) : yes"],[
+echo "Build 'mug' toy-ui (gtk+/webkit) : no"
+])
+
echo "McCabe's Cyclomatic Complexity tool : $have_pmccabe"
echo
@@ -395,10 +339,6 @@ if test "x$buildgui" = "xyes"; then
echo
fi
-# the unit tests
-echo "* You can run 'make check' to run the unit tests"
-echo
-
# wordexp
if test "x$ac_cv_header_wordexp_h" != "xyes"; then
echo "* Your system does not seem to have the 'wordexp' function."
@@ -410,5 +350,5 @@ if test "x$ac_cv_header_wordexp_h" != "xyes"; then
fi
echo
-echo "Now, type 'make' to build mu."
+echo "Now, type 'make' to build mu (or 'make check' to run the unit tests, too)"
echo
View
@@ -166,8 +166,9 @@ static const MuMsgField FIELD_DATA[] = {
{
MU_MSG_FIELD_ID_MAILING_LIST,
MU_MSG_FIELD_TYPE_STRING,
- "list", 'v', 'L',
- FLAG_GMIME | FLAG_XAPIAN_VALUE
+ "list", 'v', 'V',
+ FLAG_GMIME | FLAG_XAPIAN_TERM | FLAG_XAPIAN_VALUE |
+ FLAG_XAPIAN_ESCAPE
},
View
@@ -405,7 +405,10 @@ const MuMsgIterThreadInfo*
mu_msg_iter_get_thread_info (MuMsgIter *iter)
{
g_return_val_if_fail (!mu_msg_iter_is_done(iter), NULL);
- g_return_val_if_fail (iter->thread_hash(), NULL);
+
+ /* maybe we don't have thread info */
+ if (!iter->thread_hash())
+ return NULL;
try {
const MuMsgIterThreadInfo *ti;
View
@@ -179,6 +179,7 @@ typedef struct _MuMsgIterThreadInfo MuMsgIterThreadInfo;
/**
* get a the MuMsgThreaderInfo struct for this message; this only
* works when you created the mu-msg-iter with threading enabled
+ * (otherwise, return NULL)
*
* @param iter a valid MuMsgIter iterator
*
View
@@ -1,4 +1,4 @@
-.TH MU SCRIPT 1 "October 2012" "User Manuals"
+.TH MU SCRIPT 1 "March 2013" "User Manuals"
.SH NAME
@@ -81,3 +81,4 @@ Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
.SH "SEE ALSO"
.BR mu(1)
+.BR guile(1)
View
@@ -1,4 +1,4 @@
-.TH MU 1 "January 2012" "User Manuals"
+.TH MU 1 "March 2013" "User Manuals"
.SH NAME
@@ -7,19 +7,41 @@ index and search e-mail messages.
.SH SYNOPSIS
+In alphabetical order:
+
.B mu [options]
+general mu command
-.B mu index [options]
+.B mu add
+add specific messages to the database
+
+.B mu cfind [options] [<regexp>]
+find contacts
+
+.B mu extract [options] <file> [<parts>] [<regexp>]
+extract attachments and other MIME-parts
.B mu find [options] <search expression>
+find messages
-.B mu view <file> [<files>]
+.B mu index [options]
+(re)index the messages in a Maildir
.B mu mkdir [options] <dir> [<dirs>]
+create a new Maildir
-.B mu extract [options] <file> [<parts>] [<regexp>]
+.B mu remove [options]
+remove specific messages from the database
+
+.B mu script [options]
+run a mu (Guile) script
+
+.B mu server [options]
+start a server process (for \fBmu4e\fR-internal use)
+
+.B mu view <file> [<files>]
+view a specific message
-.B mu cfind [options] [<regexp>]
.SH DESCRIPTION
@@ -176,34 +198,34 @@ non-zero when some error occured. The table lists the various error codes.
.nf
exit code | error
----------+-------------------------------------------
- 1 | MU_ERROR
- 2 | MU_ERROR_IN_PARAMETERS
- 3 | MU_ERROR_INTERNAL
- 4 | MU_ERROR_NO_MATCHES
- |
- 11 | MU_ERROR_XAPIAN
- |
- 13 | MU_ERROR_XAPIAN_QUERY
- 14 | MU_ERROR_XAPIAN_DIR_NOT_ACCESSIBLE
- 15 | MU_ERROR_XAPIAN_NOT_UP_TO_DATE
- 16 | MU_ERROR_XAPIAN_MISSING_DATA
- 17 | MU_ERROR_XAPIAN_CORRUPTION
- 18 | MU_ERROR_XAPIAN_CANNOT_GET_WRITELOCK
- 30 | MU_ERROR_GMIME
- |
- 50 | MU_ERROR_CONTACTS
- 51 | MU_ERROR_CONTACTS_CANNOT_RETRIEVE
- |
- 70 | MU_ERROR_FILE
- 71 | MU_ERROR_FILE_INVALID_NAME
- 72 | MU_ERROR_FILE_CANNOT_LINK
- 73 | MU_ERROR_FILE_CANNOT_OPEN
- 74 | MU_ERROR_FILE_CANNOT_READ
- 75 | MU_ERROR_FILE_CANNOT_CREATE
- 76 | MU_ERROR_FILE_CANNOT_MKDIR
- 77 | MU_ERROR_FILE_STAT_FAILED
- 78 | MU_ERROR_FILE_READDIR_FAILED
- 79 | MU_ERROR_FILE_INVALID_SOURCE
+ 1 | MU_ERROR
+ 2 | MU_ERROR_IN_PARAMETERS
+ 3 | MU_ERROR_INTERNAL
+ 4 | MU_ERROR_NO_MATCHES
+ |
+ 11 | MU_ERROR_XAPIAN
+ |
+ 13 | MU_ERROR_XAPIAN_QUERY
+ 14 | MU_ERROR_XAPIAN_DIR_NOT_ACCESSIBLE
+ 15 | MU_ERROR_XAPIAN_NOT_UP_TO_DATE
+ 16 | MU_ERROR_XAPIAN_MISSING_DATA
+ 17 | MU_ERROR_XAPIAN_CORRUPTION
+ 18 | MU_ERROR_XAPIAN_CANNOT_GET_WRITELOCK
+ 30 | MU_ERROR_GMIME
+ |
+ 50 | MU_ERROR_CONTACTS
+ 51 | MU_ERROR_CONTACTS_CANNOT_RETRIEVE
+ |
+ 70 | MU_ERROR_FILE
+ 71 | MU_ERROR_FILE_INVALID_NAME
+ 72 | MU_ERROR_FILE_CANNOT_LINK
+ 73 | MU_ERROR_FILE_CANNOT_OPEN
+ 74 | MU_ERROR_FILE_CANNOT_READ
+ 75 | MU_ERROR_FILE_CANNOT_CREATE
+ 76 | MU_ERROR_FILE_CANNOT_MKDIR
+ 77 | MU_ERROR_FILE_STAT_FAILED
+ 78 | MU_ERROR_FILE_READDIR_FAILED
+ 79 | MU_ERROR_FILE_INVALID_SOURCE
.fi
.SH BUGS
View
@@ -148,7 +148,8 @@ check_params (MuConfig *opts, GError **err)
{
if (!mu_util_supports (MU_FEATURE_GUILE | MU_FEATURE_GNUPLOT)) {
mu_util_g_set_error (err, MU_ERROR_IN_PARAMETERS,
- "the 'script' command is not supported");
+ "the 'script' command is not available "
+ "in this version of mu");
return FALSE;
}
View
@@ -529,7 +529,7 @@ show_usage (void)
{
g_print ("usage: mu command [options] [parameters]\n");
g_print ("where command is one of index, find, cfind, view, mkdir, "
- "extract, add, remove, stats, verify or server\n");
+ "extract, add, remove, script, verify or server\n");
g_print ("see the mu, mu-<command> or mu-easy manpages for "
"more information\n");
}
View
@@ -1,6 +1,6 @@
#-*-mode:org-*-
#
-# Copyright (C) 2012 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
+# Copyright (C) 2012-2013 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -83,7 +83,7 @@ is one of:
index - index messages
mkdir - create a maildir
remove - remove a message from the database
- script - run a script
+ script - run a script (available only when mu was built with guile-support)
server - start mu server
verify - verify signatures of a message
view - view a specific message
Oops, something went wrong.

0 comments on commit a4e714d

Please sign in to comment.