From: Paul Mangan <paul@claws-mail.org>
Date: Fri, 16 Jul 2004 09:06:00 +0000 (+0000)
Subject: sync with main 0.9.12cvs1
X-Git-Tag: rel_0_9_12a~79
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=79a4e65671c1458ad530a6e4bf875f6b89f22fe6

sync with main 0.9.12cvs1
---

diff --git a/ChangeLog b/ChangeLog
index f10a5a14b..b2b450b23 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2004-07-16
+
+	* src/pop.[ch]: pop3_getrange_uidl_recv(): relaxed invalid UIDL
+	  checking.
+
+2004-07-16
+
+	* src/account.[ch]
+	  src/main.c
+	  src/prefs.[ch]
+	  src/prefs_account.[ch]
+	  src/prefs_common.[ch]: unified *_{save,write}_config() to
+	  *_write_config().
+
+2004-06-30
+
+	* src/procheader.c:
+	  procheader_get_one_field()
+	  procheader_get_unfolded_line(): fixed a bug that unfolding was
+	  broken if the sequence 'SP CR LF' appeared (thanks to NOGUCHI,
+	  Takuya).
+
 2004-06-23
 
 	* src/prefs_common.c: made the default of confirm_on_exit FALSE.
diff --git a/ChangeLog.claws b/ChangeLog.claws
index 25cc58a7a..5124a329f 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -14,6 +14,7 @@
 	* src/prefs_common.h
 	* src/prefs_gtk.c
 	* src/prefs_gtk.h
+		sync with main 0.9.12cv1
 
 2004-07-15 [colin]	0.9.12cvs24
 
diff --git a/ChangeLog.jp b/ChangeLog.jp
index c7c74a704..ebd361e03 100644
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,25 @@
+2004-07-16
+
+	* src/pop.[ch]: pop3_getrange_uidl_recv(): ̵¸ú¤Ê UIDL ¤Î¥Á¥§¥Ã¥¯¤ò
+	  ´Ë¤á¤¿¡£
+
+2004-07-16
+
+	* src/account.[ch]
+	  src/main.c
+	  src/prefs.[ch]
+	  src/prefs_account.[ch]
+	  src/prefs_common.[ch]: *_{save,write}_config() ¤ò *_write_config()
+	  ¤ËÅý°ì¡£
+
+2004-06-30
+
+	* src/procheader.c:
+	  procheader_get_one_field()
+	  procheader_get_unfolded_line(): ¥·¡¼¥±¥ó¥¹ 'SP CR LF' ¤¬½Ð¸½
+	  ¤·¤¿¤È¤­¤ËÀÞ¤êÊÖ¤·²ò½ü½èÍý¤¬Àµ¤·¤¯Æ°ºî¤·¤Ê¤¤¥Ð¥°¤ò½¤Àµ
+	  (NOGUCHI, Takuya ¤µ¤ó thanks)¡£
+
 2004-06-23
 
 	* src/prefs_common.c: confirm_on_exit ¤Î¥Ç¥Õ¥©¥ë¥È¤ò FALSE ¤Ë¤·¤¿¡£
diff --git a/configure.ac b/configure.ac
index c3e363f7a..c7ff96165 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=24
+EXTRA_VERSION=25
 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
diff --git a/src/account.c b/src/account.c
index b496a58ac..7cb655341 100644
--- a/src/account.c
+++ b/src/account.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2002 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2004 Hiroyuki Yamamoto
  *
  * 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
@@ -169,9 +169,9 @@ void account_read_config_all(void)
 	}
 }
 
-void account_save_config_all(void)
+void account_write_config_all(void)
 {
-	prefs_account_save_config_all(account_list);
+	prefs_account_write_config_all(account_list);
 }
 
 /*
@@ -383,7 +383,7 @@ void account_open(PrefsAccount *ac_prefs)
 		folderview_set_all();
 	}
 
-	account_save_config_all();
+	account_write_config_all();
 	account_set_menu();
 	main_window_reflect_prefs_all();
 }
@@ -971,7 +971,7 @@ static void account_set_default(void)
 static void account_edit_close(void)
 {
 	account_list_set();
-	account_save_config_all();
+	account_write_config_all();
 
 	if (!cur_account && account_list) {
 		PrefsAccount *ac_prefs = (PrefsAccount *)account_list->data;
diff --git a/src/account.h b/src/account.h
index a54e5fd9b..230a003d5 100644
--- a/src/account.h
+++ b/src/account.h
@@ -32,7 +32,7 @@ typedef gint	(*AccountFunc)	(PrefsAccount	*ac_prefs,
 extern PrefsAccount *cur_account;
 
 void	      account_read_config_all	(void);
-void	      account_save_config_all	(void);
+void	      account_write_config_all	(void);
 
 GList        *account_find_all_from_address	(GList		*ac_list,
 						 const gchar	*address);
diff --git a/src/folder_item_prefs.c b/src/folder_item_prefs.c
index 2af899065..9d99647af 100644
--- a/src/folder_item_prefs.c
+++ b/src/folder_item_prefs.c
@@ -142,7 +142,7 @@ void folder_item_prefs_save_config(FolderItem * item)
 
 	id = folder_item_get_identifier(item);
 
-	prefs_save_config(param, id, FOLDERITEM_RC);
+	prefs_write_config(param, id, FOLDERITEM_RC);
 	g_free(id);
 
 	/* MIGRATION: make sure migrated items are not saved
diff --git a/src/main.c b/src/main.c
index 313dbddaa..3bea2777e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2003 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2004 Hiroyuki Yamamoto
  *
  * 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
@@ -406,8 +406,8 @@ static void exit_sylpheed(MainWindow *mainwin)
 
 	main_window_get_size(mainwin);
 	main_window_get_position(mainwin);
-	prefs_common_save_config();
-	account_save_config_all();
+	prefs_common_write_config();
+	account_write_config_all();
 	addressbook_export_to_file();
 
 	filename = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, MENU_RC, NULL);
diff --git a/src/pop.c b/src/pop.c
index ebcf4c23f..217fcf555 100644
--- a/src/pop.c
+++ b/src/pop.c
@@ -251,10 +251,11 @@ static gint pop3_getrange_uidl_recv(Pop3Session *session, const gchar *data,
 		p = newline + 1;
 		if (p < lastp && *p == '\n') p++;
 
-		if (sscanf(buf, "%d %" Xstr(IDLEN) "s", &num, id) != 2)
-			return -1;
-		if (num <= 0 || num > session->count)
-			return -1;
+		if (sscanf(buf, "%d %" Xstr(IDLEN) "s", &num, id) != 2 ||
+		    num <= 0 || num > session->count) {
+			log_warning(_("invalid UIDL response: %s\n"), buf);
+			continue;
+		}
 
 		session->msg[num].uidl = g_strdup(id);
 
diff --git a/src/pop.h b/src/pop.h
index b8ffd2326..8b4d9b1f5 100644
--- a/src/pop.h
+++ b/src/pop.h
@@ -149,8 +149,8 @@ struct _Pop3Session
 };
 
 #define POPBUFSIZE	512
-#define IDLEN		128
-
+/* #define IDLEN	128 */
+#define IDLEN		POPBUFSIZE
 
 Session *pop3_session_new	(PrefsAccount	*account);
 void pop3_get_uidl_table	(PrefsAccount	*account, Pop3Session *session);
diff --git a/src/prefs_account.c b/src/prefs_account.c
index ed64e58d3..3eaa54f6c 100644
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -597,7 +597,7 @@ void prefs_account_read_config(PrefsAccount *ac_prefs, const gchar *label)
 	prefs_custom_header_read_config(ac_prefs);
 }
 
-void prefs_account_save_config_all(GList *account_list)
+void prefs_account_write_config_all(GList *account_list)
 {
 	GList *cur;
 	gchar *rcpath;
diff --git a/src/prefs_account.h b/src/prefs_account.h
index 5b2e4a771..ec69975a0 100644
--- a/src/prefs_account.h
+++ b/src/prefs_account.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2003 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2004 Hiroyuki Yamamoto
  *
  * 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
@@ -199,7 +199,7 @@ PrefsAccount *prefs_account_new		(void);
 
 void prefs_account_read_config		(PrefsAccount	*ac_prefs,
 					 const gchar	*label);
-void prefs_account_save_config_all	(GList		*account_list);
+void prefs_account_write_config_all	(GList		*account_list);
 
 void prefs_account_free			(PrefsAccount	*ac_prefs);
 
diff --git a/src/prefs_common.c b/src/prefs_common.c
index f369fbeb9..05944e156 100644
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -882,9 +882,9 @@ void prefs_common_save_history(const gchar *history, GList *list)
 	g_free(path);
 }
 
-void prefs_common_save_config(void)
+void prefs_common_write_config(void)
 {
-	prefs_save_config(param, "Common", COMMON_RC);
+	prefs_write_config(param, "Common", COMMON_RC);
 
 	prefs_common_save_history(COMMAND_HISTORY, 
 		prefs_common.mime_open_cmd_history);
@@ -3063,7 +3063,7 @@ static void prefs_common_apply(void)
 	prefs_set_data_from_dialog(param);
 	sock_set_io_timeout(prefs_common.io_timeout_secs);
 	main_window_reflect_prefs_all_real(FALSE);
-	prefs_common_save_config();
+	prefs_common_write_config();
 
 	mainwindow = mainwindow_get_mainwindow();
 	log_window_set_clipping(mainwindow->logwin, prefs_common.cliplog,
diff --git a/src/prefs_common.h b/src/prefs_common.h
index d54bb4778..84b6143f8 100644
--- a/src/prefs_common.h
+++ b/src/prefs_common.h
@@ -301,7 +301,7 @@ extern PrefsCommon prefs_common;
 
 void prefs_common_init		(void);
 void prefs_common_read_config	(void);
-void prefs_common_save_config	(void);
+void prefs_common_write_config	(void);
 void prefs_common_open		(void);
 PrefsCommon *prefs_common_get	(void);
 
diff --git a/src/prefs_gtk.c b/src/prefs_gtk.c
index b725c42ca..24f3f6b2e 100644
--- a/src/prefs_gtk.c
+++ b/src/prefs_gtk.c
@@ -177,8 +177,8 @@ if (!(func)) \
 	return; \
 } \
 
-void prefs_save_config(PrefParam *param, const gchar *label,
-		       const gchar *rcfile)
+void prefs_write_config(PrefParam *param, const gchar *label,
+		        const gchar *rcfile)
 {
 	FILE *orig_fp;
 	PrefFile *pfile;
diff --git a/src/prefs_gtk.h b/src/prefs_gtk.h
index ca0f0f583..5c08458a6 100644
--- a/src/prefs_gtk.h
+++ b/src/prefs_gtk.h
@@ -138,7 +138,7 @@ void prefs_read_config		(PrefParam	*param,
 				 const gchar	*rcfile);
 void prefs_config_parse_one_line(PrefParam	*param,
 				 const gchar	*buf);
-void prefs_save_config		(PrefParam	*param,
+void prefs_write_config		(PrefParam	*param,
 				 const gchar	*label,
 				 const gchar	*rcfile);
 gint prefs_write_param		(PrefParam	*param,