diff options
| author | Alexander Larsson <alexl@redhat.com> | 2002-12-13 11:48:42 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2002-12-13 11:48:42 +0000 |
| commit | bfc0fc80ace0d7089436955269231458adfecc9b (patch) | |
| tree | 44b6edd9259a1ba902a292fa75d02ebb5c9ac97b | |
| parent | a6d10617d9e68aea51159ef163c7fa62b7a84283 (diff) | |
| download | nautilus-bfc0fc80ace0d7089436955269231458adfecc9b.tar.gz | |
Make sure text is valid utf8. (#98886)
2002-12-13 Alexander Larsson <alexl@redhat.com>
* libnautilus-private/nautilus-file-operations-progress.c:
Make sure text is valid utf8. (#98886)
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-file-operations-progress.c | 6 |
2 files changed, 10 insertions, 1 deletions
@@ -1,3 +1,8 @@ +2002-12-13 Alexander Larsson <alexl@redhat.com> + + * libnautilus-private/nautilus-file-operations-progress.c: + Make sure text is valid utf8. (#98886) + 2002-12-12 Alexander Larsson <alexl@redhat.com> * libnautilus-private/nautilus-icon-container.c: diff --git a/libnautilus-private/nautilus-file-operations-progress.c b/libnautilus-private/nautilus-file-operations-progress.c index fa6a2f736..76ceca21d 100644 --- a/libnautilus-private/nautilus-file-operations-progress.c +++ b/libnautilus-private/nautilus-file-operations-progress.c @@ -33,6 +33,7 @@ #include <eel/eel-glib-extensions.h> #include <eel/eel-gtk-extensions.h> #include <eel/eel-gtk-macros.h> +#include <eel/eel-vfs-extensions.h> #include <gtk/gtkhbox.h> #include <gtk/gtkmain.h> #include <gtk/gtkprogressbar.h> @@ -154,6 +155,7 @@ static void set_text_unescaped_trimmed (EelEllipsizingLabel *label, const char *text) { char *unescaped_text; + char *unescaped_utf8; if (text == NULL || text[0] == '\0') { eel_ellipsizing_label_set_text (label, ""); @@ -161,7 +163,9 @@ set_text_unescaped_trimmed (EelEllipsizingLabel *label, const char *text) } unescaped_text = gnome_vfs_unescape_string_for_display (text); - eel_ellipsizing_label_set_text (label, unescaped_text); + unescaped_utf8 = eel_make_valid_utf8 (unescaped_text); + eel_ellipsizing_label_set_text (label, unescaped_utf8); + g_free (unescaped_utf8); g_free (unescaped_text); } |