talons

commit a39afb26aa1b8625bad5fe7886e4e1c396fa4fb9
parent ac57e408a342cba99233d0dc515a5b95bea65990
Author: Colin Leroy <colin@colino.net>
Date:   Fri,  3 May 2013 12:58:22 +0200

Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws

Diffstat:
M
autogen.sh
 | 
6
+++---
M
configure.ac
 | 
7
++++++-
M
src/etpan/nntp-thread.c
 | 
2
+-
M
src/news.c
 | 
5
++++-

4 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/autogen.sh b/autogen.sh
@@ -51,7 +51,7 @@ fi
 bisonver=`bison --version`
 
 if [ "$bisonver" = "" ]; then
-	echo Bison is needed to compile Claws Mail CVS
+	echo Bison is needed to compile Claws Mail git
 	exit 1
 fi
 
@@ -62,14 +62,14 @@ else
 fi
 
 if [ "$flexver" = "" ]; then
-	echo Flex 2.5.31 or greater is needed to compile Claws Mail CVS
+	echo Flex 2.5.31 or greater is needed to compile Claws Mail git
 	exit 1
 else
 	flex_major=`echo $flexver|sed "s/\..*//"`
 	flex_minor=`echo $flexver|sed "s/$flex_major\.\(.*\)\..*/\1/"`
 	flex_micro=`echo $flexver|sed "s/$flex_major\.$flex_minor\.\(.*\)/\1/"`
 	if [ $flex_major -lt 2 -o $flex_minor -lt 5 -o $flex_micro -lt 31 ]; then
-		echo Flex 2.5.31 or greater is needed to compile Claws Mail CVS
+		echo Flex 2.5.31 or greater is needed to compile Claws Mail git
 		exit 1
 	fi
 fi
diff --git a/configure.ac b/configure.ac
@@ -13,7 +13,12 @@ EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 if test \( -d .git \); then
-    GIT_VERSION=`git describe --abbrev=6 --dirty --always`
+    AC_CHECK_PROG([GIT], [git], [yes], [no], [$PATH])
+    if test \( "$GIT" = "no" \); then
+	AC_MSG_ERROR([*** git not found. See http://git-scm.com/])
+    else
+	GIT_VERSION=`git describe --abbrev=6 --dirty --always`
+    fi
 else
     GIT_VERSION=`sh -c '. ./version'`
 fi
diff --git a/src/etpan/nntp-thread.c b/src/etpan/nntp-thread.c
@@ -774,7 +774,7 @@ int nntp_threaded_article(Folder * folder, guint32 num, char **contents, size_t 
 
 	threaded_run(folder, &param, &result, article_run);
 	
-	debug_print("nntp post - end\n");
+	debug_print("nntp article - end\n");
 	
 	return result.error;
 }
diff --git a/src/news.c b/src/news.c
@@ -799,8 +799,11 @@ static gint news_get_article(Folder *folder, gint num, gchar *filename)
 	r = nntp_threaded_article(folder, num, &result, &len);
 	
 	if (r == NEWSNNTP_NO_ERROR) {
-		if (str_write_to_file(result, filename) < 0)
+		if (str_write_to_file(result, filename) < 0) {
+			mmap_string_unref(result);
 			return -1;
+		}
+		mmap_string_unref(result);
 	}
 	
 	return r;