talons

commit e06b6d5c4bc619867323c81687393e9e78e2f5f2
parent 0660faf7c7eee24e0c721e5f1274b81f8d093a03
Author: Colin Leroy <colin@colino.net>
Date:   Wed, 17 Sep 2008 07:25:22 +0000

2008-09-17 [colin]	3.5.0cvs111

	* src/common/utils.c
		Fix double-opening (fixes multiple signatures when
		using signify)

Diffstat:
M
ChangeLog
 | 
6
++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/common/utils.c
 | 
1
-

4 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-17 [colin]	3.5.0cvs111
+
+	* src/common/utils.c
+		Fix double-opening (fixes multiple signatures when
+		using signify)
+
 2008-09-16 [colin]	3.5.0cvs110
 
 	* src/prefs_account.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3522,3 +3522,4 @@
 ( cvs diff -u -r 1.94.2.185 -r 1.94.2.186 src/messageview.c;  cvs diff -u -r 1.2.2.33 -r 1.2.2.34 src/gtk/inputdialog.c;  cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/gtk/inputdialog.h;  ) > 3.5.0cvs108.patchset
 ( cvs diff -u -r 1.61.2.85 -r 1.61.2.86 src/account.c;  cvs diff -u -r 1.149.2.95 -r 1.149.2.96 src/inc.c;  cvs diff -u -r 1.274.2.272 -r 1.274.2.273 src/mainwindow.c;  cvs diff -u -r 1.49.2.40 -r 1.49.2.41 src/prefs_account.h;  cvs diff -u -r 1.1.2.31 -r 1.1.2.32 src/prefs_other.c;  cvs diff -u -r 1.17.2.50 -r 1.17.2.51 src/send_message.c;  cvs diff -u -r 1.2.2.34 -r 1.2.2.35 src/gtk/inputdialog.c;  ) > 3.5.0cvs109.patchset
 ( cvs diff -u -r 1.105.2.145 -r 1.105.2.146 src/prefs_account.c;  cvs diff -u -r 1.52.2.67 -r 1.52.2.68 src/prefs_folder_item.c;  cvs diff -u -r 1.5.2.37 -r 1.5.2.38 src/prefs_spelling.c;  cvs diff -u -r 1.9.2.61 -r 1.9.2.62 src/gtk/gtkaspell.c;  ) > 3.5.0cvs110.patchset
+( cvs diff -u -r 1.36.2.145 -r 1.36.2.146 src/common/utils.c;  ) > 3.5.0cvs111.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=110
+EXTRA_VERSION=111
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/common/utils.c b/src/common/utils.c
@@ -3119,7 +3119,6 @@ static gchar *file_read_to_str_full(const gchar *file, gboolean recode)
 		return NULL;
 	}
 #else	  
-	fd = open(file, O_RDONLY | O_NONBLOCK);
 	/* test whether the file is readable without blocking */
 	fd = open(file, O_RDONLY | O_NONBLOCK);
 	if (fd == -1) {