diff options
| author | Christian Dywan <christian@lanedo.com> | 2009-06-08 14:33:23 +0300 |
|---|---|---|
| committer | Claudio Saavedra <csaavedra@igalia.com> | 2009-06-08 14:33:23 +0300 |
| commit | 39e0f2c9eb461f971efb1850578ee6f16bc72d36 (patch) | |
| tree | a5ffd42159814b42ecd05bb7aef65503858f59a1 | |
| parent | bfd89edd985e5930a288d2b6ed4e2437ddd20b33 (diff) | |
Correct errors in hildon_format_file-size_for_display
* debian/changelog:
* debian/control:
* hildon/hildon-helper.c (hildon_format_file_size_for_display):
Correct errors in hildon_format_file-size_for_display and use
translations from the hildon-fm package instead of osso-filemanager.
Signed-off-by: Claudio Saavedra <csaavedra@igalia.com>
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | hildon/hildon-helper.c | 8 |
4 files changed, 14 insertions, 5 deletions
@@ -1,3 +1,11 @@ +2009-06-08 Christian Dywan <christian@lanedo.com> + + * debian/changelog: + * debian/control: + * hildon/hildon-helper.c (hildon_format_file_size_for_display): + Correct errors in hildon_format_file-size_for_display and use + translations from the hildon-fm package instead of osso-filemanager. + 2009-06-08 Alejandro G. Castro <alex@igalia.com> * hildon/hildon-pannable-area.c, diff --git a/debian/changelog b/debian/changelog index 41b1135..b4dd1f3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ libhildon (2.1.79-1) unstable; urgency=low * unreleased + * Improve hildon_format_file-size_for_display and use hildon-fm package. -- Claudio Saavedra <csaavedra@igalia.com> Fri, 29 May 2009 17:41:27 +0200 diff --git a/debian/control b/debian/control index ba382da..8191644 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ Description: Hildon libraries development files Package: libhildon1 Section: libs Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, osso-sounds-ui, hildon-libs-l10n-mr | hildon-libs-l10n-mr0, osso-system-lock-l10n-mr | osso-system-lock-l10n-mr0, osso-filemanager-l10n-mr | osso-filemanager-l10n-mr0 +Depends: ${shlibs:Depends}, ${misc:Depends}, osso-sounds-ui, hildon-libs-l10n-mr | hildon-libs-l10n-mr0, osso-system-lock-l10n-mr | osso-system-lock-l10n-mr0, hildon-fm-l10n-mr | hildon-fm-l10n-mr0 Description: Hildon libraries Package: libhildon1-dbg diff --git a/hildon/hildon-helper.c b/hildon/hildon-helper.c index 509bf7b..86ae3f6 100644 --- a/hildon/hildon-helper.c +++ b/hildon/hildon-helper.c @@ -517,17 +517,17 @@ hildon_helper_set_thumb_scrollbar (GtkScrolledWindow *win, gchar * hildon_format_file_size_for_display (goffset size) { - #define _HFM(string) g_dgettext ("osso-filemanager", string) + #define _HFM(string) g_dgettext ("hildon-fm", string) if (size < 1024) return g_strdup_printf (_HFM ("ckdg_va_properties_size_kb"), 1); else if (size < 100 * 1024) - return g_strdup_printf (_HFM ("ckdg_va_properties_size_1kb_99k"), - size / 1024); + return g_strdup_printf (_HFM ("ckdg_va_properties_size_1kb_99kb"), + (int)size / 1024); else if (size < 1024 * 1024) return g_strdup_printf (_HFM ("ckdg_va_properties_size_100kb_1mb"), - size / 1024); + (int)size / 1024); else if (size < 10 * 1024 * 1024) return g_strdup_printf (_HFM ("ckdg_va_properties_size_1mb_10mb"), size / (1024.0f * 1024.0f)); |