From 160792b80d35eff394fbe6922051b52c978d6d32 Mon Sep 17 00:00:00 2001
From: Paul Mangan <paul@claws-mail.org>
Date: Tue, 18 Sep 2001 09:36:32 +0000
Subject: [PATCH] sync with sylpheed 0.6.2cvs1

---
 ChangeLog           | 14 ++++++++++++++
 ChangeLog.claws     |  6 ++++++
 ChangeLog.jp        | 14 ++++++++++++++
 INSTALL             |  8 +++++++-
 INSTALL.jp          |  8 +++++++-
 NEWS                | 13 +++++++++++++
 configure.in        |  4 ++--
 src/addressbook.c   |  2 +-
 src/addrindex.c     |  7 +++++++
 src/main.c          |  2 ++
 src/mainwindow.c    |  1 +
 src/prefs_account.c |  2 +-
 12 files changed, 75 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 08ae48731..6f01e658b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2001-09-17
+
+	* src/mainwindow.c: ac_menu_popup_closed(): fixed the bug that
+	  caused segfault. Changed 'Preferences per account...' menu item.
+
+2001-09-17
+
+	* version 0.6.2
+
+2001-09-16
+
+	* src/addrindex.c: translate the "Common address" and "Personal
+	  address" from old addressbook.
+
 2001-09-12
 
 	* src/utils.c: get_quote_level(): some optimization and bugfixes.
diff --git a/ChangeLog.claws b/ChangeLog.claws
index 0cf5c1829..4e1f55f2f 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,9 @@
+2001-09-18 [paul]
+
+	* configure.in
+		change to version 0.6.2claws1
+	* sync with sylpheed 0.6.2cvs1 
+
 2001-09-15 [christoph]
 
 	* src/mainwindow.c
diff --git a/ChangeLog.jp b/ChangeLog.jp
index eebb1afa4..a595fd505 100644
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,17 @@
+2001-09-17
+
+	* src/mainwindow.c: ac_menu_popup_closed(): segfault ¤òµ¯¤³¤¹¥Ð¥°
+	  ¤ò½¤Àµ¡£¡Ö¥¢¥«¥¦¥ó¥ÈËè¤ÎÀßÄê...¡×¥á¥Ë¥å¡¼¹àÌܤòÊѹ¹¡£
+
+2001-09-17
+
+	* version 0.6.2
+
+2001-09-16
+
+	* src/addrindex.c: µì·Á¼°¤Î¥¢¥É¥ì¥¹Ä¢¤Î¡Ö¶¦Í­¥¢¥É¥ì¥¹¡×¤È¡Ö¸Ä¿ÍÍÑ
+	  ¥¢¥É¥ì¥¹¡×¤òËÝÌõ¤¹¤ë¤è¤¦¤Ë¤·¤¿¡£
+
 2001-09-12
 
 	* src/utils.c: get_quote_level(): ºÇŬ²½¤È¥Ð¥°½¤Àµ¡£
diff --git a/INSTALL b/INSTALL
index ea1b45b90..0b6ba5d5e 100644
--- a/INSTALL
+++ b/INSTALL
@@ -9,7 +9,9 @@ on the other environment.
 
 It is confirmed to work on the following environments:
 
-o Debian GNU/Linux (woody/sid) (glibc 2.2.x)
+o Debian GNU/Linux unstable (sid) (glibc 2.2.x)
+o Debian GNU/Linux testing (woody) (glibc 2.2.x)
+o Debian GNU/Linux 2.2 (potato) (glibc 2.1.3)
 o Kondara MNU/Linux (glibc 2.1.x)
 o Vine Linux 1.1 (glibc 2.0.x + libwcsmbs)
 o Vine Linux 2.0 (glibc 2.1.x) (Intel, PPC)
@@ -37,6 +39,7 @@ o Linux MLD4
 o Linux MLD5
 o Plamo Linux 2.0
 o Slackware 7.1
+o Slackware 8.0
 o Linux Mandrake 7.0
 o Linux Mandrake 7.1
 o Linux Mandrake 7.2
@@ -48,6 +51,7 @@ o SuSE Linux 7.1
 o SuSE Linux 7.2
 o OpenLinux 2.3 (glibc 2.1.1 -> 2.1.3)
 o Caldera OpenDesktop 2.4
+o Caldera Workstation 3.1
 o Conectiva Linux 4.0
 o Conectiva Linux 5.0
 o Vector Linux 1.5
@@ -56,6 +60,7 @@ o FreeBSD 3.4-RELEASE
 o FreeBSD 4.0-RELEASE
 o FreeBSD 4.1-RELEASE
 o FreeBSD 4.2-RELEASE
+o FreeBSD 4.3-RELEASE
 o FreeBSD 5.0-CURRENT
 o NetBSD 1.4.2
 o NetBSD 1.5 + XPG4DL
@@ -77,6 +82,7 @@ o SCO UnixWare 7
 o Mac OS X (Darwin 1.3) + Xtools (has locale problem)
 o Windows (cygwin + GTK+ for win32) (unstable)
 
+
 For installation, just type:
 
 % ./configure
diff --git a/INSTALL.jp b/INSTALL.jp
index b12c5b981..d8dc0ed79 100644
--- a/INSTALL.jp
+++ b/INSTALL.jp
@@ -8,7 +8,9 @@
 
 °Ê²¼¤Î´Ä¶­¤ÇÆ°ºî¤¬³Îǧ¤µ¤ì¤Æ¤¤¤Þ¤¹:
 
-o Debian GNU/Linux (woody/sid) (glibc 2.2.x)
+o Debian GNU/Linux unstable (sid) (glibc 2.2.x)
+o Debian GNU/Linux testing (woody) (glibc 2.2.x)
+o Debian GNU/Linux 2.2 (potato) (glibc 2.1.3)
 o Kondara MNU/Linux (glibc 2.1.x)
 o Vine Linux 1.1 (glibc 2.0.x + libwcsmbs)
 o Vine Linux 2.0 (glibc 2.1.x) (Intel, PPC)
@@ -36,6 +38,7 @@ o Linux MLD4
 o Linux MLD5
 o Plamo Linux 2.0
 o Slackware 7.1
+o Slackware 8.0
 o Linux Mandrake 7.0
 o Linux Mandrake 7.1
 o Linux Mandrake 7.2
@@ -47,6 +50,7 @@ o SuSE Linux 7.1
 o SuSE Linux 7.2
 o OpenLinux 2.3 (glibc 2.1.1 -> 2.1.3)
 o Caldera OpenDesktop 2.4
+o Caldera Workstation 3.1
 o Conectiva Linux 4.0
 o Conectiva Linux 5.0
 o Vector Linux 1.5
@@ -55,6 +59,7 @@ o FreeBSD 3.4-RELEASE
 o FreeBSD 4.0-RELEASE
 o FreeBSD 4.1-RELEASE
 o FreeBSD 4.2-RELEASE
+o FreeBSD 4.3-RELEASE
 o FreeBSD 5.0-CURRENT
 o NetBSD 1.4.2
 o NetBSD 1.5 + XPG4DL
@@ -76,6 +81,7 @@ o SCO UnixWare 7
 o Mac OS X (Darwin 1.3) + Xtools (locale ¤ËÌäÂꤢ¤ê)
 o Windows (cygwin + GTK+ for win32) (unstable)
 
+
 ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢¼¡¤Î¤è¤¦¤ËÆþÎϤ·¤Æ¤¯¤À¤µ¤¤:
 
 % ./configure
diff --git a/NEWS b/NEWS
index a384bd48e..2e3616f9b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,18 @@
 Changes of Sylpheed
 
+* 0.6.2
+
+    * The new addressbook has been implemented (Match Grun).
+    * LDAP, VCard, and JPilot have been supported.
+    * The option to launch the external editor automatically has been added.
+    * Sorting by mark, unread, attachment, and color label has been enabled.
+    * Moving to the next or previous flagged messages has been enabled.
+    * The "Mark all read" function has been added.
+    * The function to reformat the current paragraph has been implemented.
+    * Some icons have been replaced.
+    * The layout of some menu items has been modified.
+    * Some other bugfixes have been made.
+
 * 0.6.1
 
     * A crash bug caused by the typo of ja.po was fixed.
diff --git a/configure.in b/configure.in
index 60527b883..7786200df 100644
--- a/configure.in
+++ b/configure.in
@@ -5,10 +5,10 @@ PACKAGE=sylpheed
 dnl version number
 MAJOR_VERSION=0
 MINOR_VERSION=6
-MICRO_VERSION=1
+MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws3
+EXTRA_VERSION=claws1
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl
diff --git a/src/addressbook.c b/src/addressbook.c
index 2ba7be1a3..2e9860626 100644
--- a/src/addressbook.c
+++ b/src/addressbook.c
@@ -558,7 +558,7 @@ static void addressbook_create(void)
 	clist = gtk_ctree_new_with_titles(N_COLS, 0, titles);
 	gtk_container_add(GTK_CONTAINER(clist_swin), clist);
 	gtk_clist_set_selection_mode(GTK_CLIST(clist), GTK_SELECTION_EXTENDED);
-	gtk_ctree_set_line_style(GTK_CTREE(clist), GTK_CTREE_LINES_DOTTED);
+	gtk_ctree_set_line_style(GTK_CTREE(clist), GTK_CTREE_LINES_NONE);
 	gtk_ctree_set_expander_style(GTK_CTREE(clist), GTK_CTREE_EXPANDER_SQUARE);
 	gtk_ctree_set_indent(GTK_CTREE(clist), CTREE_INDENT);
 	gtk_clist_set_column_width(GTK_CLIST(clist), COL_NAME,
diff --git a/src/addrindex.c b/src/addrindex.c
index 58a620aea..f1da4bfca 100644
--- a/src/addrindex.c
+++ b/src/addrindex.c
@@ -21,8 +21,15 @@
  * General functions for accessing address index file.
  */
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
+#include "defs.h"
+
 #include <glib.h>
 
+#include "intl.h"
 #include "mgutils.h"
 #include "addritem.h"
 #include "addrcache.h"
diff --git a/src/main.c b/src/main.c
index f0c030e04..208ea5dd7 100644
--- a/src/main.c
+++ b/src/main.c
@@ -279,6 +279,8 @@ int main(int argc, char *argv[])
 
 	prefs_scoring_read_config();
 
+	addressbook_read_file();
+
 	inc_autocheck_timer_init(mainwin);
 
 	if (cmd.receive_all || prefs_common.chk_on_startup)
diff --git a/src/mainwindow.c b/src/mainwindow.c
index 6a554f109..884b59828 100644
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -2075,6 +2075,7 @@ static void ac_menu_popup_closed(GtkMenuShell *menu_shell, gpointer data)
 	GtkWidget *button;
 
 	button = gtk_object_get_data(GTK_OBJECT(menu_shell), "menu_button");
+	if (!button) return;
 	gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
 	gtk_object_remove_data(GTK_OBJECT(mainwin->ac_menu), "menu_button");
 	manage_window_focus_in(mainwin->window, NULL, NULL);
diff --git a/src/prefs_account.c b/src/prefs_account.c
index 0ed4ba3d5..2eac6ab68 100644
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -527,7 +527,7 @@ PrefsAccount *prefs_account_open(PrefsAccount *ac_prefs)
 	} else {
 		prefs_set_dialog(param);
 		gtk_window_set_title(GTK_WINDOW(dialog.window),
-				     _("Preferences for each account"));
+				     _("Account preferences"));
 		gtk_widget_show(dialog.apply_btn);
 	}
 
-- 
2.25.1