diff options
| author | Martin Wehner <martin.wehner@gmail.com> | 2006-01-16 23:48:20 +0000 |
|---|---|---|
| committer | Martin Wehner <mwehner@src.gnome.org> | 2006-01-16 23:48:20 +0000 |
| commit | baf6751243c2c7d7651bfb7a9c18cf9abcf75310 (patch) | |
| tree | 422224e494b93f09654042e9834d37fe98160301 | |
| parent | a3f4faae1384914fb8104df392f5d1ce2c218f85 (diff) | |
| download | nautilus-baf6751243c2c7d7651bfb7a9c18cf9abcf75310.tar.gz | |
Don't leak last_geometry.
2006-01-17 Martin Wehner <martin.wehner@gmail.com>
* src/nautilus-spatial-window.c:
(nautilus_spatial_window_finalize):
Don't leak last_geometry.
* src/file-manager/fm-tree-view.c:
(show_iter_for_file):
Don't leak path.
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | src/file-manager/fm-tree-view.c | 14 | ||||
| -rw-r--r-- | src/nautilus-spatial-window.c | 6 |
3 files changed, 21 insertions, 9 deletions
@@ -1,3 +1,13 @@ +2006-01-17 Martin Wehner <martin.wehner@gmail.com> + + * src/nautilus-spatial-window.c: + (nautilus_spatial_window_finalize): + Don't leak last_geometry. + + * src/file-manager/fm-tree-view.c: + (show_iter_for_file): + Don't leak path. + 2006-01-16 Martin Wehner <martin.wehner@gmail.com> * src/file-manager/fm-list-model.c: (fm_list_model_remove): diff --git a/src/file-manager/fm-tree-view.c b/src/file-manager/fm-tree-view.c index d3f2097fe..d47092134 100644 --- a/src/file-manager/fm-tree-view.c +++ b/src/file-manager/fm-tree-view.c @@ -157,15 +157,13 @@ show_iter_for_file (FMTreeView *view, NautilusFile *file, GtkTreeIter *iter) /* check if file is visible in the same root as the currently selected folder is */ gtk_tree_view_get_cursor (view->details->tree_widget, &path, NULL); if (path != NULL) { - if (gtk_tree_model_get_iter (model, &cur_iter, path)) { - if (fm_tree_model_file_get_iter (view->details->child_model, - iter, file, &cur_iter)) { - gtk_tree_path_free (path); - return TRUE; - } else { - gtk_tree_path_free (path); - } + if (gtk_tree_model_get_iter (model, &cur_iter, path) && + fm_tree_model_file_get_iter (view->details->child_model, iter, + file, &cur_iter)) { + gtk_tree_path_free (path); + return TRUE; } + gtk_tree_path_free (path); } /* check if file is visible at all */ if (fm_tree_model_file_get_iter (view->details->child_model, diff --git a/src/nautilus-spatial-window.c b/src/nautilus-spatial-window.c index a30ded308..b665e9eef 100644 --- a/src/nautilus-spatial-window.c +++ b/src/nautilus-spatial-window.c @@ -214,7 +214,11 @@ nautilus_spatial_window_finalize (GObject *object) if (window->details->location != NULL) { gnome_vfs_uri_unref (window->details->location); } - + + if (window->details->last_geometry != NULL) { + g_free (window->details->last_geometry); + } + g_free (window->details); window->details = NULL; |