From: Paul Mangan <paul@claws-mail.org>
Date: Tue, 14 May 2002 06:52:15 +0000 (+0000)
Subject: sync with 0.7.6cvs1
X-Git-Tag: rel_0_7_6~11
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=d9201f352e3a0a25dbc080e2031d69366afa3c7e

sync with 0.7.6cvs1
---

diff --git a/ChangeLog b/ChangeLog
index 4eb91528d..418a65d31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2002-05-13
+
+	* src/compose.c: compose_account_option_menu_create(): check if
+	  ac->name is NULL.
+
+2002-05-12
+
+	* version 0.7.6
+
+2002-05-12
+
+	* manual/ja/*: updated the Japanese manual (thanks to Yoichi Imai).
+	  manual/en/*: updated the English manual.
+	* faq/de/*
+	  faq/it/*: added German and Italian FAQ.
+	  faq/en/*
+	  faq/es/*
+	  faq/fr/*: updated FAQs.
+	* src/manual.[ch]
+	  src/mainwindow.c: added German and Italian language.
+
 2002-05-11
 
 	* src/prefs_account.c: turn off "receive at get all" option by default
diff --git a/ChangeLog.claws b/ChangeLog.claws
index a781abb43..945e3e697 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2002-05-14 [paul]	0.7.5claws26
+
+	* sync with 0.7.6cvs1
+		see ChangeLog 2002-05-13
+
 2002-05-13 [thorsten]	0.7.5claws25
 
 	* src/messageview.c
diff --git a/ChangeLog.jp b/ChangeLog.jp
index 27679edae..0eed192db 100644
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,24 @@
+2002-05-13
+
+	* src/compose.c: compose_account_option_menu_create(): ac->name ¤¬
+	  NULL ¤«¤É¤¦¤«¤ò¥Á¥§¥Ã¥¯¡£
+
+2002-05-12
+
+	* version 0.7.6
+
+2002-05-12
+
+	* manual/ja/*: ÆüËܸì¥Þ¥Ë¥å¥¢¥ë¤ò¹¹¿·(º£°æ¤µ¤ó thanks)¡£
+	  manual/en/*: ±Ñ¸ì¥Þ¥Ë¥å¥¢¥ë¤ò¹¹¿·¡£
+	* faq/de/*
+	  faq/it/*: ¥É¥¤¥Ä¸ì¤È¥¤¥¿¥ê¥¢¸ì¥Þ¥Ë¥å¥¢¥ë¤òÄɲá£
+	  faq/en/*
+	  faq/es/*
+	  faq/fr/*: FAQ ¤ò¹¹¿·¡£
+	* src/manual.[ch]
+	  src/mainwindow.c: ¥É¥¤¥Ä¸ì¤È¥¤¥¿¥ê¥¢¸ì¤òÄɲá£
+
 2002-05-11
 
 	* src/prefs_account.c: IMAP ¤Þ¤¿¤Ï News ¥¢¥«¥¦¥ó¥È¤òºîÀ®¤¹¤ë¤È¤­¤Ë
diff --git a/configure.in b/configure.in
index 17f02b44b..bc65bfdd2 100644
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=7
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws25
+EXTRA_VERSION=claws26
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
diff --git a/src/compose.c b/src/compose.c
index 59a35289f..d259169cd 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -4941,8 +4941,13 @@ static GtkWidget *compose_account_option_menu_create(Compose *compose)
 
 		if (ac == compose->account) def_menu = num;
 
-		name = g_strdup_printf("%s: %s <%s>",
-				       ac->account_name, ac->name, ac->address);
+		if (ac->name)
+			name = g_strdup_printf("%s: %s <%s>",
+					       ac->account_name,
+					       ac->name, ac->address);
+		else
+			name = g_strdup_printf("%s: %s",
+					       ac->account_name, ac->address);
 		MENUITEM_ADD(menu, menuitem, name, ac);
 		g_free(name);
 		gtk_signal_connect(GTK_OBJECT(menuitem), "activate",