From: Paul Mangan <paul@claws-mail.org>
Date: Mon, 17 Dec 2001 07:08:39 +0000 (+0000)
Subject: sync with sylpheed 0.6.6cvs1
X-Git-Tag: rel_0_7_0~74
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=e30810f4ff936720e3cd98af06fa842c4c2c068c

sync with sylpheed 0.6.6cvs1
---

diff --git a/ChangeLog b/ChangeLog
index 2c8e90361..3df96bdb7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2001-12-16
+
+	* src/compose.c: compose_template_apply()
+	  src/prefs_template.c: prefs_template_clist_set_row()
+	  src/template.c: template_write_config(): don't replace To: and
+	  Subject: entry in composition window if they are empty.
+
+2001-12-16
+
+	* version 0.6.6
+
+2001-12-15
+
+	* src/folderview.c: folderview_drag_motion_cb(): fixed a DnD bug.
+	* src/ldif.c: ldif_get_line(): ignore CR.
+	* src/mimeview.c: mimeview_show_message(): search also text/html
+	  for first text part.
+
 2001-12-14
 
 	* src/prefs_account.c: prefs_account_save_config_all(): fixed a bug
diff --git a/ChangeLog.claws b/ChangeLog.claws
index 0a17057cd..030a55c14 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2001-12-17 [paul]	0.6.6claws2
+
+	* sync with sylpheed 0.6.6cvs1
+		see ChangeLog entry 2001-12-16
+
 2000-12-17 [alfons]	0.6.6claws1
 
 	* src/filtering.c
@@ -19,12 +24,14 @@
 		update for last minute sync
 	* po/de.po
 		updated by Jens Oberender
+	* po/pt_BR.po
+		updated by Fabio Junior Beneditto
 
 	* src/prefs_common.[ch]
 	* src/undo.c
 		number of undo levels is user configurable
 		(squeeze it into the release in the dying
-		moments)	
+		moments) Submitted by Jens Oberender	
 
 2001-12-15 [melvin]
 
diff --git a/ChangeLog.jp b/ChangeLog.jp
index 4ed14fb62..5a702a448 100644
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,21 @@
+2001-12-16
+
+	* src/compose.c: compose_template_apply()
+	  src/prefs_template.c: prefs_template_clist_set_row()
+	  src/template.c: template_write_config(): ¥á¥Ã¥»¡¼¥¸ºîÀ®¥¦¥£¥ó¥É¥¦
+	  ¤Î To: ¤È Subject: ¥¨¥ó¥È¥ê¤¬¶õ¤Î¾ì¹ç¤ÏÃÖ¤­´¹¤¨¤Ê¤¤¤è¤¦¤Ë¤·¤¿¡£
+
+2001-12-16
+
+	* version 0.6.6
+
+2001-12-15
+
+	* src/folderview.c: folderview_drag_motion_cb(): DnD ¤Î¥Ð¥°¤ò½¤Àµ¡£
+	* src/ldif.c: ldif_get_line(): CR ¤ò̵»ë¡£
+	* src/mimeview.c: mimeview_show_message(): ºÇ½é¤Î¥Æ¥­¥¹¥È¥Ñ¡¼¥È¤È
+	  ¤·¤Æ text/html ¤âõ¤¹¤è¤¦¤Ë¤·¤¿¡£
+
 2001-12-14
 
 	* src/prefs_account.c: prefs_account_save_config_all(): account_list
diff --git a/configure.in b/configure.in
index 1def5dfe3..a258fcca7 100644
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=6
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws1
+EXTRA_VERSION=claws2
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl
diff --git a/src/compose.c b/src/compose.c
index 1e098be9d..10bb92e54 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -4737,10 +4737,10 @@ static void compose_template_apply(Compose *compose, Template *tmpl)
 
 	gtk_stext_freeze(GTK_STEXT(compose->text));
         
-	if (tmpl->subject)
+	if (tmpl->subject && *tmpl->subject != '\0')
 		gtk_entry_set_text(GTK_ENTRY(compose->subject_entry),
 				   tmpl->subject);
-	if (tmpl->to)
+	if (tmpl->to && *tmpl->to != '\0')
 		compose_entry_append(compose, tmpl->to, COMPOSE_TO);
 
 	if (compose->replyinfo == NULL) {
diff --git a/src/prefs_template.c b/src/prefs_template.c
index f5004b51d..6e5d72669 100644
--- a/src/prefs_template.c
+++ b/src/prefs_template.c
@@ -447,10 +447,19 @@ static gint prefs_template_clist_set_row(gint row)
 	name = gtk_editable_get_chars(GTK_EDITABLE(templates.entry_name),
 				      0, -1);
 	subject = gtk_editable_get_chars(GTK_EDITABLE(templates.entry_subject),
-				      0, -1);
+					 0, -1);
 	to = gtk_editable_get_chars(GTK_EDITABLE(templates.entry_to),
 				    0, -1);
 
+	if (subject && *subject == '\0') {
+		g_free(subject);
+		subject = NULL;
+	}
+	if (to && *to == '\0') {
+		g_free(to);
+		to = NULL;
+	}
+
 	tmpl = g_new(Template, 1);
 	tmpl->name = name;
 	tmpl->subject = subject;
diff --git a/src/template.c b/src/template.c
index 73c4de6b7..eafe2cb06 100644
--- a/src/template.c
+++ b/src/template.c
@@ -194,9 +194,9 @@ void template_write_config(GSList *tmpl_list)
 		debug_print(_("%s:%d writing template \"%s\" to %s\n"),
 		            __FILE__, __LINE__, tmpl->name, filename);
 		fprintf(fp, "Name: %s\n", tmpl->name);
-		if (tmpl->subject)
+		if (tmpl->subject && *tmpl->subject != '\0')
 			fprintf(fp, "Subject: %s\n", tmpl->subject);
-		if (tmpl->to)
+		if (tmpl->to && *tmpl->to != '\0')
 			fprintf(fp, "To: %s\n", tmpl->to);
 		fputs("\n", fp);
 		fwrite(tmpl->value, sizeof(gchar) * strlen(tmpl->value), 1,