diff options
| author | Alexander Larsson <alexl@redhat.com> | 2005-10-03 08:59:38 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2005-10-03 08:59:38 +0000 |
| commit | c6472f4c91dd5d3b99ace41bbdd594230d49f300 (patch) | |
| tree | 4c38048f198e0f439771407318869e55ee00f7cd | |
| parent | 35bd03e33f9a4d42abcf84448fb3ded01a75856e (diff) | |
| download | nautilus-c6472f4c91dd5d3b99ace41bbdd594230d49f300.tar.gz | |
Correctly escape input strings for GMarkup. (#317736) Patch from Christian
2005-10-03 Alexander Larsson <alexl@redhat.com>
* libnautilus-private/nautilus-file-operations-progress.c:
(nautilus_file_operations_progress_new),
(nautilus_file_operations_progress_new_file):
Correctly escape input strings for GMarkup. (#317736)
Patch from Christian Neumair.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-file-operations-progress.c | 7 |
2 files changed, 11 insertions, 4 deletions
@@ -1,5 +1,13 @@ 2005-10-03 Alexander Larsson <alexl@redhat.com> + * libnautilus-private/nautilus-file-operations-progress.c: + (nautilus_file_operations_progress_new), + (nautilus_file_operations_progress_new_file): + Correctly escape input strings for GMarkup. (#317736) + Patch from Christian Neumair. + +2005-10-03 Alexander Larsson <alexl@redhat.com> + * src/file-manager/fm-list-model.c: (fm_list_model_sort_file_entries): Correctly pass iter to gtk_tree_model_rows_reordered() (#315704) diff --git a/libnautilus-private/nautilus-file-operations-progress.c b/libnautilus-private/nautilus-file-operations-progress.c index 9f9e2c470..6b808622f 100644 --- a/libnautilus-private/nautilus-file-operations-progress.c +++ b/libnautilus-private/nautilus-file-operations-progress.c @@ -505,7 +505,7 @@ nautilus_file_operations_progress_new (const char *title, /* ensure that minimize button is shown and the window appears in the tasklist */ gtk_window_set_type_hint (GTK_WINDOW (widget), GDK_WINDOW_TYPE_HINT_NORMAL); - primary_text = g_strconcat ("<big><b>", title, "</b></big>", NULL); + primary_text = g_markup_printf_escaped ("<big><b>%s</b></big>", title); gtk_label_set_markup(GTK_LABEL (progress->details->primary_text_label), primary_text); g_free (primary_text); @@ -575,13 +575,12 @@ nautilus_file_operations_progress_new_file (NautilusFileOperationsProgress *prog /* we haven't set up the file count yet, do not update the progress * count until we do */ - operation_markup = g_strconcat ("<i>", progress_verb, "</i>", NULL); + operation_markup = g_markup_printf_escaped ("<i>%s</i>", progress_verb); gtk_label_set_markup (GTK_LABEL (progress->details->operation_name_label), operation_markup); g_free (operation_markup); - item_markup = g_strconcat ("<i>\"", item_name, "\"</i>", NULL); - + item_markup = g_markup_printf_escaped ("<i>%s</i>", item_name); gtk_label_set_markup (GTK_LABEL (progress->details->item_name), item_markup); g_free (item_markup); |