Commit 41906667 authored by Almer. S. Tigelaar's avatar Almer. S. Tigelaar Committed by Almer S. Tigelaar

Result of gtk_editable_get_chars was not freed. (2x)

2000-04-08  Almer. S. Tigelaar.  <almer1@dds.nl>

	* src/dialogs/dialog-stf-csv-page.c
	(csv_page_global_change) : Result of gtk_editable_get_chars was not
	freed. (2x)

	* src/stf-parse.c
	(stf_parse_region) : Only the last item of the GSList's would be
	freed
	(stf_parse_sheet) : ditto
parent 51fb4350
2000-04-08 Almer. S. Tigelaar. <almer1@dds.nl>
* src/dialogs/dialog-stf-csv-page.c
(csv_page_global_change) : Result of gtk_editable_get_chars was not
freed. (2x)
* src/stf-parse.c
(stf_parse_region) : Only the last item of the GSList's would be
freed
(stf_parse_sheet) : ditto
2000-04-08 Jon K Hellan <hellan@acm.org>
* src/sheet.c (cellref_name): Remove unused variable.
......
2000-04-08 Almer. S. Tigelaar. <almer1@dds.nl>
* src/dialogs/dialog-stf-csv-page.c
(csv_page_global_change) : Result of gtk_editable_get_chars was not
freed. (2x)
* src/stf-parse.c
(stf_parse_region) : Only the last item of the GSList's would be
freed
(stf_parse_sheet) : ditto
2000-04-08 Jon K Hellan <hellan@acm.org>
* src/sheet.c (cellref_name): Remove unused variable.
......
2000-04-08 Almer. S. Tigelaar. <almer1@dds.nl>
* src/dialogs/dialog-stf-csv-page.c
(csv_page_global_change) : Result of gtk_editable_get_chars was not
freed. (2x)
* src/stf-parse.c
(stf_parse_region) : Only the last item of the GSList's would be
freed
(stf_parse_sheet) : ditto
2000-04-08 Jon K Hellan <hellan@acm.org>
* src/sheet.c (cellref_name): Remove unused variable.
......
2000-04-08 Almer. S. Tigelaar. <almer1@dds.nl>
* src/dialogs/dialog-stf-csv-page.c
(csv_page_global_change) : Result of gtk_editable_get_chars was not
freed. (2x)
* src/stf-parse.c
(stf_parse_region) : Only the last item of the GSList's would be
freed
(stf_parse_sheet) : ditto
2000-04-08 Jon K Hellan <hellan@acm.org>
* src/sheet.c (cellref_name): Remove unused variable.
......
2000-04-08 Almer. S. Tigelaar. <almer1@dds.nl>
* src/dialogs/dialog-stf-csv-page.c
(csv_page_global_change) : Result of gtk_editable_get_chars was not
freed. (2x)
* src/stf-parse.c
(stf_parse_region) : Only the last item of the GSList's would be
freed
(stf_parse_sheet) : ditto
2000-04-08 Jon K Hellan <hellan@acm.org>
* src/sheet.c (cellref_name): Remove unused variable.
......
2000-04-08 Almer. S. Tigelaar. <almer1@dds.nl>
* src/dialogs/dialog-stf-csv-page.c
(csv_page_global_change) : Result of gtk_editable_get_chars was not
freed. (2x)
* src/stf-parse.c
(stf_parse_region) : Only the last item of the GSList's would be
freed
(stf_parse_sheet) : ditto
2000-04-08 Jon K Hellan <hellan@acm.org>
* src/sheet.c (cellref_name): Remove unused variable.
......
2000-04-08 Almer. S. Tigelaar. <almer1@dds.nl>
* src/dialogs/dialog-stf-csv-page.c
(csv_page_global_change) : Result of gtk_editable_get_chars was not
freed. (2x)
* src/stf-parse.c
(stf_parse_region) : Only the last item of the GSList's would be
freed
(stf_parse_sheet) : ditto
2000-04-08 Jon K Hellan <hellan@acm.org>
* src/sheet.c (cellref_name): Remove unused variable.
......
......@@ -43,6 +43,8 @@ csv_page_global_change (GtkWidget *widget, DruidPageData_t *data)
stf_parse_options_csv_set_customfieldseparator (parseoptions, csvcustomtext[0]);
customvalid = TRUE;
}
g_free (csvcustomtext);
}
stf_parse_options_csv_set_separators (parseoptions,
......@@ -59,9 +61,10 @@ csv_page_global_change (GtkWidget *widget, DruidPageData_t *data)
textfieldtext = gtk_editable_get_chars (GTK_EDITABLE (info->csv_textfield), 0, -1);
stf_parse_options_csv_set_stringindicator (parseoptions, textfieldtext[0]);
g_free (textfieldtext);
stf_parse_options_csv_set_indicator_2x_is_single (parseoptions,
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (info->csv_2x_indicator)));
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (info->csv_2x_indicator)));
stf_parse_options_csv_set_duplicates (parseoptions,
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (info->csv_duplicates)));
......
......@@ -503,6 +503,7 @@ stf_preview_merge_with_hash (RenderData_t *renderdata, GSList *list, int colcoun
/* Reformat the line */
if (renderdata->formatted && data != NULL)
stf_preview_format_line (renderdata, data, colcount);
}
if (result != NULL) {
......
......@@ -874,7 +874,7 @@ stf_parse_fixed_line (Source_t *src, StfParseOptions_t *parseoptions)
while (*src->position && *src->position != parseoptions->terminator) {
field = stf_parse_fixed_cell (src, parseoptions);
if (list != NULL) {
listend = g_slist_append (listend, field)->next;
......@@ -1368,6 +1368,7 @@ Sheet*
stf_parse_sheet (StfParseOptions_t *parseoptions, const char *data, Sheet *sheet)
{
GSList *list;
GSList *list_start;
GSList *sublist;
int row = 0, col;
......@@ -1376,6 +1377,7 @@ stf_parse_sheet (StfParseOptions_t *parseoptions, const char *data, Sheet *sheet
g_return_val_if_fail (sheet != NULL, NULL);
list = stf_parse_general (parseoptions, data);
list_start = list;
while (list) {
......@@ -1409,13 +1411,13 @@ stf_parse_sheet (StfParseOptions_t *parseoptions, const char *data, Sheet *sheet
col++;
}
g_slist_free (sublist);
g_slist_free (list->data);
list = g_slist_next (list);
row++;
}
g_slist_free (list);
g_slist_free (list_start);
return sheet;
}
......@@ -1425,6 +1427,7 @@ stf_parse_region (StfParseOptions_t *parseoptions, const char *data)
{
CellRegion *cr;
GSList *list;
GSList *list_start;
GSList *sublist;
GList *resultlist = NULL;
int row = 0, col = 0, colhigh = 0;
......@@ -1433,7 +1436,8 @@ stf_parse_region (StfParseOptions_t *parseoptions, const char *data)
g_return_val_if_fail (data != NULL, NULL);
list = stf_parse_general (parseoptions, data);
list_start = list;
while (list) {
sublist = list->data;
......@@ -1472,7 +1476,7 @@ stf_parse_region (StfParseOptions_t *parseoptions, const char *data)
col++;
}
g_slist_free (sublist);
g_slist_free (list->data);
if (col > colhigh)
colhigh = col;
......@@ -1481,7 +1485,7 @@ stf_parse_region (StfParseOptions_t *parseoptions, const char *data)
row++;
}
g_slist_free (list);
g_slist_free (list_start);
cr = g_new (CellRegion, 1);
cr->list = resultlist;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment