[Gpg4win-commits] r1081 - in trunk: . patches/claws-mail-3.7.0

[scm-commit@wald.intevation.org]

Author: colinleroy
Date: 2009-01-17 18:11:57 +0100 (Sat, 17 Jan 2009)
New Revision: 1081

Modified:
   trunk/ChangeLog
   trunk/patches/claws-mail-3.7.0/06-bug_1825.patch
Log:
2009-01-17  Colin Leroy  <colin at colino.net>

	* patches/claws-mail-3.7.0/06-bug_1825.patch
		Fix patch.



Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-01-17 16:42:57 UTC (rev 1080)
+++ trunk/ChangeLog	2009-01-17 17:11:57 UTC (rev 1081)
@@ -1,6 +1,11 @@
 2009-01-17  Colin Leroy  <colin at colino.net>
 
 	* patches/claws-mail-3.7.0/06-bug_1825.patch
+		Fix patch.
+
+2009-01-17  Colin Leroy  <colin at colino.net>
+
+	* patches/claws-mail-3.7.0/06-bug_1825.patch
 		Fix opening IMAP mails in non-ascii folders.
 
 2009-01-16  Werner Koch  <wk at g10code.com>

Modified: trunk/patches/claws-mail-3.7.0/06-bug_1825.patch
===================================================================
--- trunk/patches/claws-mail-3.7.0/06-bug_1825.patch	2009-01-17 16:42:57 UTC (rev 1080)
+++ trunk/patches/claws-mail-3.7.0/06-bug_1825.patch	2009-01-17 17:11:57 UTC (rev 1081)
@@ -15,7 +15,7 @@
  	int flags;
  
 -	mem_notify_fd = open("/dev/mem_notify", O_RDONLY|O_NONBLOCK);
-+	mem_notify_fd = g_open("/dev/mem_notify", O_RDONLY|O_NONBLOCK);
++	mem_notify_fd = g_open("/dev/mem_notify", O_RDONLY|O_NONBLOCK, 0);
  	if (mem_notify_fd == -1) {
  		debug_print("/dev/mem_notify not available (%s)\n", 
  			strerror(errno));
@@ -32,10 +32,10 @@
  
  #if HAVE_FLOCK
 -		if ((lockfd = open(base, O_RDWR)) < 0) {
-+		if ((lockfd = g_open(base, O_RDWR)) < 0) {
++		if ((lockfd = g_open(base, O_RDWR, 0)) < 0) {
  #else
 -		if ((lockfd = open(base, O_RDWR)) < 0) {
-+		if ((lockfd = g_open(base, O_RDWR)) < 0) {
++		if ((lockfd = g_open(base, O_RDWR, 0)) < 0) {
  #endif
  			FILE_OP_ERROR(base, "open");
  			return -1;
@@ -52,7 +52,7 @@
  	size_t total = 0; /* total length read */
  	int num_alloc = 1; /* number of blocks allocated */
 -	int fd = open(file, O_RDONLY);
-+	int fd = g_open(file, O_RDONLY);
++	int fd = g_open(file, O_RDONLY, 0);
  
  	if (fd == -1) {
  		FILE_OP_ERROR(file, "open");
@@ -240,7 +240,7 @@
  #else	  
  	/* test whether the file is readable without blocking */
 -	fd = open(file, O_RDONLY | O_NONBLOCK);
-+	fd = g_open(file, O_RDONLY | O_NONBLOCK);
++	fd = g_open(file, O_RDONLY | O_NONBLOCK, 0);
  	if (fd == -1) {
  		FILE_OP_ERROR(file, "open");
  		return NULL;
@@ -286,7 +286,7 @@
  	size = stat_buf.st_size;
  	
 -	fd = open(param->filename, O_RDONLY);
-+	fd = g_open(param->filename, O_RDONLY);
++	fd = g_open(param->filename, O_RDONLY, 0);
  	if (fd < 0) {
  		result->error = MAILIMAP_ERROR_APPEND;
  		return;
@@ -295,7 +295,7 @@
  	   SSH might do something stupid like trying to use it instead
  	   of running $SSH_ASKPASS. Doh. */
 -	fd = open("/dev/tty", O_RDONLY);
-+	fd = g_open("/dev/tty", O_RDONLY);
++	fd = g_open("/dev/tty", O_RDONLY, 0);
  	if (fd != -1) {
  		ioctl(fd, TIOCNOTTY, NULL);
  		close(fd);