[Commits] compose.c 1.382.2.610 1.382.2.611 mh.c 1.79.2.75 1.79.2.76

[colin at claws-mail.org]

Update of /home/claws-mail/claws/src
In directory srv:/tmp/cvs-serv25974/src

Modified Files:
      Tag: gtk2
	compose.c mh.c 
Log Message:
2012-09-12 [colin]	3.8.1cvs51

	* src/compose.c
	* src/mh.c
	* src/common/ssl.c
	* src/plugins/pgpcore/passphrase.c
		Apply patches from bug #1961, "patches for
		a couple of clang warnings":
		- Check return codes
		- Remove dead code

Index: compose.c
===================================================================
RCS file: /home/claws-mail/claws/src/compose.c,v
retrieving revision 1.382.2.610
retrieving revision 1.382.2.611
diff -u -d -r1.382.2.610 -r1.382.2.611
--- compose.c	8 Sep 2012 20:23:09 -0000	1.382.2.610
+++ compose.c	12 Sep 2012 08:52:47 -0000	1.382.2.611
@@ -1807,11 +1807,6 @@
 		const gchar *body_fmt = NULL;
 		MsgInfo *full_msginfo;
 
-		if (prefs_common.fw_quotefmt && *prefs_common.fw_quotefmt)
-			body_fmt = gettext(prefs_common.fw_quotefmt);
-		else
-			body_fmt = "";
-	
 		full_msginfo = procmsg_msginfo_get_full_info(msginfo);
 		if (!full_msginfo)
 			full_msginfo = procmsg_msginfo_copy(msginfo);
@@ -5897,6 +5892,8 @@
 				err |= (fprintf(fp, "X-Claws-Encrypt:%d\n", compose->use_encryption) < 0);
 				/* and if encdata was null, it means there's been a problem in 
 				 * key selection */
+				if (err == TRUE)
+					g_warning("failed to write queue message");
 				lock = FALSE;
 				fclose(fp);
 				claws_unlink(tmp);

Index: mh.c
===================================================================
RCS file: /home/claws-mail/claws/src/mh.c,v
retrieving revision 1.79.2.75
retrieving revision 1.79.2.76
diff -u -d -r1.79.2.75 -r1.79.2.76
--- mh.c	8 Sep 2012 20:23:10 -0000	1.79.2.75
+++ mh.c	12 Sep 2012 08:52:47 -0000	1.79.2.76
@@ -465,7 +465,6 @@
 	FolderItem *src = NULL;
 	gchar *srcfile;
 	gchar *destfile;
-	gint filemode = 0;
 	FolderItemPrefs *prefs;
 	MsgInfo *msginfo = NULL;
 	MsgInfoList *cur = NULL;
@@ -574,11 +573,6 @@
 		if (prefs && prefs->enable_folder_chmod && prefs->folder_chmod) {
 			if (chmod(destfile, prefs->folder_chmod) < 0)
 				FILE_OP_ERROR(destfile, "chmod");
-
-			/* for mark file */
-			filemode = prefs->folder_chmod;
-			if (filemode & S_IRGRP) filemode |= S_IWGRP;
-			if (filemode & S_IROTH) filemode |= S_IWOTH;
 		}
 		if (relation) {
 			if (g_hash_table_lookup(relation, msginfo) != NULL)