[Commits] [SCM] claws branch, vfolder, updated. 3.10.1-107-g7548f0b

[miras at claws-mail.org]

The branch vfolder of project "claws" (Claws Mail) has been updated
       via  7548f0b8e609be24c00c347ba6fd2564c41b1876 (commit)
       via  15ab289e1771f7492d9d173d7ee3a97bf95db8ac (commit)
      from  56525de819a32955ed283dccafce200a2bc5de0b (commit)

Summary of changes:
 configure.ac                       |   29 +++++++++++++++++++++++++++++
 src/plugins/vfolder/vfolder_init.c |    6 ++----
 2 files changed, 31 insertions(+), 4 deletions(-)


- Log -----------------------------------------------------------------
commit 7548f0b8e609be24c00c347ba6fd2564c41b1876
Author: Michael Rasmussen <mir at datanom.net>
Date:   Sat Jun 21 22:18:20 2014 +0200

    Readded check for vcalendar which were removed by a mistake

diff --git a/configure.ac b/configure.ac
index d67ad8f..158887b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1841,6 +1841,35 @@ else
 	AC_MSG_RESULT(no)
 fi
 
+AC_MSG_CHECKING([whether to build vcalendar plugin])
+if test x"$enable_vcalendar_plugin" != xno; then
+        dependencies_missing=""
+
+        if test x"$HAVE_CURL" = xno; then
+                dependencies_missing="libcurl $dependencies_missing"
+        fi
+
+        if test x"$HAVE_PERL" = xno; then
+                dependencies_missing="perl $dependencies_missing"
+        fi
+
+        if test x"$dependencies_missing" = x; then
+                PLUGINS="$PLUGINS vcalendar"
+                AC_MSG_RESULT(yes)
+        elif test x"$enable_vcalendar_plugin" = xauto; then
+                AC_MSG_RESULT(no)
+                AC_MSG_WARN("Plugin vcalendar will not be built; missing $dependencies_missing")
+                enable_vcalendar_plugin=no
+                MISSING_DEPS_PLUGINS="$MISSING_DEPS_PLUGINS vcalendar"
+        else
+                AC_MSG_RESULT(no)
+                AC_MSG_ERROR("Plugin vcalendar cannot be built; missing $dependencies_missing")
+        fi
+else
+        DISABLED_PLUGINS="$DISABLED_PLUGINS vcalendar"
+        AC_MSG_RESULT(no)
+fi
+
 AC_MSG_CHECKING([whether to build vfolder plugin])
 if test x"$enable_vfolder_plugin" != xno; then
 	dependencies_missing=""

commit 15ab289e1771f7492d9d173d7ee3a97bf95db8ac
Author: Michael Rasmussen <mir at datanom.net>
Date:   Sat Jun 21 22:15:09 2014 +0200

    Changed description text

diff --git a/src/plugins/vfolder/vfolder_init.c b/src/plugins/vfolder/vfolder_init.c
index 0b06023..97b1577 100644
--- a/src/plugins/vfolder/vfolder_init.c
+++ b/src/plugins/vfolder/vfolder_init.c
@@ -123,10 +123,8 @@ const gchar* plugin_desc(void) {
 			"The supported folder types are MH and IMAP.\n"
 			"Messages in a VFolder cannot be updated.\n"
 			"\n"
-			"To activate the archiving feature go to /View/Create virtual folder\n"
-			"\n"
-			"Default options can be set in /Configuration/Preferences/Plugins"
-			"/vfolder"
+			"To create a VFolder go to /View/Create virtual folder or choose a folder\n"
+			"in the folder view an press <Control>+v\n"
 			);
 }
 

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail