diff options
| author | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2010-11-17 03:29:12 +0000 |
|---|---|---|
| committer | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2010-11-17 03:29:12 +0000 |
| commit | 1e2ae5a88a0100ec87d613f8a0d1f94ea3eda703 (patch) | |
| tree | 364188d3a603dafea951d4297e0921b0956807d5 /gtk/conversations_table.c | |
| parent | 9aeb1dac1770c29b74b0278eda284701a2e8f731 (diff) | |
Quote all fields when exporting to CSV. Fixes bug 2811.
svn path=/trunk/; revision=34920
Diffstat (limited to 'gtk/conversations_table.c')
| -rw-r--r-- | gtk/conversations_table.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/gtk/conversations_table.c b/gtk/conversations_table.c index 658cb83feb..6626deb76f 100644 --- a/gtk/conversations_table.c +++ b/gtk/conversations_table.c @@ -2197,7 +2197,7 @@ csv_handle(GtkTreeModel *model, GtkTreePath *path _U_, GtkTreeIter *iter, case DST_PORT_COLUMN: gtk_tree_model_get(model, iter, csv->columns_order[i], &table_text, -1); if (table_text) { - g_string_append(csv->CSV_str, table_text); + g_string_append_printf(csv->CSV_str, "\"%s\"", table_text); g_free(table_text); } break; @@ -2208,26 +2208,26 @@ csv_handle(GtkTreeModel *model, GtkTreePath *path _U_, GtkTreeIter *iter, case PKT_BA_COLUMN: case BYTES_BA_COLUMN: gtk_tree_model_get(model, iter, csv->columns_order[i], &value, -1); - g_string_append_printf(csv->CSV_str, "%" G_GINT64_MODIFIER "u", value); + g_string_append_printf(csv->CSV_str, "\"%" G_GINT64_MODIFIER "u\"", value); break; case START_COLUMN: - g_string_append_printf(csv->CSV_str, "%s", rel_time_to_secs_str(&conv->start_time)); + g_string_append_printf(csv->CSV_str, "\"%s\"", rel_time_to_secs_str(&conv->start_time)); break; case DURATION_COLUMN: - g_string_append_printf(csv->CSV_str, "%.4f", duration_s); + g_string_append_printf(csv->CSV_str, "\"%.4f\"", duration_s); break; case BPS_AB_COLUMN: if (duration_s > 0 && conv->tx_frames > 1) { - g_string_append_printf(csv->CSV_str, "%.2f", (gint64) conv->tx_bytes * 8 / duration_s); + g_string_append_printf(csv->CSV_str, "\"%.2f\"", (gint64) conv->tx_bytes * 8 / duration_s); } else { - g_string_append(csv->CSV_str, NO_BPS_STR); + g_string_append(csv->CSV_str, "\"" NO_BPS_STR "\""); } break; case BPS_BA_COLUMN: if (duration_s > 0 && conv->rx_frames > 1) { - g_string_append_printf(csv->CSV_str, "%.2f", (gint64) conv->rx_bytes * 8 / duration_s); + g_string_append_printf(csv->CSV_str, "\"%.2f\"", (gint64) conv->rx_bytes * 8 / duration_s); } else { - g_string_append(csv->CSV_str, NO_BPS_STR); + g_string_append(csv->CSV_str, "\"" NO_BPS_STR "\""); } break; default: @@ -2267,7 +2267,7 @@ copy_as_csv_cb(GtkWindow *copy_bt, gpointer data _U_) csv.columns_order[csv.nb_cols] = gtk_tree_view_column_get_sort_column_id(column); if (csv.nb_cols) g_string_append(csv.CSV_str, ","); - g_string_append(csv.CSV_str, gtk_tree_view_column_get_title(column)); + g_string_append_printf(csv.CSV_str, "\"%s\"", gtk_tree_view_column_get_title(column)); csv.nb_cols++; } columns = g_list_next(columns); |