diff options
| -rw-r--r-- | composer/ChangeLog | 7 | ||||
| -rw-r--r-- | composer/e-msg-composer-attachment-bar.c | 10 |
2 files changed, 14 insertions, 3 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog index a7a6e003a2..2caf594e13 100644 --- a/composer/ChangeLog +++ b/composer/ChangeLog @@ -1,3 +1,10 @@ +2002-10-25 Ettore Perazzoli <ettore@ximian.com> + + * e-msg-composer-attachment-bar.c (size_to_string): Return NULL + instead of the empty string if the size is less than one K. + (update): Only put the size if size_to_string() doesn't return + NULL. [#32751] + 2002-10-18 Jeffrey Stedfast <fejj@ximian.com> * e-msg-composer-hdrs.c (create_from_optionmenu): Only add the diff --git a/composer/e-msg-composer-attachment-bar.c b/composer/e-msg-composer-attachment-bar.c index 1bf315ad08..d81c5cc16d 100644 --- a/composer/e-msg-composer-attachment-bar.c +++ b/composer/e-msg-composer-attachment-bar.c @@ -98,7 +98,7 @@ size_to_string (gulong size) I am not sure this will be OK for all the languages. */ if (size < 1e3L) { - size_string = g_strdup (""); + size_string = NULL; } else { gdouble displayed_size; @@ -372,8 +372,12 @@ update (EMsgComposerAttachmentBar *bar) if (attachment->size) { size_string = size_to_string (attachment->size); - label = g_strdup_printf ("%s (%s)", desc, size_string); - g_free (size_string); + if (size_string == NULL) { + label = g_strdup (desc); + } else { + label = g_strdup_printf ("%s (%s)", desc, size_string); + g_free (size_string); + } } else label = g_strdup (desc); |