sync with 0.7.6cvs1

[claws.git] / src / compose.c

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;
 
-               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",