sync with 0.7.6cvs1

diff --git a/ChangeLog b/ChangeLog
index 4eb91528d93bb8413a6b85570602aebe74a471d8..418a65d313e9d5644cf26b8b20ec05919f153f07 100644 (file)
--- 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
 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 a781abb439f8509d02b5cf7878f09d3025b2c96a..945e3e69772e9cee8e2195c76c1ca509a26354ef 100644 (file)
--- 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
 2002-05-13 [thorsten]  0.7.5claws25
 
        * src/messageview.c

diff --git a/ChangeLog.jp b/ChangeLog.jp
index 27679edae615ee73682b821afc7e53a528b59a9a..0eed192db3b652308a613ea7a5c054fdcac63e7c 100644 (file)
--- 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 ¥¢¥«¥¦¥ó¥È¤òºîÀ®¤¹¤ë¤È¤­¤Ë
 2002-05-11
 
        * src/prefs_account.c: IMAP ¤Þ¤¿¤Ï News ¥¢¥«¥¦¥ó¥È¤òºîÀ®¤¹¤ë¤È¤­¤Ë

diff --git a/configure.in b/configure.in
index 17f02b44b170a91e34f2b55ec8622f1972fdca3a..bc65bfdd23c8969fd6af1b3d561ae72fbcd9b21f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=7
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
 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
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/compose.c b/src/compose.c
index 59a35289ff85a1e1d5bb02bbe166c39311a2ad20..d259169cd95e9970b513b8fab807eb6d0a06728d 100644 (file)
--- 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;
 
 
                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",
                MENUITEM_ADD(menu, menuitem, name, ac);
                g_free(name);
                gtk_signal_connect(GTK_OBJECT(menuitem), "activate",