talons

commit 473ccddda781f33a044363916a98b4018d5d6b54
parent 2ecdf767a18dea4111a233d8d281bf2fb824e3a5
Author: Colin Leroy <colin@colino.net>
Date:   Thu,  6 Jan 2011 11:43:50 +0000

2011-01-06 [colin]	3.7.8cvs30

	* src/gtk/gtkaspell.c
		Complete previous patch
	* src/messageview.c
	* src/plugins/pgpinline/pgpinline.c
		Coding style

Diffstat:
M
ChangeLog
 | 
8
++++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/gtk/gtkaspell.c
 | 
1
+
M
src/messageview.c
 | 
2
+-
M
src/plugins/pgpinline/pgpinline.c
 | 
4
++--

6 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,11 @@
+2011-01-06 [colin]	3.7.8cvs30
+
+	* src/gtk/gtkaspell.c
+		Complete previous patch
+	* src/messageview.c
+	* src/plugins/pgpinline/pgpinline.c
+		Coding style
+
 2011-01-06 [paul]	3.7.8cvs29
 
 	* AUTHORS
diff --git a/PATCHSETS b/PATCHSETS
@@ -4103,3 +4103,4 @@
 ( cvs diff -u -r 1.1.2.66 -r 1.1.2.67 src/plugins/pgpcore/sgpgme.c;  ) > 3.7.8cvs27.patchset
 ( cvs diff -u -r 1.8.2.29 -r 1.8.2.30 src/export.c;  cvs diff -u -r 1.13.2.28 -r 1.13.2.29 src/import.c;  cvs diff -u -r 1.94.2.210 -r 1.94.2.211 src/messageview.c;  cvs diff -u -r 1.60.2.71 -r 1.60.2.72 src/prefs_actions.c;  cvs diff -u -r 1.49.2.134 -r 1.49.2.135 src/procmime.c;  cvs diff -u -r 1.9.2.70 -r 1.9.2.71 src/gtk/gtkaspell.c;  cvs diff -u -r 1.1.2.45 -r 1.1.2.46 src/plugins/pgpinline/pgpinline.c;  cvs diff -u -r 1.1.2.56 -r 1.1.2.57 src/plugins/pgpmime/pgpmime.c;  cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/plugins/smime/smime.c;  ) > 3.7.8cvs28.patchset
 ( cvs diff -u -r 1.100.2.76 -r 1.100.2.77 AUTHORS;  cvs diff -u -r 1.654.2.4177 -r 1.654.2.4178 configure.ac;  diff -u /dev/null po/lt.po;  cvs diff -u -r 1.1.2.70 -r 1.1.2.71 src/gtk/authors.h;  ) > 3.7.8cvs29.patchset
+( cvs diff -u -r 1.94.2.211 -r 1.94.2.212 src/messageview.c;  cvs diff -u -r 1.9.2.71 -r 1.9.2.72 src/gtk/gtkaspell.c;  cvs diff -u -r 1.1.2.46 -r 1.1.2.47 src/plugins/pgpinline/pgpinline.c;  ) > 3.7.8cvs30.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=8
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=29
+EXTRA_VERSION=30
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/gtk/gtkaspell.c b/src/gtk/gtkaspell.c
@@ -390,6 +390,7 @@ GtkAspell *gtkaspell_new(const gchar *dictionary,
 		if (!alt_gtkaspeller) {
 			gtkaspell_checkers_error_message(
 				g_strdup_printf(_("Couldn't initialize %s speller."), dictionary));
+			gtkaspeller_delete(gtkaspeller);
 			g_free(gtkaspell);
 			return NULL;
 		}
diff --git a/src/messageview.c b/src/messageview.c
@@ -859,7 +859,7 @@ static gint disposition_notification_send(MsgInfo *msginfo)
 	addrp = addr;
 	
 	/* write queue headers */
-	ok=fprintf(fp, "AF:\n"
+	ok = fprintf(fp, "AF:\n"
 		    "NF:0\n"
 		    "PS:10\n"
 		    "SRH:1\n"
diff --git a/src/plugins/pgpinline/pgpinline.c b/src/plugins/pgpinline/pgpinline.c
@@ -550,8 +550,8 @@ static MimeInfo *pgpinline_decrypt(MimeInfo *mimeinfo)
 
 FILE_ERROR:
 	fclose(dstfp);
-       	g_free(fname);
-       	gpgme_data_release(plain);
+	g_free(fname);
+	gpgme_data_release(plain);
 	gpgme_release(ctx);
 	return NULL;
 }