[Commits] [SCM] claws branch, master, updated. 3.9.3-65-g308f993

[mones at claws-mail.org]

The branch master of project "claws" (Claws Mail) has been updated
       via  308f9937247ca6ca0dc2ef554080705976a93a95 (commit)
       via  864fd8e5fe8be79f565c9234ceb1ac3d43054309 (commit)
      from  2baec79262e41790484f46e9b3b9ccc5b3f49983 (commit)


- Log -----------------------------------------------------------------
commit 308f9937247ca6ca0dc2ef554080705976a93a95
Author: Ricardo Mones <ricardo at mones.org>
Date:   Sat Apr 12 14:14:09 2014 +0200

    Fix bug #3138 “pgpinline crashes on signature check if gppme fails to init”

diff --git a/src/plugins/pgpinline/pgpinline.c b/src/plugins/pgpinline/pgpinline.c
index 2a60946..7ce5c13 100644
--- a/src/plugins/pgpinline/pgpinline.c
+++ b/src/plugins/pgpinline/pgpinline.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2012 Colin Leroy <colin at colino.net> and 
+ * Copyright (C) 1999-2014 Colin Leroy <colin at colino.net> and
  * the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
@@ -137,8 +137,10 @@ static gboolean pgpinline_is_signed(MimeInfo *mimeinfo)
 		data = pgpinline_new_privacydata();
 		mimeinfo->privacy = (PrivacyData *) data;
 	}
-	data->done_sigtest = TRUE;
-	data->is_signed = TRUE;
+	if (data != NULL) {
+		data->done_sigtest = TRUE;
+		data->is_signed = TRUE;
+	}
 
 	return TRUE;
 }
@@ -449,12 +451,14 @@ static MimeInfo *pgpinline_decrypt(MimeInfo *mimeinfo)
 			data = pgpinline_new_privacydata();
 			decinfo->privacy = (PrivacyData *) data;	
 		}
-		data->done_sigtest = TRUE;
-		data->is_signed = TRUE;
-		data->sigstatus = sigstat;
-		if (data->ctx)
-			gpgme_release(data->ctx);
-		data->ctx = ctx;
+		if (data != NULL) {
+			data->done_sigtest = TRUE;
+			data->is_signed = TRUE;
+			data->sigstatus = sigstat;
+			if (data->ctx)
+				gpgme_release(data->ctx);
+			data->ctx = ctx;
+		}
 	} else
 		gpgme_release(ctx);
 
diff --git a/src/plugins/pgpmime/pgpmime.c b/src/plugins/pgpmime/pgpmime.c
index 2a0bb7a..d22a85a 100644
--- a/src/plugins/pgpmime/pgpmime.c
+++ b/src/plugins/pgpmime/pgpmime.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2012 the Claws Mail team
+ * Copyright (C) 1999-2014 the Claws Mail team
  *
  * 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
@@ -128,9 +128,10 @@ static gboolean pgpmime_is_signed(MimeInfo *mimeinfo)
 		data = pgpmime_new_privacydata();
 		mimeinfo->privacy = (PrivacyData *) data;
 	}
-	
-	data->done_sigtest = TRUE;
-	data->is_signed = TRUE;
+	if (data != NULL) {
+		data->done_sigtest = TRUE;
+		data->is_signed = TRUE;
+	}
 
 	return TRUE;
 }
@@ -421,12 +422,14 @@ static MimeInfo *pgpmime_decrypt(MimeInfo *mimeinfo)
 			data = pgpmime_new_privacydata();
 			decinfo->privacy = (PrivacyData *) data;	
 		}
-		data->done_sigtest = TRUE;
-		data->is_signed = TRUE;
-		data->sigstatus = sigstat;
-		if (data->ctx)
-			gpgme_release(data->ctx);
-		data->ctx = ctx;
+		if (data != NULL) {
+			data->done_sigtest = TRUE;
+			data->is_signed = TRUE;
+			data->sigstatus = sigstat;
+			if (data->ctx)
+				gpgme_release(data->ctx);
+			data->ctx = ctx;
+		}
 	} else
 		gpgme_release(ctx);
 

commit 864fd8e5fe8be79f565c9234ceb1ac3d43054309
Author: Ricardo Mones <ricardo at mones.org>
Date:   Sat Apr 12 13:25:18 2014 +0200

    Fix bug #3094 “OK or Yes to create new directory?”

diff --git a/src/exphtmldlg.c b/src/exphtmldlg.c
index 12b6deb..49db84c 100644
--- a/src/exphtmldlg.c
+++ b/src/exphtmldlg.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2002-2012 Match Grun and the Claws Mail team
+ * Copyright (C) 2002-2014 Match Grun and the Claws Mail team
  *
  * 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
@@ -174,10 +174,10 @@ static gboolean exp_html_move_file( void ) {
 
 	/* Prompt to create */
 	msg = g_strdup_printf( _(
-		"HTML Output Directory '%s'\n" \
-		"does not exist. OK to create new directory?" ),
+		"The HTML output directory '%s'\n" \
+		"does not exist. Do you want to create it?" ),
 		_exportCtl_->dirOutput );
-	aval = alertpanel( _("Create Directory" ),
+	aval = alertpanel( _("Create directory" ),
 		msg, GTK_STOCK_NO, GTK_STOCK_YES, NULL );
 	g_free( msg );
 	if( aval != G_ALERTALTERNATE ) return FALSE;

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

Summary of changes:
 src/exphtmldlg.c                  |    8 ++++----
 src/plugins/pgpinline/pgpinline.c |   22 +++++++++++++---------
 src/plugins/pgpmime/pgpmime.c     |   23 +++++++++++++----------
 3 files changed, 30 insertions(+), 23 deletions(-)


hooks/post-receive
-- 
Claws Mail