diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | lib/widgets/ephy-node-view.c | 15 | ||||
| -rwxr-xr-x | src/pdm-dialog.c | 9 |
3 files changed, 29 insertions, 7 deletions
@@ -1,3 +1,15 @@ +2003-07-27 Christian Persch <chpe@cvs.gnome.org> + + * lib/widgets/ephy-node-view.c: (ephy_node_view_remove): + + Fix mem leak. + + * lib/widgets/ephy-node-view.c: (ephy_node_view_remove): + * src/pdm-dialog.c: (pdm_cmd_delete_selection): + + If we've just deleted every row in the tree view, the row ref + contains an empty path. Check for that; possibly fixing bug #118398. + 2003-07-25 Marco Pesenti Gritti <marco@it.gnome.org> * lib/widgets/ephy-search-entry.c: (ephy_search_entry_destroy_cb), diff --git a/lib/widgets/ephy-node-view.c b/lib/widgets/ephy-node-view.c index 839947101..86eb48f49 100644 --- a/lib/widgets/ephy-node-view.c +++ b/lib/widgets/ephy-node-view.c @@ -949,7 +949,7 @@ ephy_node_view_get_selection (EphyNodeView *view) void ephy_node_view_remove (EphyNodeView *view) { - GList *list; + GList *list, *l; EphyNode *node; GtkTreeIter iter, iter2; GtkTreePath *path; @@ -986,9 +986,9 @@ ephy_node_view_remove (EphyNodeView *view) } gtk_tree_path_free (path); - for (; list != NULL; list = list->next) + for (l = list; l != NULL; l = l->next) { - ephy_node_unref (list->data); + ephy_node_unref (l->data); } g_list_free (list); @@ -998,9 +998,14 @@ ephy_node_view_remove (EphyNodeView *view) if (row_ref != NULL) { path = gtk_tree_row_reference_get_path (row_ref); - gtk_tree_view_set_cursor (GTK_TREE_VIEW (view), path, NULL, FALSE); + + if (path != NULL) + { + gtk_tree_view_set_cursor (GTK_TREE_VIEW (view), path, NULL, FALSE); + gtk_tree_path_free (path); + } + gtk_tree_row_reference_free (row_ref); - gtk_tree_path_free (path); } } diff --git a/src/pdm-dialog.c b/src/pdm-dialog.c index 981016d67..45a816939 100755 --- a/src/pdm-dialog.c +++ b/src/pdm-dialog.c @@ -430,9 +430,14 @@ pdm_cmd_delete_selection (PdmActionInfo *action) if (row_ref != NULL) { path = gtk_tree_row_reference_get_path (row_ref); - gtk_tree_view_set_cursor (GTK_TREE_VIEW (action->treeview), path, NULL, FALSE); + + if (path != NULL) + { + gtk_tree_view_set_cursor (GTK_TREE_VIEW (action->treeview), path, NULL, FALSE); + gtk_tree_path_free (path); + } + gtk_tree_row_reference_free (row_ref); - gtk_tree_path_free (path); } } |