diff options
| author | Juan Pablo Ugarte <juanpablougarte@gmail.com> | 2020-08-17 16:31:55 -0300 |
|---|---|---|
| committer | Juan Pablo Ugarte <juanpablougarte@gmail.com> | 2020-08-17 19:19:48 -0300 |
| commit | 80de73f0b4d904e77164399811a5d7da7ecf47f3 (patch) | |
| tree | 97aa017c186b1e485da389eee3db7c2ee100a5c0 /gladeui/glade-editor.c | |
| parent | a987d81b4e9a7c9a3d1f616444500d36c6dda274 (diff) | |
| download | glade-80de73f0b4d904e77164399811a5d7da7ecf47f3.tar.gz | |
Use g_list_free_full() instead of g_list_foreach() + g_list_free()
Also fix -Wcast-function-type warnings
Diffstat (limited to 'gladeui/glade-editor.c')
| -rw-r--r-- | gladeui/glade-editor.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/gladeui/glade-editor.c b/gladeui/glade-editor.c index 8948cc72..46f5c5e4 100644 --- a/gladeui/glade-editor.c +++ b/gladeui/glade-editor.c @@ -218,8 +218,7 @@ glade_editor_dispose (GObject *object) glade_editor_load_widget (editor, NULL); /* Unref all the cached pages */ - g_list_foreach (priv->editables, (GFunc) g_object_unref, NULL); - priv->editables = (g_list_free (priv->editables), NULL); + g_list_free_full (priv->editables, g_object_unref); G_OBJECT_CLASS (glade_editor_parent_class)->dispose (object); } @@ -1034,8 +1033,9 @@ static gboolean glade_editor_reset_foreach_selection (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, - gboolean select) + gpointer data) { + gboolean select = GPOINTER_TO_INT (data); gboolean def; gtk_tree_model_get (model, iter, COLUMN_DEFAULT, &def, -1); @@ -1052,7 +1052,7 @@ glade_editor_reset_select_all_clicked (GtkButton *button, GtkTreeView *tree_view) { GtkTreeModel *model = gtk_tree_view_get_model (tree_view); - gtk_tree_model_foreach (model, (GtkTreeModelForeachFunc) + gtk_tree_model_foreach (model, glade_editor_reset_foreach_selection, GINT_TO_POINTER (TRUE)); } @@ -1062,7 +1062,7 @@ glade_editor_reset_unselect_all_clicked (GtkButton *button, GtkTreeView *tree_view) { GtkTreeModel *model = gtk_tree_view_get_model (tree_view); - gtk_tree_model_foreach (model, (GtkTreeModelForeachFunc) + gtk_tree_model_foreach (model, glade_editor_reset_foreach_selection, GINT_TO_POINTER (FALSE)); } @@ -1071,8 +1071,9 @@ static gboolean glade_editor_reset_accumulate_selected_props (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, - GList **accum) + gpointer data) { + GList **accum = data; GladeProperty *property; gboolean enabled, def; @@ -1095,8 +1096,9 @@ glade_editor_reset_get_selected_props (GtkTreeModel *model) { GList *ret = NULL; - gtk_tree_model_foreach (model, (GtkTreeModelForeachFunc) - glade_editor_reset_accumulate_selected_props, &ret); + gtk_tree_model_foreach (model, + glade_editor_reset_accumulate_selected_props, + &ret); return ret; } |