aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer/ChangeLog7
-rw-r--r--composer/e-icon-list.c3
-rw-r--r--composer/e-msg-composer-attachment-bar.c15
3 files changed, 12 insertions, 13 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog
index a4b18d5071..d6c1afd9e1 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,10 @@
+2002-09-23 Ettore Perazzoli <ettore@ximian.com>
+
+ * e-icon-list.c (icon_new_from_pixbuf): Removed a #warning.
+
+ * e-msg-composer-attachment-bar.c (size_to_string): Don't use dots
+ here so we don't get funny wrapping from GnomeIconList. [#236]
+
2002-09-22 Dan Winship <danw@ximian.com>
* e-msg-composer.c (save): Fix non-ANSI switch statement
diff --git a/composer/e-icon-list.c b/composer/e-icon-list.c
index a5e7ac45cd..9b5f80bff0 100644
--- a/composer/e-icon-list.c
+++ b/composer/e-icon-list.c
@@ -1014,8 +1014,7 @@ icon_new_from_pixbuf (EIconList *eil, GdkPixbuf *im,
"use_broken_event_handling", FALSE,
NULL);
- /* FIXME: should this use a selectable font?? */
-#warning "Ettore: should we allow this font to be selectable??"
+ /* FIXME: Use GTK+ font. */
gnome_icon_text_item_configure (icon->text,
0, 0, priv->icon_width,
"-adobe-helvetica-medium-r-normal-*-*-120-*-*-p-*-iso8859-1",
diff --git a/composer/e-msg-composer-attachment-bar.c b/composer/e-msg-composer-attachment-bar.c
index 2a8a3e8437..2e918bb5d1 100644
--- a/composer/e-msg-composer-attachment-bar.c
+++ b/composer/e-msg-composer-attachment-bar.c
@@ -98,26 +98,19 @@ size_to_string (gulong size)
I am not sure this will be OK for all the languages. */
if (size < 1e3L) {
- if (size == 1)
- size_string = g_strdup (_("1 byte"));
- else
- size_string = g_strdup_printf (_("%u bytes"),
- (guint) size);
+ size_string = g_strdup (_(""));
} else {
gdouble displayed_size;
if (size < 1e6L) {
displayed_size = (gdouble) size / 1.0e3;
- size_string = g_strdup_printf (_("%.1fK"),
- displayed_size);
+ size_string = g_strdup_printf (_("%.0fK"), displayed_size);
} else if (size < 1e9L) {
displayed_size = (gdouble) size / 1.0e6;
- size_string = g_strdup_printf (_("%.1fM"),
- displayed_size);
+ size_string = g_strdup_printf (_("%.0fM"), displayed_size);
} else {
displayed_size = (gdouble) size / 1.0e9;
- size_string = g_strdup_printf (_("%.1fG"),
- displayed_size);
+ size_string = g_strdup_printf (_("%.0fG"), displayed_size);
}
}