Commit 4fcf3fea authored by Morten Welinder's avatar Morten Welinder

Compilation: use g_[s]list_free_full, not go_[s]list_free_custom.

parent 02ca4e22
......@@ -1681,8 +1681,8 @@ applix_read (GOIOContext *io_context, WorkbookView *wb_view, GsfInput *src)
state.real_names,
GO_CMD_CONTEXT (io_context));
g_slist_free (renamed_sheets);
go_slist_free_custom (state.std_names, g_free);
go_slist_free_custom (state.real_names, g_free);
g_slist_free_full (state.std_names, g_free);
g_slist_free_full (state.real_names, g_free);
/* Release the shared expressions and styles */
g_hash_table_foreach_remove (state.exprs, &cb_remove_texpr, NULL);
......
......@@ -5998,7 +5998,7 @@ ms_excel_chart_write (ExcelWriteState *ewb, SheetObject *so)
g_ptr_array_foreach (state.values[i], (GFunc) g_free, NULL);
g_ptr_array_free (state.values[i], TRUE);
}
go_slist_free_custom (state.extra_objects, g_object_unref);
g_slist_free_full (state.extra_objects, g_object_unref);
if (state.line_plot)
g_object_unref (state.line_plot);
......
......@@ -7351,6 +7351,6 @@ excel_read_cleanup (void)
g_hash_table_destroy (excel_func_by_name);
excel_func_by_name = NULL;
go_slist_free_custom (formats, (GFreeFunc)go_format_unref);
g_slist_free_full (formats, (GDestroyNotify)go_format_unref);
formats = NULL;
}
......@@ -5646,7 +5646,7 @@ excel_sheet_free (ExcelWriteSheet *esheet)
g_slist_free (esheet->graphs);
g_hash_table_destroy (esheet->commentshash);
g_hash_table_destroy (esheet->widget_macroname);
go_slist_free_custom (esheet->blips, (GFreeFunc) blipinf_free);
g_slist_free_full (esheet->blips, (GDestroyNotify)blipinf_free);
style_list_free (esheet->conditions);
style_list_free (esheet->hlinks);
style_list_free (esheet->validations);
......
......@@ -1055,7 +1055,7 @@ go_plugin_shutdown (GOPlugin *plugin, GOCmdContext *cc)
xll_function_info_map = NULL;
}
go_slist_free_custom (XLLs, free_XLL);
g_slist_free_full (XLLs, free_XLL);
XLLs = NULL;
if (register_actual_excel4v)
......
......@@ -1736,14 +1736,14 @@ gnumeric_array (GnmFuncEvalInfo *ei, int argc, GnmExprConstPtr const *argv)
argc, argv, FALSE, CELL_ITER_ALL);
if (val != NULL) {
go_slist_free_custom (list, (GFreeFunc) value_release);
g_slist_free_full (list, (GDestroyNotify)value_release);
return val;
}
list = g_slist_reverse (list);
len = g_slist_length (list);
if (len == 0) {
go_slist_free_custom (list, (GFreeFunc) value_release);
g_slist_free_full (list, (GDestroyNotify)value_release);
return value_new_error_VALUE (ei->pos);
}
......
......@@ -4679,9 +4679,9 @@ odf_number_style_end (GsfXMLIn *xin, G_GNUC_UNUSED GsfXMLBlob *blob)
g_string_free (state->cur_format.accum, TRUE);
state->cur_format.accum = NULL;
state->cur_format.name = NULL;
go_slist_free_custom (state->conditions, g_free);
g_slist_free_full (state->conditions, g_free);
state->conditions = NULL;
go_slist_free_custom (state->cond_formats, g_free);
g_slist_free_full (state->cond_formats, g_free);
state->cond_formats = NULL;
}
......@@ -4716,7 +4716,7 @@ odf_get_paper_size (gnm_float width, gnm_float height, gint orient)
break;
}
}
go_list_free_custom (plist, (GFreeFunc)gtk_paper_size_free);
g_list_free_full (plist, (GDestroyNotify)gtk_paper_size_free);
if (size != NULL)
return size;
......@@ -5799,7 +5799,7 @@ oo_prop_free (OOProp *prop)
static void
oo_prop_list_free (GSList *props)
{
go_slist_free_custom (props, (GFreeFunc) oo_prop_free);
g_slist_free_full (props, (GDestroyNotify)oo_prop_free);
}
static void
......@@ -7694,7 +7694,7 @@ oo_plot_area_end (GsfXMLIn *xin, G_GNUC_UNUSED GsfXMLBlob *blob)
OOParseState *state = (OOParseState *)xin->user_state;
if (state->chart.plot_type == OO_PLOT_STOCK) {
odf_create_stock_plot (xin);
go_slist_free_custom (state->chart.list, g_free);
g_slist_free_full (state->chart.list, g_free);
state->chart.list = NULL;
} else {
if (state->chart.series_count == 0 && state->chart.series == NULL)
......@@ -10756,7 +10756,7 @@ openoffice_file_open (G_GNUC_UNUSED GOFileOpener const *fo, GOIOContext *io_cont
g_slist_foreach (state.settings.stack,
(GFunc)unset_gvalue,
NULL);
go_slist_free_custom (state.settings.stack, g_free);
g_slist_free_full (state.settings.stack, g_free);
state.settings.stack = NULL;
}
......@@ -10801,8 +10801,8 @@ openoffice_file_open (G_GNUC_UNUSED GOFileOpener const *fo, GOIOContext *io_cont
g_hash_table_destroy (state.styles.cell_time);
g_hash_table_destroy (state.styles.master_pages);
g_hash_table_destroy (state.styles.page_layouts);
go_slist_free_custom (state.chart.saved_graph_styles,
(GFreeFunc) g_hash_table_destroy);
g_slist_free_full (state.chart.saved_graph_styles,
(GDestroyNotify)g_hash_table_destroy);
g_hash_table_destroy (state.chart.graph_styles);
g_hash_table_destroy (state.chart.hatches);
g_hash_table_destroy (state.chart.dash_styles);
......@@ -10813,7 +10813,7 @@ openoffice_file_open (G_GNUC_UNUSED GOFileOpener const *fo, GOIOContext *io_cont
g_hash_table_destroy (state.validations);
g_hash_table_destroy (state.strings);
g_hash_table_destroy (state.chart.arrow_markers);
go_slist_free_custom (state.span_style_stack, g_free);
g_slist_free_full (state.span_style_stack, g_free);
g_object_unref (contents);
g_object_unref (zip);
......
......@@ -3576,7 +3576,7 @@ odf_write_sheet (GnmOOExport *state)
/* gsf_xml_out_end_element (state->xml); */
}
go_slist_free_custom (sheet_merges, g_free);
g_slist_free_full (sheet_merges, g_free);
g_free (col_styles);
}
......@@ -5637,7 +5637,7 @@ odf_write_manifest (GnmOOExport *state, GsfOutput *child)
for (l = state->fill_image_files; l != NULL; l = l->next)
odf_file_entry (xml, "image/png", l->data);
go_slist_free_custom (state->fill_image_files, g_free);
g_slist_free_full (state->fill_image_files, g_free);
state->fill_image_files = NULL;
state->xml = NULL;
......
......@@ -137,7 +137,7 @@ gnm_py_command_line_finalize (GObject *obj)
{
GnmPyCommandLine *cline = GNM_PY_COMMAND_LINE (obj);
go_list_free_custom (cline->history, g_free);
g_list_free_full (cline->history, g_free);
cline->history = NULL;
parent_class->finalize (obj);
......
......@@ -601,7 +601,7 @@ gnm_app_history_get_list (int max_elements)
}
}
go_list_free_custom (items, (GFreeFunc)gtk_recent_info_unref);
g_list_free_full (items, (GDestroyNotify)gtk_recent_info_unref);
g_object_ref_sink (filter);
g_object_unref (filter);
......
......@@ -352,7 +352,7 @@ colrow_set_single_state (ColRowState *state,
ColRowStateList *
colrow_state_list_destroy (ColRowStateList *list)
{
go_slist_free_custom (list, g_free);
g_slist_free_full (list, g_free);
return NULL;
}
......
......@@ -94,7 +94,7 @@ gboolean colrow_foreach (ColRowCollection const *infos,
void colrow_resize (ColRowCollection *infos, int size);
#define colrow_index_list_destroy(l) go_list_free_custom ((l), g_free)
#define colrow_index_list_destroy(l) g_list_free_full ((l), g_free)
GString *colrow_index_list_to_string (ColRowIndexList *list,
gboolean is_cols,
......@@ -133,7 +133,7 @@ void colrow_set_visibility (Sheet *sheet, gboolean is_cols,
gboolean visible, int first, int last);
void colrow_get_global_outline (Sheet const *sheet, gboolean is_cols, int depth,
ColRowVisList **show, ColRowVisList **hide);
#define colrow_vis_list_destroy(l) (go_slist_free_custom ((l), g_free), NULL)
#define colrow_vis_list_destroy(l) (g_slist_free_full ((l), g_free), NULL)
gint colrow_vis_list_length (ColRowVisList *list);
void colrow_set_visibility_list (Sheet *sheet, gboolean is_cols,
gboolean visible,
......
......@@ -2978,7 +2978,7 @@ cmd_paste_copy_impl (GnmCommand *cmd, WorkbookControl *wbc,
g_slist_foreach (me->pasted_objects,
(GFunc)sheet_object_clear_sheet,
NULL);
go_slist_free_custom (me->pasted_objects, (GFreeFunc)g_object_unref);
g_slist_free_full (me->pasted_objects, (GDestroyNotify)g_object_unref);
me->pasted_objects = NULL;
old_objects = get_new_objects (me->dst.sheet, NULL);
......@@ -3024,7 +3024,7 @@ cmd_paste_copy_impl (GnmCommand *cmd, WorkbookControl *wbc,
* We cannot use the random set of objects at the target location.
* See http://bugzilla.gnome.org/show_bug.cgi?id=308300
*/
go_slist_free_custom (contents->objects, (GFreeFunc)g_object_unref);
g_slist_free_full (contents->objects, (GDestroyNotify)g_object_unref);
contents->objects = is_undo
? go_slist_map (me->orig_contents_objects,
(GOMapFunc)sheet_object_dup)
......@@ -3075,8 +3075,8 @@ cmd_paste_copy_finalize (GObject *cmd)
cellregion_unref (me->contents);
me->contents = NULL;
}
go_slist_free_custom (me->pasted_objects, (GFreeFunc)g_object_unref);
go_slist_free_custom (me->orig_contents_objects, (GFreeFunc)g_object_unref);
g_slist_free_full (me->pasted_objects, (GDestroyNotify)g_object_unref);
g_slist_free_full (me->orig_contents_objects, (GDestroyNotify)g_object_unref);
gnm_command_finalize (cmd);
}
......@@ -4641,7 +4641,7 @@ static void
cmd_objects_delete_finalize (GObject *cmd)
{
CmdObjectsDelete *me = CMD_OBJECTS_DELETE (cmd);
go_slist_free_custom (me->objects, g_object_unref);
g_slist_free_full (me->objects, g_object_unref);
if (me->location) {
g_array_free (me->location, TRUE);
me->location = NULL;
......@@ -4700,7 +4700,7 @@ cmd_objects_move (WorkbookControl *wbc, GSList *objects, GSList *anchors,
result = cmd_generic (wbc, name, undo, redo);
g_slist_free (objects);
go_slist_free_custom (anchors, g_free);
g_slist_free_full (anchors, g_free);
return result;
}
......@@ -5361,7 +5361,7 @@ cmd_analysis_tool_finalize (GObject *cmd)
if (me->old_contents)
cellregion_unref (me->old_contents);
go_slist_free_custom (me->newSheetObjects, g_object_unref);
g_slist_free_full (me->newSheetObjects, g_object_unref);
gnm_command_finalize (cmd);
}
......@@ -5647,9 +5647,9 @@ cmd_change_summary_finalize (GObject *cmd)
{
CmdChangeMetaData *me = CMD_CHANGE_META_DATA (cmd);
go_slist_free_custom (me->changed_props, (GFreeFunc)gsf_doc_prop_free);
g_slist_free_full (me->changed_props, (GDestroyNotify)gsf_doc_prop_free);
me->changed_props = NULL;
go_slist_free_custom (me->removed_names, g_free);
g_slist_free_full (me->removed_names, g_free);
me->removed_names = NULL;
gnm_command_finalize (cmd);
......
......@@ -387,10 +387,10 @@ free_state (AboutState *state)
state->timer = 0;
}
go_list_free_custom (state->active, (GFreeFunc)free_renderer);
g_list_free_full (state->active, (GDestroyNotify)free_renderer);
state->active = NULL;
go_list_free_custom (state->waiting, (GFreeFunc)free_renderer);
g_list_free_full (state->waiting, (GDestroyNotify)free_renderer);
state->waiting = NULL;
g_free (state);
......
......@@ -299,7 +299,7 @@ dialog_function_write_recent_func (FunctionSelectState *state, GnmFunc const *fd
state->localized_function_names)));
}
gnm_conf_set_functionselector_recentfunctions (gconf_value_list);
go_slist_free_custom (gconf_value_list, g_free);
g_slist_free_full (gconf_value_list, g_free);
}
static gboolean
......
......@@ -254,7 +254,7 @@ pm_gui_load_directory_page (PluginManagerGUI *pm_gui)
if (plugin_path_env != NULL) {
plugin_dirs = go_strsplit_to_slist (plugin_path_env, G_SEARCHPATH_SEPARATOR);
pm_gui_load_directories (pm_gui, plugin_dirs, FALSE);
go_slist_free_custom (plugin_dirs, g_free);
g_slist_free_full (plugin_dirs, g_free);
}
pm_gui_load_directories (pm_gui, gnm_conf_get_plugins_extra_dirs (), TRUE);
}
......@@ -295,7 +295,7 @@ cb_pm_button_directory_add_clicked (PluginManagerGUI *pm_gui)
GO_SLIST_PREPEND (extra_dirs, path);
gnm_conf_set_plugins_extra_dirs (extra_dirs);
go_slist_free_custom (extra_dirs, g_free);
g_slist_free_full (extra_dirs, g_free);
pm_gui_load_directory_page (pm_gui);
cb_pm_button_rescan_directories_clicked (pm_gui);
......@@ -338,7 +338,7 @@ cb_pm_button_directory_delete_clicked (PluginManagerGUI *pm_gui)
cb_pm_button_rescan_directories_clicked (pm_gui);
}
go_slist_free_custom (extra_dirs, g_free);
g_slist_free_full (extra_dirs, g_free);
g_free (dir_name);
}
......@@ -411,7 +411,7 @@ cb_pm_selection_changed (GtkTreeSelection *selection, PluginManagerGUI *pm_gui)
-1);
);
}
go_slist_free_custom (dep_ids, g_free);
g_slist_free_full (dep_ids, g_free);
gtk_tree_store_append (pm_gui->model_details, &iter2, &iter);
gtk_tree_store_set (
......@@ -606,7 +606,7 @@ cb_active_toggled (G_GNUC_UNUSED GtkCellRendererToggle *celltoggle,
}
g_string_free (s, TRUE);
}
go_slist_free_custom (dep_ids, g_free);
g_slist_free_full (dep_ids, g_free);
if (want_activate) {
go_plugin_activate (plugin, &error);
......
......@@ -507,7 +507,7 @@ wordlist_pref_remove (GtkButton *button, wordlist_conf_setter_t setter) {
list = g_slist_delete_link (list, l);
setter (list);
}
go_slist_free_custom (list, g_free);
g_slist_free_full (list, g_free);
g_free (text);
}
}
......@@ -526,7 +526,7 @@ wordlist_pref_add (GtkButton *button, wordlist_conf_setter_t setter)
list = go_string_slist_copy (list);
list = g_slist_append (list, g_strdup (text));
setter (list);
go_slist_free_custom (list, g_free);
g_slist_free_full (list, g_free);
}
}
}
......
......@@ -1574,7 +1574,7 @@ free_hf_state (HFCustomizeState *hf_state)
{
g_return_if_fail (hf_state != NULL);
go_list_free_custom (hf_state->marks, (GFreeFunc) free_hf_mark_info);
g_list_free_full (hf_state->marks, (GDestroyNotify) free_hf_mark_info);
g_free (hf_state);
}
......
......@@ -721,7 +721,7 @@ scenarios_summary_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
g_slist_prepend (state->new_report_sheets,
new_sheet);
if (results)
go_slist_free_custom (results, (GFreeFunc)value_release);
g_slist_free_full (results, (GDestroyNotify)value_release);
}
static void
......
......@@ -342,7 +342,7 @@ cb_color_changed_fore (G_GNUC_UNUSED GOComboColor *go_combo_color,
cmd_reorganize_sheets (wbc, old_state, NULL);
update_undo (state, wbc);
go_list_free_custom (selected_rows, (GFreeFunc) gtk_tree_path_free);
g_list_free_full (selected_rows, (GDestroyNotify) gtk_tree_path_free);
}
static void
......@@ -394,7 +394,7 @@ cb_color_changed_back (G_GNUC_UNUSED GOComboColor *go_combo_color,
cmd_reorganize_sheets (wbc, old_state, NULL);
update_undo (state, wbc);
go_list_free_custom (selected_rows, (GFreeFunc) gtk_tree_path_free);
g_list_free_full (selected_rows, (GDestroyNotify) gtk_tree_path_free);
}
static gboolean
......@@ -497,7 +497,7 @@ cb_selection_changed (G_GNUC_UNUSED GtkTreeSelection *ignored,
wb_view_sheet_focus (
wb_control_view (WORKBOOK_CONTROL (state->wbcg)), sheet);
go_list_free_custom (selected_rows, (GFreeFunc) gtk_tree_path_free);
g_list_free_full (selected_rows, (GDestroyNotify) gtk_tree_path_free);
}
static void
......@@ -891,7 +891,7 @@ cb_item_move (SheetManager *state, gnm_iter_search_t iter_search)
selected_rows = gtk_tree_selection_get_selected_rows (selection, NULL);
gtk_tree_model_get_iter (GTK_TREE_MODEL (state->model),
&a, (GtkTreePath *) selected_rows->data);
go_list_free_custom (selected_rows, (GFreeFunc) gtk_tree_path_free);
g_list_free_full (selected_rows, (GDestroyNotify) gtk_tree_path_free);
b = a;
if (!iter_search (GTK_TREE_MODEL (state->model), &b))
......@@ -931,7 +931,7 @@ cb_add_clicked (G_GNUC_UNUSED GtkWidget *ignore, SheetManager *state)
selected_rows = gtk_tree_selection_get_selected_rows (selection, NULL);
gtk_tree_model_get_iter (GTK_TREE_MODEL (state->model),
&sel_iter, (GtkTreePath *) selected_rows->data);
go_list_free_custom (selected_rows, (GFreeFunc) gtk_tree_path_free);
g_list_free_full (selected_rows, (GDestroyNotify) gtk_tree_path_free);
gtk_tree_model_get (GTK_TREE_MODEL (state->model), &sel_iter,
SHEET_POINTER, &old_sheet,
......@@ -1010,7 +1010,7 @@ cb_duplicate_clicked (G_GNUC_UNUSED GtkWidget *ignore,
selected_rows = gtk_tree_selection_get_selected_rows (selection, NULL);
gtk_tree_model_get_iter (GTK_TREE_MODEL (state->model),
&sel_iter, (GtkTreePath *) selected_rows->data);
go_list_free_custom (selected_rows, (GFreeFunc) gtk_tree_path_free);
g_list_free_full (selected_rows, (GDestroyNotify) gtk_tree_path_free);
gtk_tree_model_get (GTK_TREE_MODEL (state->model), &sel_iter,
SHEET_POINTER, &this_sheet,
......@@ -1082,7 +1082,7 @@ cb_delete_clicked (G_GNUC_UNUSED GtkWidget *ignore,
populate_sheet_list (state);
cb_name_edited (NULL, NULL, NULL, state);
go_list_free_custom (selected_rows, (GFreeFunc) gtk_tree_row_reference_free);
g_list_free_full (selected_rows, (GDestroyNotify) gtk_tree_row_reference_free);
}
static void
......
......@@ -79,7 +79,7 @@ csv_page_global_change (G_GNUC_UNUSED GtkWidget *widget,
strcmp (sepc->str, "") == 0 ? NULL : sepc->str,
sepstr);
g_string_free (sepc, TRUE);
go_slist_free_custom (sepstr, g_free);
g_slist_free_full (sepstr, g_free);
stf_parse_options_csv_set_duplicates (parseoptions,
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (pagedata->csv.csv_duplicates)));
......
......@@ -223,7 +223,7 @@ category_group_list_get (void)
}
dir_list = g_slist_reverse (dir_list);
categories = category_list_get_from_dir_list (dir_list);
go_slist_free_custom (dir_list, g_free);
g_slist_free_full (dir_list, g_free);
categories = g_list_sort (categories, category_compare_name_and_dir);
......
......@@ -255,7 +255,7 @@ format_template_free (GnmFormatTemplate *ft)
g_free (ft->author);
g_free (ft->name);
g_free (ft->description);
go_slist_free_custom (ft->members, (GFreeFunc)format_template_member_free);
g_slist_free_full (ft->members, (GDestroyNotify)format_template_member_free);
g_hash_table_destroy (ft->table);
g_free (ft);
......
......@@ -877,7 +877,7 @@ gnm_pane_dispose (GObject *obj)
g_slist_free (pane->cursor.animated);
pane->cursor.animated = NULL;
go_slist_free_custom (pane->cursor.expr_range, g_object_unref);
g_slist_free_full (pane->cursor.expr_range, g_object_unref);
pane->cursor.expr_range = NULL;
if (pane->mouse_cursor) {
......@@ -2262,7 +2262,7 @@ gnm_pane_expr_cursor_bound_set (GnmPane *pane, GnmRange const *r,
void
gnm_pane_expr_cursor_stop (GnmPane *pane)
{
go_slist_free_custom (pane->cursor.expr_range, g_object_unref);
g_slist_free_full (pane->cursor.expr_range, g_object_unref);
pane->cursor.expr_range = NULL;
}
......
......@@ -54,7 +54,7 @@ plugin_service_function_group_finalize (GObject *obj)
g_free (sfg->translated_category_name);
sfg->translated_category_name = NULL;
go_slist_free_custom (sfg->function_name_list, g_free);
g_slist_free_full (sfg->function_name_list, g_free);
sfg->function_name_list = NULL;
g_free (sfg->textdomain);
......@@ -136,7 +136,7 @@ plugin_service_function_group_read_xml (GOPluginService *service, xmlNode *tree,
g_free (category_name);
g_free (translated_category_name);
go_slist_free_custom (function_name_list, g_free);
g_slist_free_full (function_name_list, g_free);
g_free (textdomain);
}
......@@ -296,7 +296,7 @@ plugin_service_ui_finalize (GObject *obj)
g_free (service_ui->file_name);
service_ui->file_name = NULL;
go_slist_free_custom (service_ui->actions, (GFreeFunc)gnm_action_free);
g_slist_free_full (service_ui->actions, (GDestroyNotify)gnm_action_free);
service_ui->actions = NULL;
parent_class = g_type_class_peek (GO_TYPE_PLUGIN_SERVICE);
......
......@@ -397,7 +397,7 @@ set_enum (struct cb_watch_enum *watch, int x)
static void
cb_free_string_list (GSList *l)
{
go_slist_free_custom (l, g_free);
g_slist_free_full (l, g_free);
}
void
......@@ -429,7 +429,7 @@ gnm_conf_shutdown (void)
sync_handler = 0;
}
go_slist_free_custom (watchers, (GFreeFunc)free_watcher);
g_slist_free_full (watchers, (GDestroyNotify)free_watcher);
watchers = NULL;
g_hash_table_destroy (string_pool);
......@@ -608,7 +608,7 @@ gnm_conf_set_print_settings (GtkPrintSettings *settings)
gtk_print_settings_foreach (settings, gnm_gconf_set_print_settings_cb, &list);
gnm_conf_set_printsetup_gtk_setting (list);
go_slist_free_custom (list, g_free);
g_slist_free_full (list, g_free);
}
gboolean
......
......@@ -876,7 +876,7 @@ gnm_load_pango_attributes_into_buffer (PangoAttrList *markup, GtkTextBuffer *bu
break;
}
}
go_slist_free_custom (attr, (GFreeFunc)pango_attribute_destroy);
g_slist_free_full (attr, (GDestroyNotify)pango_attribute_destroy);
}
} while (pango_attr_iterator_next (iter));
pango_attr_iterator_destroy (iter);
......@@ -940,7 +940,7 @@ gnm_load_pango_attributes_into_buffer (PangoAttrList *markup, GtkTextBuffer *bu
gtk_text_buffer_get_iter_at_offset
(buffer, &end_iter, end);
gtk_text_buffer_apply_tag (buffer, tag, &start_iter, &end_iter);
go_slist_free_custom (attr, (GFreeFunc)pango_attribute_destroy);
g_slist_free_full (attr, (GDestroyNotify)pango_attribute_destroy);
}
} while (pango_attr_iterator_next (iter));
pango_attr_iterator_destroy (iter);
......
......@@ -315,7 +315,7 @@ gnm_shutdown (void)
plugin_states = go_plugins_shutdown ();
if (NULL != plugin_states) {
gnm_conf_set_plugins_file_states (plugin_states);
go_slist_free_custom (plugin_states, g_free);
g_slist_free_full (plugin_states, g_free);
}
stf_shutdown ();
......
......@@ -343,21 +343,21 @@ save_formats (void)
}
GO_SLIST_REVERSE(left);
gnm_conf_set_printsetup_hf_left (left);
go_slist_free_custom (left, g_free);
g_slist_free_full (left, g_free);
GO_SLIST_REVERSE(middle);
gnm_conf_set_printsetup_hf_middle (middle);
go_slist_free_custom (middle, g_free);
g_slist_free_full (middle, g_free);
GO_SLIST_REVERSE(right);
gnm_conf_set_printsetup_hf_right (right);
go_slist_free_custom (right, g_free);
g_slist_free_full (right, g_free);
}
static void
destroy_formats (void)
{
go_list_free_custom (hf_formats, (GFreeFunc)print_hf_free);
g_list_free_full (hf_formats, (GDestroyNotify)print_hf_free);
hf_formats = NULL;
}
......
......@@ -133,7 +133,7 @@ sheet_print_info_free (gpointer data)
static void
printing_instance_delete (PrintingInstance *pi)
{
go_list_free_custom (pi->gnmSheets, sheet_print_info_free);
g_list_free_full (pi->gnmSheets, sheet_print_info_free);
hf_render_info_destroy (pi->hfi);
if (pi->progress) {
gtk_widget_destroy (pi->progress);
......
......@@ -61,7 +61,7 @@ guint gnm_range_hash (GnmRange const *r);
#define range_valid(r) ((r)->start.col <= (r)->end.col && \
(r)->start.row <= (r)->end.row)
#define range_fragment_free(f) go_slist_free_custom ((f), g_free)
#define range_fragment_free(f) g_slist_free_full ((f), g_free)
GnmRange *range_init_full_sheet (GnmRange *r, Sheet const *sheet);
GnmRange *range_init_cols (GnmRange *r, Sheet const *sheet,
......
......@@ -334,7 +334,7 @@ gnm_rendered_value_new (GnmCell const *cell,
scale = pa_scale->value;
}
}
go_slist_free_custom (extra_attrs,
g_slist_free_full (extra_attrs,
(GFreeFunc) pango_attribute_destroy);
pango_font_description_free (desc);
pango_attr_iterator_destroy (iter);
......
......@@ -2853,7 +2853,7 @@ scg_objects_drag_commit (SheetControlGUI *scg, int drag_type,
g_free (text);
}
g_slist_free (data.objects);
go_slist_free_custom (data.anchors, g_free);
g_slist_free_full (data.anchors, g_free);
}
void
......@@ -3874,7 +3874,7 @@ scg_drag_receive_uri_list (SheetControlGUI *scg, double x, double y,
}
g_free (mime);
}
go_slist_free_custom (urls, (GFreeFunc) g_free);
g_slist_free_full (urls, (GDestroyNotify) g_free);
}
static void
......
......@@ -241,7 +241,7 @@ gnm_sog_get_target_list (SheetObject const *so)
0, 0);
}
g_free (mime_str);
go_slist_free_custom (mimes, g_free);
g_slist_free_full (mimes, g_free);
/* No need to eliminate duplicates. */
gtk_target_list_add_image_targets (tl, 0, TRUE);
......
......@@ -389,7 +389,7 @@ gnm_soi_get_target_list (SheetObject const *so)
0, 0);
}
g_free (mime_str);
go_slist_free_custom (mimes, g_free);
g_slist_free_full (mimes, g_free);
}
/* No need to eliminate duplicates. */
if (soi->image != NULL || pixbuf != NULL) {
......
......@@ -4153,7 +4153,7 @@ sheet_destroy_contents (Sheet *sheet)
{
GSList *tmp = sheet->slicers;
sheet->slicers = NULL;
go_slist_free_custom (tmp, (GFreeFunc)gnm_sheet_slicer_clear_sheet);
g_slist_free_full (tmp, (GDestroyNotify)gnm_sheet_slicer_clear_sheet);
}
/* These contain SheetObjects, remove them first */
......@@ -4180,7 +4180,7 @@ sheet_destroy_contents (Sheet *sheet)
g_hash_table_destroy (sheet->hash_merged);
sheet->hash_merged = NULL;
go_slist_free_custom (sheet->list_merged, g_free);
g_slist_free_full (sheet->list_merged, g_free);
sheet->list_merged = NULL;
/* Clear the row spans 1st */
......@@ -4246,7 +4246,7 @@ gnm_sheet_finalize (GObject *obj)
g_object_unref (sheet->solver_parameters);
sheet->solver_parameters = NULL;
go_list_free_custom (sheet->scenarios, g_object_unref);
g_list_free_full (sheet->scenarios, g_object_unref);
sheet->scenarios = NULL;
if (sheet->sort_setups != NULL)
......
......@@ -260,7 +260,7 @@ read_files_to_merge (const char *inputs[], GOFileOpener *fo,
inputs++;
if (go_io_error_occurred (io_context)) {
go_slist_free_custom (wbs, g_object_unref);
g_slist_free_full (wbs, g_object_unref);
return NULL;
}
......@@ -420,7 +420,7 @@ merge (Workbook *wb, char const *inputs[],
break;
}
go_slist_free_custom (wbs, g_object_unref);
g_slist_free_full (wbs, g_object_unref);
return result;
}
......
......@@ -265,7 +265,7 @@ stf_parse_options_clear_line_terminator (StfParseOptions_t *parseoptions)
{
g_return_if_fail (parseoptions != NULL);
go_slist_free_custom (parseoptions->terminator, g_free);
g_slist_free_full (parseoptions->terminator, g_free);
parseoptions->terminator = NULL;
compile_terminators (parseoptions);
}
......@@ -298,7 +298,7 @@ stf_parse_options_csv_set_separators (StfParseOptions_t *parseoptions, char cons
g_free (parseoptions->sep.chr);